Changeset 6945 for trunk/gsdl/bin/script

Timestamp:

2004-03-07T15:18:16+13:00 (20 years ago)

Author:

mdewsnip

Message:

Updated the resource bundle handling code some more. Strings are first looked for in a language specific resource bundle (if specified). If not found there, the default resource bundle is checked. If still not found, the English resource bundle is checked. These resource bundles are loaded on an as-needed basis.

Location:

trunk/gsdl/bin/script

Files:

• buildcol.pl (modified) (1 diff)
• classinfo.pl (modified) (1 diff)
• exportcol.pl (modified) (1 diff)
• import.pl (modified) (1 diff)
• mkcol.pl (modified) (1 diff)
• pluginfo.pl (modified) (1 diff)

trunk/gsdl/bin/script/buildcol.pl

@@ -238 +238 @@
     }
 
-    # Load the appropriate resource bundle for the language specified
-    # If $language is not defined, the default resource bundle will be loaded
-    &gsprintf::load_resource_bundle($language);
+    # If $language has been specified, load the appropriate resource bundle
+    # (Otherwise, the default resource bundle will be loaded automatically)
+    if ($language) {
+    &gsprintf::load_language_specific_resource_bundle($language);
+    }
 
     if ($xml) {

trunk/gsdl/bin/script/classinfo.pl

@@ -99 +99 @@
     }
 
-    # Load the appropriate resource bundle for the language specified
-    # If $language is not defined, the default resource bundle will be loaded
-    &gsprintf::load_resource_bundle($language);
+    # If $language has been specified, load the appropriate resource bundle
+    # (Otherwise, the default resource bundle will be loaded automatically)
+    if ($language) {
+    &gsprintf::load_language_specific_resource_bundle($language);
+    }
 
     # Get classifier

trunk/gsdl/bin/script/exportcol.pl

@@ -88 +88 @@
     }
 
-    # Load the appropriate resource bundle for the language specified
-    # If $language is not defined, the default resource bundle will be loaded
-    &gsprintf::load_resource_bundle($language);
+    # If $language has been specified, load the appropriate resource bundle
+    # (Otherwise, the default resource bundle will be loaded automatically)
+    if ($language) {
+    &gsprintf::load_language_specific_resource_bundle($language);
+    }
 
     if ($xml) {

trunk/gsdl/bin/script/import.pl

@@ -248 +248 @@
     }
 
-    # Load the appropriate resource bundle for the language specified
-    # If $language is not defined, the default resource bundle will be loaded
-    &gsprintf::load_resource_bundle($language);
+    # If $language has been specified, load the appropriate resource bundle
+    # (Otherwise, the default resource bundle will be loaded automatically)
+    if ($language) {
+    &gsprintf::load_language_specific_resource_bundle($language);
+    }
 
     if ($xml) {

trunk/gsdl/bin/script/mkcol.pl

@@ -211 +211 @@
     &parse_args (\@ARGV);
 
-    # Load the appropriate resource bundle for the language specified
-    # If $language is not defined, the default resource bundle will be loaded
-    &gsprintf::load_resource_bundle($language);
+    # If $language has been specified, load the appropriate resource bundle
+    # (Otherwise, the default resource bundle will be loaded automatically)
+    if ($language) {
+    &gsprintf::load_language_specific_resource_bundle($language);
+    }
 
     if ($xml) {

trunk/gsdl/bin/script/pluginfo.pl

@@ -82 +82 @@
     }
 
-    # Load the appropriate resource bundle for the language specified
-    # If $language is not defined, the default resource bundle will be loaded
-    &gsprintf::load_resource_bundle($language);
+    # If $language has been specified, load the appropriate resource bundle
+    # (Otherwise, the default resource bundle will be loaded automatically)
+    if ($language) {
+    &gsprintf::load_language_specific_resource_bundle($language);
+    }
 
     my $plugin = shift (@ARGV);