Changeset 4657

Timestamp:

2003-06-13T16:40:30+12:00 (21 years ago)

Author:

mdewsnip

Message:

Changed to use the new interface language variable in Configuration instead of the (incorrect) default language used for partition indexes.

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• CollectionMetaManager.java (modified) (5 diffs)
• TranslationManager.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/cdm/CollectionMetaManager.java

@@ -111 +111 @@
       */
     public CollectionMeta getCollectionExtra() {
-    CollectionMeta result = getMetadata("collectionextra", manager.languages.getDefaultLanguage(), true);
+    CollectionMeta result = getMetadata("collectionextra", Gatherer.config.interface_language, true);
     if(result == null) {
-        result = new CollectionMeta(manager, "collectionextra", manager.languages.getDefaultLanguage(), "");
+        result = new CollectionMeta(manager, "collectionextra", Gatherer.config.interface_language, "");
         addMetadata(result);
     }
@@ -123 +123 @@
       */
     public CollectionMeta getCollectionName() {
-    return getMetadata("collectionname", manager.languages.getDefaultLanguage(), true);
+    return getMetadata("collectionname", Gatherer.config.interface_language, true);
     }
     /** Retrieve the iconcollection metadata in the default language, if present.
@@ -130 +130 @@
       */
     public CollectionMeta getIconCollection() {
-    CollectionMeta result = getMetadata("iconcollection", manager.languages.getDefaultLanguage(), true);
+    CollectionMeta result = getMetadata("iconcollection", Gatherer.config.interface_language, true);
     if(result == null) {
-        result = new CollectionMeta(manager, "iconcollection", manager.languages.getDefaultLanguage(), "");
+        result = new CollectionMeta(manager, "iconcollection", Gatherer.config.interface_language, "");
         addMetadata(result);
     }
@@ -142 +142 @@
       */
     public CollectionMeta getIconCollectionSmall() {
-    CollectionMeta result = getMetadata("iconcollectionsmall", manager.languages.getDefaultLanguage(), true);
+    CollectionMeta result = getMetadata("iconcollectionsmall", Gatherer.config.interface_language, true);
     if(result == null) {
-        result = new CollectionMeta(manager, "iconcollectionsmall", manager.languages.getDefaultLanguage(), "");
+        result = new CollectionMeta(manager, "iconcollectionsmall", Gatherer.config.interface_language, "");
         addMetadata(result);
     }
@@ -261 +261 @@
             // Otherwise set language to the default language.
             else {
-            language = manager.languages.getDefaultLanguage();
+            language = Gatherer.config.interface_language;
             }
             if(key != null) {

trunk/gli/src/org/greenstone/gatherer/cdm/TranslationManager.java

@@ -291 +291 @@
                 bob = null;
                 // Retrieve the default language translation, or otherwise the first match, to be default text.
-                CollectionMeta default_metadata = manager.collectionmetadatum.getMetadata(selected_feature, manager.languages.getDefaultLanguage(), true);
+                CollectionMeta default_metadata = manager.collectionmetadatum.getMetadata(selected_feature, Gatherer.config.interface_language, true);
                 if(default_metadata != null) {
                 default_area.setText(default_metadata.getValue());