Changeset 30052

Timestamp:

2015-07-22T20:27:19+12:00 (9 years ago)

Author:

ak19

Message:

Installer language selection now uses a dropdown in place of radio buttons to accomodate additional language translations submitted for the gsinstaller module. To get the dropdown <large-select> to work like the radio buttons <select>, Dr Bainbridge figured out that Oran had made some code changes to <select> in AntInstaller's LoadConfigFilter.java. Added the same change in for the <large-select> and then needed to port Oran's additional changes to SelectInput.java into LargeSelectInput.java (didn't put the changes in the superclass InputField.java since a lot of other AntInstaller classes inherit from that).

Location:

main/trunk/release-kits

Files:

• kits/rk3/installer/antinstall-config.xml (modified) (2 diffs)
• shared/core/ant-installer/src/org/tp23/antinstaller/input/LargeSelectInput.java (modified) (4 diffs)
• shared/core/ant-installer/src/org/tp23/antinstaller/input/SelectInput.java (modified) (1 diff)
• shared/core/ant-installer/src/org/tp23/antinstaller/runtime/exe/LoadConfigFilter.java (modified) (2 diffs)

main/trunk/release-kits/kits/rk3/installer/antinstall-config.xml

@@ -13 +13 @@
 
     <!-- select language page -->
+    <!-- We want a dropdown for installer language selection.
+    <select> is rendered as radio buttons in the GUI version.
+    antinstaller.sourceforge.net/manual.html
+    <large-select>: "The large select has identical options to the select input. 
+    Large select enables the list of options to be greater and is displayed differently. 
+    In the Swing GUI the options are rendered as a drop-down list. 
+    In the text/console UI the options are shown to the user 20 lines at a time."
+    An example: https://github.com/ykyuen/maven-h2o/blob/master/h2o-installer/ant-installer/antinstall-config.xml
+    
+    However, to get <large-select> to work as <select> did, needed to modify the AntInstaller code itself
+    in release-kits\shared\core\ant-installer\src\org\tp23\antinstaller\runtime\exe\LoadConfigFilter.java,
+    and also bring the code in antinstaller\input\LargeSelectInput.java up to speed with Oran's changes to <select> 
+    in ant-installer\src\org\tp23\antinstaller\input\SelectInput.java
+    
+    <option value="hy" text="Armenian"/>
+    <option value="jp" text="日本語 (Japanese)"/>
+    -->
     <page type="input" name="language-selector" displayText="">
         <comment name="language-selector-explanation"/>
-        <select property="language" defaultValue="en" displayText="" useAsLocale="true">
+        <large-select property="language" defaultValue="en" displayText="" useAsLocale="true">
             <option value="en" text="English"/>
             <option value="fr" text="Français (French)"/>
@@ -23 +40 @@
             <option value="zh" text="äž­æ–‡ (Chinese)"/>
             <option value="ar" text="Arabic"/>
-        </select>
+            <option value="kk" text="Қазақ (Kazakh)"/>
+        </large-select>
     </page>
 

main/trunk/release-kits/shared/core/ant-installer/src/org/tp23/antinstaller/input/LargeSelectInput.java

@@ -19 +19 @@
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;
+import java.util.Locale;
 
 import org.tp23.antinstaller.InstallerContext;
@@ -41 +42 @@
     private LargeSelectInput.Option[] options;
 
+    private boolean useAsLocale = false;
+    
     public LargeSelectInput() {
     }
 
-
+    public void setUseAsLocale(boolean ual) {
+        this.useAsLocale = ual;
+    }
+    
     public LargeSelectInput.Option[] getOptions() {
         return options;
@@ -66 +72 @@
         public String getText() {
             if( org.tp23.antinstaller.Installer.langPack != null ) {
-                return org.tp23.antinstaller.Installer.langPack.getString(getProperty() + "." + idx +".displayText");
+                return org.tp23.antinstaller.Installer.langPack.getString(getProperty() + "." + idx +".displayText");               
             }
             return text;
@@ -72 +78 @@
     }
     
-    public void setValue(String dir){
-        setInputResult(dir);
+    public void setValue(String value){ //param name used to be "dir" not "value", but bringing in line with SelectInput.java
+        setInputResult(value);
+        if ( useAsLocale ) {
+            //expect something like 'en' or or something like 'en_US'
+            Locale newLocale = null;
+            if ( value.length() == 2 ) {
+                newLocale = new Locale(value);
+                Locale.setDefault( newLocale );
+            } else if ( value.length() == 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", newLocale );
+        }
     }
     /**

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

@@ -74 +74 @@
                     String r = org.tp23.antinstaller.Installer.langPack.getString( getProperty() + "." + idx + ".displayText" );
                     return r;
-                } catch ( java.util.MissingResourceException mre ) {}
+                } catch ( java.util.MissingResourceException mre ) {} // restoring original comment: ignore, signifies no language packs installed
             }
             return text;

main/trunk/release-kits/shared/core/ant-installer/src/org/tp23/antinstaller/runtime/exe/LoadConfigFilter.java

@@ -345 +345 @@
 
             String s = field.getAttribute("useAsLocale");
-            if ( s != null || !s.equals("") ) {
+            if ( s != null && s.equals("true") ) {
                 sInput.setUseAsLocale(true);
             }
@@ -383 +383 @@
             sInput.setOptions(optionArr);
 
+            String s = field.getAttribute("useAsLocale");
+            if ( s != null && s.equals("true") ) {
+                sInput.setUseAsLocale(true);
+            }
             return sInput;
         }