Skip to site navigation (Press enter)

[jbehave-scm] [1234] trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n: Use english locale as default, instead of default locale.

mauro Tue, 08 Sep 2009 04:23:45 -0700

Title: [1234] trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n: Use english locale as default, instead of default locale.

Revision: 1234
Author: mauro
Date: 2009-09-08 06:23:36 -0500 (Tue, 08 Sep 2009)

Log Message

Use english locale as default, instead of default locale.
Use main language locales, and only use country level where required.


Modified Paths

trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario/i18n/I18nKeywordsBehaviour.java
trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/I18nKeyWords.java


Added Paths

trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_en.properties
trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_es.properties
trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_pt.properties


Removed Paths

trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords.properties
trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_es_ES.properties
trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_pt_BR.properties

Diff

Modified: trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario/i18n/I18nKeywordsBehaviour.java (1233 => 1234)

--- trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario/i18n/I18nKeywordsBehaviour.java	2009-09-07 22:26:12 UTC (rev 1233)
+++ trunk/core/jbehave-core/src/behaviour/org/jbehave/scenario/i18n/I18nKeywordsBehaviour.java	2009-09-08 11:23:36 UTC (rev 1234)
@@ -11,7 +11,7 @@
 public class I18nKeywordsBehaviour {
 
 	@Test
-	public void keywordsInDefaultLocale(){
+	public void keywordsInEnglishAsDefault(){
 		KeyWords keywords = new I18nKeyWords();
 		assertEquals("Scenario:", keywords.scenario());
 		assertEquals("GivenScenarios:", keywords.givenScenarios());
@@ -24,7 +24,7 @@
 
 	@Test
 	public void keywordsInItalian(){
-		KeyWords keywords = new I18nKeyWords(Locale.ITALIAN);
+		KeyWords keywords = new I18nKeyWords(new Locale("it"));
 		assertEquals("Scenario:", keywords.scenario());
 		assertEquals("Dati gli scenari:", keywords.givenScenarios());
 		assertEquals("Esempi:", keywords.examplesTable());		
@@ -36,7 +36,7 @@
 
 	@Test
 	public void keywordsInSpanish(){
-		KeyWords keywords = new I18nKeyWords(new Locale("es", "ES", ""));
+		KeyWords keywords = new I18nKeyWords(new Locale("es"));
 		assertEquals("Escenario:", keywords.scenario());
 		assertEquals("Dados los escenarios:", keywords.givenScenarios());
 		assertEquals("Ejemplos:", keywords.examplesTable());		
@@ -44,12 +44,11 @@
 		assertEquals("Cuando", keywords.when());
 		assertEquals("Entonces", keywords.then());
 		assertEquals("Y", keywords.and());
-	}
-	
+	}	
 
 	@Test
-	public void keywordsInPortugues(){
-		KeyWords keywords = new I18nKeyWords(new Locale("pt", "BR", ""));
+	public void keywordsInPortuguese(){
+		KeyWords keywords = new I18nKeyWords(new Locale("pt"));
 		assertEquals("Cen‡rio:", keywords.scenario());
 		assertEquals("Dados os cen‡rios:", keywords.givenScenarios());
 		assertEquals("Exemplos:", keywords.examplesTable());

Modified: trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/I18nKeyWords.java (1233 => 1234)

--- trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/I18nKeyWords.java	2009-09-07 22:26:12 UTC (rev 1233)
+++ trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/I18nKeyWords.java	2009-09-08 11:23:36 UTC (rev 1234)
@@ -16,7 +16,7 @@
 	private static final String DEFAULT_BUNDLE_NAME = "org/jbehave/scenario/i18n/keywords";
 
 	public I18nKeyWords() {
-        this(DEFAULT_BUNDLE_NAME, Locale.getDefault());
+        this(DEFAULT_BUNDLE_NAME, Locale.ENGLISH);
     }
 
     public I18nKeyWords(Locale locale) {

Deleted: trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords.properties (1233 => 1234)

--- trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords.properties	2009-09-07 22:26:12 UTC (rev 1233)
+++ trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords.properties	2009-09-08 11:23:36 UTC (rev 1234)
@@ -1,7 +0,0 @@
-Scenario=Scenario:
-GivenScenarios=GivenScenarios:
-ExamplesTable=Examples:
-Given=Given
-When=When
-Then=Then
-And=And

Copied: trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_en.properties (from rev 1231, trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords.properties) (0 => 1234)

--- trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_en.properties	                        (rev 0)
+++ trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_en.properties	2009-09-08 11:23:36 UTC (rev 1234)
@@ -0,0 +1,7 @@
+Scenario=Scenario:
+GivenScenarios=GivenScenarios:
+ExamplesTable=Examples:
+Given=Given
+When=When
+Then=Then
+And=And

Copied: trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_es.properties (from rev 1232, trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_es_ES.properties) (0 => 1234)

--- trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_es.properties	                        (rev 0)
+++ trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_es.properties	2009-09-08 11:23:36 UTC (rev 1234)
@@ -0,0 +1,7 @@
+Scenario=Escenario:
+GivenScenarios=Dados los escenarios:
+ExamplesTable=Ejemplos:
+Given=Dado que
+When=Cuando
+Then=Entonces
+And=Y

Deleted: trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_es_ES.properties (1233 => 1234)

--- trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_es_ES.properties	2009-09-07 22:26:12 UTC (rev 1233)
+++ trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_es_ES.properties	2009-09-08 11:23:36 UTC (rev 1234)
@@ -1,7 +0,0 @@
-Scenario=Escenario:
-GivenScenarios=Dados los escenarios:
-ExamplesTable=Ejemplos:
-Given=Dado que
-When=Cuando
-Then=Entonces
-And=Y

Copied: trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_pt.properties (from rev 1232, trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_pt_BR.properties) (0 => 1234)

--- trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_pt.properties	                        (rev 0)
+++ trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_pt.properties	2009-09-08 11:23:36 UTC (rev 1234)
@@ -0,0 +1,7 @@
+Scenario=Cen\u00E1rio:
+GivenScenarios=Dados os cen\u00E1rios:
+ExamplesTable=Exemplos:
+Given=Dado que
+When=Quando
+Then=Ent\u00E3o
+And=E
\ No newline at end of file

Deleted: trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_pt_BR.properties (1233 => 1234)

--- trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_pt_BR.properties	2009-09-07 22:26:12 UTC (rev 1233)
+++ trunk/core/jbehave-core/src/java/org/jbehave/scenario/i18n/keywords_pt_BR.properties	2009-09-08 11:23:36 UTC (rev 1234)
@@ -1,7 +0,0 @@
-Scenario=Cen\u00E1rio:
-GivenScenarios=Dados os cen\u00E1rios:
-ExamplesTable=Exemplos:
-Given=Dado que
-When=Quando
-Then=Ent\u00E3o
-And=E
\ No newline at end of file

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email