Changeset 30052 for main/trunk/release-kits/shared/core
- Timestamp:
- 2015-07-22T20:27:19+12:00 (9 years ago)
- Location:
- main/trunk/release-kits/shared/core/ant-installer/src/org/tp23/antinstaller
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/shared/core/ant-installer/src/org/tp23/antinstaller/input/LargeSelectInput.java
r17514 r30052 19 19 import java.util.MissingResourceException; 20 20 import java.util.ResourceBundle; 21 import java.util.Locale; 21 22 22 23 import org.tp23.antinstaller.InstallerContext; … … 41 42 private LargeSelectInput.Option[] options; 42 43 44 private boolean useAsLocale = false; 45 43 46 public LargeSelectInput() { 44 47 } 45 48 46 49 public void setUseAsLocale(boolean ual) { 50 this.useAsLocale = ual; 51 } 52 47 53 public LargeSelectInput.Option[] getOptions() { 48 54 return options; … … 66 72 public String getText() { 67 73 if( org.tp23.antinstaller.Installer.langPack != null ) { 68 return org.tp23.antinstaller.Installer.langPack.getString(getProperty() + "." + idx +".displayText"); 74 return org.tp23.antinstaller.Installer.langPack.getString(getProperty() + "." + idx +".displayText"); 69 75 } 70 76 return text; … … 72 78 } 73 79 74 public void setValue(String dir){ 75 setInputResult(dir); 80 public void setValue(String value){ //param name used to be "dir" not "value", but bringing in line with SelectInput.java 81 setInputResult(value); 82 if ( useAsLocale ) { 83 //expect something like 'en' or or something like 'en_US' 84 Locale newLocale = null; 85 if ( value.length() == 2 ) { 86 newLocale = new Locale(value); 87 Locale.setDefault( newLocale ); 88 } else if ( value.length() == 5 ) { 89 newLocale = new Locale(value.substring(0,2), value.substring(3,5)); 90 Locale.setDefault( newLocale ); 91 } //else { you're out of luck } 92 org.tp23.antinstaller.Installer.langPack = ResourceBundle.getBundle("resources.LanguagePack", newLocale ); 93 } 76 94 } 77 95 /** -
main/trunk/release-kits/shared/core/ant-installer/src/org/tp23/antinstaller/input/SelectInput.java
r17517 r30052 74 74 String r = org.tp23.antinstaller.Installer.langPack.getString( getProperty() + "." + idx + ".displayText" ); 75 75 return r; 76 } catch ( java.util.MissingResourceException mre ) {} 76 } catch ( java.util.MissingResourceException mre ) {} // restoring original comment: ignore, signifies no language packs installed 77 77 } 78 78 return text; -
main/trunk/release-kits/shared/core/ant-installer/src/org/tp23/antinstaller/runtime/exe/LoadConfigFilter.java
r17514 r30052 345 345 346 346 String s = field.getAttribute("useAsLocale"); 347 if ( s != null || !s.equals("") ) {347 if ( s != null && s.equals("true") ) { 348 348 sInput.setUseAsLocale(true); 349 349 } … … 383 383 sInput.setOptions(optionArr); 384 384 385 String s = field.getAttribute("useAsLocale"); 386 if ( s != null && s.equals("true") ) { 387 sInput.setUseAsLocale(true); 388 } 385 389 return sInput; 386 390 }
Note:
See TracChangeset
for help on using the changeset viewer.