Changeset 17516 for release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/SelectInput.java

Timestamp:

2008-10-10T13:49:43+13:00 (16 years ago)

Author:

oranfry

Message:

made pages reinitialise just before they are shown and added an option to selectinput to change the locale, the end result of this being that you can change the language of the installer as it runs

File:

• release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/SelectInput.java (modified) (2 diffs)

release-kits/shared/ant-installer/src/org/tp23/antinstaller/input/SelectInput.java

@@ -70 +70 @@
         }
         public String getText() {
-            if( org.tp23.antinstaller.Installer.langPack != null ){
-                return org.tp23.antinstaller.Installer.langPack.getString(getProperty() + "." + idx +".displayText");
+            if( org.tp23.antinstaller.Installer.langPack != null ) {
+                String r = org.tp23.antinstaller.Installer.langPack.getString( getProperty() + "." + idx + ".displayText" );
+                if ( r != null ) return r;
             }
             return text;
@@ -81 +82 @@
         if ( useAsLocale ) {
             //expect something like 'en' or or something like 'en_US'
+            Locale newLocale = null;
             if ( value.length() == 2 ) {
-                Locale.setDefault( new Locale(value) );
+                newLocale = new Locale(value);
+                Locale.setDefault( newLocale );
             } else if ( value.length() == 5 ) {
-                Locale.setDefault( new Locale(value.substring(0,2), value.substring(3,5)) );
+                newLocale = new Locale(value.substring(0,2), value.substring(3,5));
+                Locale.setDefault( newLocale );
             } //else { you're out of luck }
-            org.tp23.antinstaller.Installer.langPack = ResourceBundle.getBundle("resources.LanguagePack");
+            org.tp23.antinstaller.Installer.langPack = ResourceBundle.getBundle("resources.LanguagePack", newLocale );
         }
     }