Changeset 20961 for gli/trunk/src
- Timestamp:
- 2009-11-18T19:33:58+13:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/src/org/greenstone/gatherer/gui/Preferences.java
r20789 r20961 406 406 for(int i = 0; i < language_elements.getLength(); i++) { 407 407 Element language_element = (Element) language_elements.item(i); 408 if((language_element.getAttribute(StaticStrings.GLI_ATTRIBUTE)).equalsIgnoreCase(StaticStrings.TRUE_STR) || (language_element.getAttribute(StaticStrings.MDS_ATTRIBUTE)).equalsIgnoreCase(StaticStrings.TRUE_STR)) { 408 if((language_element.hasAttribute(StaticStrings.GLI_ATTRIBUTE) 409 && (language_element.getAttribute(StaticStrings.GLI_ATTRIBUTE)).equalsIgnoreCase(StaticStrings.TRUE_STR)) 410 || (language_element.hasAttribute(StaticStrings.MDS_ATTRIBUTE) 411 && (language_element.getAttribute(StaticStrings.MDS_ATTRIBUTE)).equalsIgnoreCase(StaticStrings.TRUE_STR))) 412 { 409 413 Locale locale = new Locale(language_element.getAttribute(StaticStrings.CODE_ATTRIBUTE)); 410 414 String description = language_element.getAttribute(StaticStrings.NAME_ATTRIBUTE); … … 480 484 481 485 // Try to locate and select the current language 486 // Else default to English 482 487 String language_code = Configuration.getLanguage(); 483 for (int b = 0; b < language_combobox.getItemCount(); b++) { 488 int defaultIndex = 0; 489 DictionaryEntry defaultEntry = null; 490 491 int b = 0; 492 for (; b < language_combobox.getItemCount(); b++) { 484 493 DictionaryEntry entry = (DictionaryEntry) language_combobox.getItemAt(b); 485 494 if (language_code.equalsIgnoreCase(entry.getLocale().getLanguage())) { 486 495 language_combobox.setSelectedIndex(b); 487 496 break; 488 } 497 } else if (entry.getLocale().getLanguage().equalsIgnoreCase("en")) { // store English as fallback 498 defaultIndex = b; 499 defaultEntry = entry; 500 } 501 } 502 // if we cycled through and couldn't find the chosen language to load, 503 // then we set the Preferences' and Configuration's language to English 504 if (b == language_combobox.getItemCount()) { 505 language_combobox.setSelectedIndex(defaultIndex); 506 Configuration.setLocale("general.locale", true, defaultEntry.getLocale()); 507 System.err.println("*** GLI doesn't yet support the language: " + language_code 508 + " and has therefore defaulted to: " + Configuration.getLanguage()); 489 509 } 490 510
Note:
See TracChangeset
for help on using the changeset viewer.