Author: [email protected]
Date: Thu Jun 4 12:11:52 2009
New Revision: 5508
Added:
branches/snapshot-2009.05.12-r5406/user/test/com/google/gwt/i18n/I18NTest_nb.gwt.xml
- copied unchanged from r5506,
/trunk/user/test/com/google/gwt/i18n/I18NTest_nb.gwt.xml
branches/snapshot-2009.05.12-r5406/user/test/com/google/gwt/i18n/client/I18N_nb_Test.java
- copied unchanged from r5506,
/trunk/user/test/com/google/gwt/i18n/client/I18N_nb_Test.java
branches/snapshot-2009.05.12-r5406/user/test/com/google/gwt/i18n/client/I18N_nb_Test_MyMessages_nb.properties
- copied unchanged from r5506,
/trunk/user/test/com/google/gwt/i18n/client/I18N_nb_Test_MyMessages_nb.properties
branches/snapshot-2009.05.12-r5406/user/test/com/google/gwt/i18n/client/I18N_nb_Test_MyMessages_no.properties
- copied unchanged from r5506,
/trunk/user/test/com/google/gwt/i18n/client/I18N_nb_Test_MyMessages_no.properties
branches/snapshot-2009.05.12-r5406/user/test/com/google/gwt/i18n/client/I18N_nb_Test_MyMessages_no_BOKMAL.properties
- copied unchanged from r5506,
/trunk/user/test/com/google/gwt/i18n/client/I18N_nb_Test_MyMessages_no_BOKMAL.properties
Modified:
branches/snapshot-2009.05.12-r5406/branch-info.txt
branches/snapshot-2009.05.12-r5406/user/src/com/google/gwt/i18n/rebind/CurrencyListGenerator.java
branches/snapshot-2009.05.12-r5406/user/test/com/google/gwt/i18n/I18NSuite.java
Log:
Merge trunk r5505-r5506 into the 5/12 snapshot branch.
Fixes a problem with the CurrencyListGenerator for the nb locale.
svn merge --ignore-ancestry -r5504:5506 \
https://google-web-toolkit.googlecode.com/svn/trunk .
Modified: branches/snapshot-2009.05.12-r5406/branch-info.txt
==============================================================================
--- branches/snapshot-2009.05.12-r5406/branch-info.txt (original)
+++ branches/snapshot-2009.05.12-r5406/branch-info.txt Thu Jun 4 12:11:52
2009
@@ -29,3 +29,6 @@
svn merge -c5492 https://google-web-toolkit.googlecode.com/svn/trunk .
/releases/1.6 r5332 was merged into the branch (null checks on
Element/Node.is and test)
svn merge -c5332
https://google-web-toolkit.googlecode.com/svn/releases/1.6 .
+/trunk r5505-r5506 was merged into this branch
+ (CurrencyListGenerator nb locales)
+ svn merge --ignore-ancestry -r5504:5506
https://google-web-toolkit.googlecode.com/svn/trunk .
Modified:
branches/snapshot-2009.05.12-r5406/user/src/com/google/gwt/i18n/rebind/CurrencyListGenerator.java
==============================================================================
---
branches/snapshot-2009.05.12-r5406/user/src/com/google/gwt/i18n/rebind/CurrencyListGenerator.java
(original)
+++
branches/snapshot-2009.05.12-r5406/user/src/com/google/gwt/i18n/rebind/CurrencyListGenerator.java
Thu Jun 4 12:11:52 2009
@@ -363,7 +363,7 @@
String packageName = targetClass.getPackage().getName();
String className = targetClass.getName().replace('.', '_') + "_"
- + locale.getCanonicalForm().getAsString();
+ + locale.getAsString();
PrintWriter pw = context.tryCreate(logger, packageName, className);
if (pw != null) {
ClassSourceFileComposerFactory factory = new
ClassSourceFileComposerFactory(
Modified:
branches/snapshot-2009.05.12-r5406/user/test/com/google/gwt/i18n/I18NSuite.java
==============================================================================
---
branches/snapshot-2009.05.12-r5406/user/test/com/google/gwt/i18n/I18NSuite.java
(original)
+++
branches/snapshot-2009.05.12-r5406/user/test/com/google/gwt/i18n/I18NSuite.java
Thu Jun 4 12:11:52 2009
@@ -26,6 +26,7 @@
import com.google.gwt.i18n.client.I18N_es_MX_RuntimeTest;
import com.google.gwt.i18n.client.I18N_es_MX_Test;
import com.google.gwt.i18n.client.I18N_iw_Test;
+import com.google.gwt.i18n.client.I18N_nb_Test;
import com.google.gwt.i18n.client.LocaleInfoTest;
import com.google.gwt.i18n.client.LocaleInfo_ar_Test;
import com.google.gwt.i18n.client.NumberFormat_ar_Test;
@@ -66,6 +67,7 @@
suite.addTestSuite(I18N_iw_Test.class);
suite.addTestSuite(I18N_es_MX_Test.class);
suite.addTestSuite(I18N_es_MX_RuntimeTest.class);
+ suite.addTestSuite(I18N_nb_Test.class);
suite.addTestSuite(LocaleInfo_ar_Test.class);
suite.addTestSuite(LocaleInfoTest.class);
suite.addTestSuite(MessageFormatParserTest.class);
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
