Changeset 6925 for trunk/gsdl/perllib/gsprintf.pm

Timestamp:

2004-03-04T16:37:57+13:00 (20 years ago)

Author:

mdewsnip

Message:

Changed the way display in different languages is done. Instead of passing a language variable throughout the process, the desired resource bundle is explicitly loaded during the initialization of each program (buildcol.pl, classinfo.pl, exportcol.pl, import.pl mkcol.pl, pluginfo.pl).

File:

• trunk/gsdl/perllib/gsprintf.pm (modified) (6 diffs)

trunk/gsdl/perllib/gsprintf.pm

@@ -31 +31 @@
 
 
+my $loadedlanguage = "<none>";
+my %loadedresourcebundle = ();
+
+
 sub gsprintf
 {
@@ -39 +43 @@
 
     # Look up all the strings in the dictionary
-    $text_string =~ s/(\{[^\}]+\})/&lookup_string("", $1)/eg;
+    $text_string =~ s/(\{[^\}]+\})/&lookup_string($1)/eg;
 
     # Resolve the string arguments using sprintf, then write out to the handle
@@ -48 +52 @@
 sub lookup_string
 {
-    local ($language, $stringkey) = @_;
+    local ($stringkey) = @_;
 
-    # Load the default resource bundle
-    local %resourcebundle = &load_resource_bundle($language);
+    # Load the default resource bundle if one isn't already loaded
+    if ($loadedlanguage eq "<none>") {
+    &load_resource_bundle("");
+    }
 
     # Return the text matching the key (or just the key, if no match was found)
-    return $resourcebundle{$stringkey} || $stringkey;
+    return $loadedresourcebundle{$stringkey} || $stringkey;
 }
 
-
-my $cachedlanguage = "<none>";
-my %cachedresourcebundle = ();
 
 sub load_resource_bundle
@@ -65 +68 @@
     local $language = shift(@_);
 
-    # If the desired resource bundle is the one cached, return it
-    if ($language eq $cachedlanguage) {
-    return %cachedresourcebundle;
+    # If the desired resource bundle is the one already loaded, no action is necessary
+    if ($language eq $loadedlanguage) {
+    return;
     }
 
@@ -86 +89 @@
     close(RESOURCE_BUNDLE);
 
-    # Load and cache this resource bundle
-    $cachedlanguage = $language;
-    %cachedresourcebundle = ();
+    # Load this resource bundle
+    $loadedlanguage = $language;
+    %loadedresourcebundle = ();
     foreach $line (@resourcebundlelines) {
     # Remove any trailing whitespace
@@ -101 +104 @@
 
         # Map key to text
-        $cachedresourcebundle{$linekey} = $linetext;
+        $loadedresourcebundle{$linekey} = $linetext;
     }
     }
-
-    return %cachedresourcebundle;
 }