Author: jalkanen
Date: Sat Mar 8 09:05:06 2008
New Revision: 635016
URL: http://svn.apache.org/viewvc?rev=635016&view=rev
Log:
JSPWIKI-154, Removed double entries and fixed OutcomeTest to use default
resources
Modified:
incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties
incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties
incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties
incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/OutcomeTest.java
Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources.properties?rev=635016&r1=635015&r2=635016&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources.properties Sat Mar 8
09:05:06 2008
@@ -8,12 +8,6 @@
# " = "
# ' = ' Note that ' is NOT HTML, and does not necessarily work in
all browsers.
-# Outcomes
-outcome.decision.approve=Approve
-outcome.decision.deny=Deny
-outcome.decision.hold=Hold
-outcome.decision.reassign=Reassign
-outcome.step.abort=Abort
# Decisions: {0}=task owner; {1}=requester; {2-9}=additional message arguments
for workflow
decision.editWikiApproval=Edit page {2}
Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties?rev=635016&r1=635015&r2=635016&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_de.properties Sat Mar 8
09:05:06 2008
@@ -14,12 +14,6 @@
#
# Translation revised on 2008-02-05 by Florian Holeczek
-# Outcomes
-outcome.decision.approve=Genehmigen
-outcome.decision.deny=Ablehnen
-outcome.decision.hold=Zurückstellen
-outcome.decision.reassign=Neu zuweisen
-outcome.step.abort=Abbrechen
# Decisions
# {0}=task owner; {1}=requester; {2-9}=additional message arguments for
workflow
Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties?rev=635016&r1=635015&r2=635016&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties Sat Mar 8
09:05:06 2008
@@ -3,13 +3,6 @@
# code, the so-called core code.
#
-# Outcomes
-outcome.decision.approve=Aprobar
-outcome.decision.deny=Denegar
-outcome.decision.hold=Mantener
-outcome.decision.reassign=Reasignar
-outcome.step.abort=Abortar
-
# Decisions: {0}=task owner; {1}=requester; {2-9}=additional message arguments
for workflow
decision.editWikiApproval=Editar página {2}
Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties?rev=635016&r1=635015&r2=635016&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_fi.properties Sat Mar 8
09:05:06 2008
@@ -3,13 +3,6 @@
# code, the so-called core code.
#
-# Outcomes
-outcome.decision.approve=Hyväksy
-outcome.decision.deny=Kiellä
-outcome.decision.hold=Jätä jonoon
-outcome.decision.reassign=Lähetä edelleen
-outcome.step.abort=Keskeytä
-
# Decisions: {0}=task owner; {1}=requester; {2-9}=additional message arguments
for workflow
decision.editWikiApproval=Muokkaa sivua {2}
Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties?rev=635016&r1=635015&r2=635016&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_nl.properties Sat Mar 8
09:05:06 2008
@@ -8,12 +8,6 @@
# " = "
# ' = ' Note that ' is NOT HTML, and does not necessarily work in
all browsers.
-# Outcomes
-outcome.decision.approve=Approve
-outcome.decision.deny=Deny
-outcome.decision.hold=Hold
-outcome.decision.reassign=Reassign
-outcome.step.abort=Abort
# Decisions: {0}=task owner; {1}=requester; {2-9}=additional message arguments
for workflow
decision.editWikiApproval=Bewerk pagina {2}
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/OutcomeTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/OutcomeTest.java?rev=635016&r1=635015&r2=635016&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/OutcomeTest.java
(original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/workflow/OutcomeTest.java
Sat Mar 8 09:05:06 2008
@@ -40,7 +40,7 @@
props.load(TestEngine.findTestProperties());
WikiEngine engine = new TestEngine(props);
InternationalizationManager i18n =
engine.getInternationalizationManager();
- String core = InternationalizationManager.CORE_BUNDLE;
+ String core = "templates.default";
Locale english = Locale.ENGLISH;
Outcome o;
