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

Timestamp:

2004-03-04T15:44:37+13:00 (20 years ago)

Author:

mdewsnip

Message:

Tidied up gsprintf code in preparation for adding the French/Spanish/Russian translations.

File:

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

trunk/gsdl/perllib/gsprintf.pm

@@ -39 +39 @@
 
     # Look up all the strings in the dictionary
-    $text_string =~ s/(\{[^\}]+\})/&new_lookup_string($1)/eg;
+    $text_string =~ s/(\{[^\}]+\})/&lookup_string("", $1)/eg;
 
     # Resolve the string arguments using sprintf, then write out to the handle
@@ -46 +46 @@
 
 
-sub new_lookup_string
+sub lookup_string
 {
-    local ($stringkey) = @_;
+    local ($language, $stringkey) = @_;
 
     # Load the default resource bundle
-    local %resourcebundle = &load_resource_bundle("");
+    local %resourcebundle = &load_resource_bundle($language);
 
     # Return the text matching the key (or just the key, if no match was found)
@@ -109 +109 @@
 
 
-#  sub gsprintf
-#  {
-#      my ($handle, $verbosity_threshold, $text_string, @text_arguments) = @_;
-
-#      # Return unless the required arguments were supplied
-#      return unless (defined($handle) && defined($verbosity_threshold) && defined($text_string));
-
-#      # Return if the verbosity threshold isn't met
-#      return if (defined($verbosity) && $verbosity < $verbosity_threshold);
-
-#      # Look up all the strings in the dictionary
-#      $text_string =~ s/(\{[^\}]+\})/&new_lookup_string($1)/eg;
-
-#      # Resolve the string arguments using sprintf, then write out to the handle
-#      print $handle sprintf($text_string, @text_arguments);
-#  }
-
-
-sub lookup_string
-{
-    local ($language, $stringkey) = @_;
-
-    $language = "" if !defined($language);
-
-    # Load the appropriate resource bundle
-    local %resourcebundle = &load_resource_bundle($language);
-
-    # Return the text matching the key (or just the key, if no match was found)
-    return $resourcebundle{$stringkey} || $stringkey;
-}
-
-
 1;
-
-