Changeset 20961 for gli

Timestamp:

2009-11-18T19:33:58+13:00 (14 years ago)

Author:

ak19

Message:

Now when GLI starts up and finds a language in the config file which GLI does not yet support, and when Preferences is opened and a property changed, it no longer defaults to the first available language in the list (Arabic), but defaults to English instead. The Configuration file is also updated to English, so it doesn't force a restart on the GLI user.

File:

• gli/trunk/src/org/greenstone/gatherer/gui/Preferences.java (modified) (2 diffs)

gli/trunk/src/org/greenstone/gatherer/gui/Preferences.java

@@ -406 +406 @@
     for(int i = 0; i < language_elements.getLength(); i++) {
         Element language_element = (Element) language_elements.item(i);
-        if((language_element.getAttribute(StaticStrings.GLI_ATTRIBUTE)).equalsIgnoreCase(StaticStrings.TRUE_STR) || (language_element.getAttribute(StaticStrings.MDS_ATTRIBUTE)).equalsIgnoreCase(StaticStrings.TRUE_STR)) {
+        if((language_element.hasAttribute(StaticStrings.GLI_ATTRIBUTE) 
+        && (language_element.getAttribute(StaticStrings.GLI_ATTRIBUTE)).equalsIgnoreCase(StaticStrings.TRUE_STR)) 
+           || (language_element.hasAttribute(StaticStrings.MDS_ATTRIBUTE) 
+           && (language_element.getAttribute(StaticStrings.MDS_ATTRIBUTE)).equalsIgnoreCase(StaticStrings.TRUE_STR)))
+        {
         Locale locale = new Locale(language_element.getAttribute(StaticStrings.CODE_ATTRIBUTE));
         String description = language_element.getAttribute(StaticStrings.NAME_ATTRIBUTE);
@@ -480 +484 @@
         
     // Try to locate and select the current language
+    // Else default to English
     String language_code = Configuration.getLanguage();
-    for (int b = 0; b < language_combobox.getItemCount(); b++) {
+    int defaultIndex = 0;
+    DictionaryEntry defaultEntry = null;
+
+    int b = 0;
+    for (; b < language_combobox.getItemCount(); b++) {
         DictionaryEntry entry = (DictionaryEntry) language_combobox.getItemAt(b);
         if (language_code.equalsIgnoreCase(entry.getLocale().getLanguage())) {
         language_combobox.setSelectedIndex(b);
         break;
-        }
+        } else if (entry.getLocale().getLanguage().equalsIgnoreCase("en")) { // store English as fallback
+        defaultIndex = b;
+        defaultEntry = entry;
+        }
+    }
+    // if we cycled through and couldn't find the chosen language to load, 
+    // then we set the Preferences' and Configuration's language to English
+    if (b == language_combobox.getItemCount()) {
+        language_combobox.setSelectedIndex(defaultIndex);
+        Configuration.setLocale("general.locale", true, defaultEntry.getLocale());
+        System.err.println("*** GLI doesn't yet support the language: " + language_code 
+                   + " and has therefore defaulted to: " + Configuration.getLanguage());
     }