Changeset 5682 for trunk/gsdl/perllib/printusage.pm

Timestamp:

2003-10-20T15:08:01+13:00 (21 years ago)

Author:

mdewsnip

Message:

Changed to use the gsprintf module, which makes using strings from the resource bundle much easier.

File:

• trunk/gsdl/perllib/printusage.pm (modified) (7 diffs)

trunk/gsdl/perllib/printusage.pm

@@ -26 +26 @@
 
 package PrintUsage;
+
+
+use gsprintf;
 
 
@@ -53 +56 @@
     foreach $option (@$options) {
     local $optionname = $option->{'name'};
-    local $optiondesc = &lookup_string($language, $option->{'desc'});
+    local $optiondesc = &gsprintf::lookup_string($language, $option->{'desc'});
 
     # Escape '<' and '>' characters
@@ -78 +81 @@
         print STDERR "          <Name>$optionvalue->{'name'}</Name>\n";
         if (defined $optionvalue->{'desc'}) {
-            local $optionvaluedesc = &lookup_string($language, $optionvalue->{'desc'});
+            local $optionvaluedesc = &gsprintf::lookup_string($language, $optionvalue->{'desc'});
 
             # Escape '<' and '>' characters
@@ -156 +159 @@
 
     # Display the option description
-    local $optiondesc = &lookup_string($language, $option->{'desc'});
+    local $optiondesc = &gsprintf::lookup_string($language, $option->{'desc'});
     local $optionreqd = $option->{'reqd'};
     if (defined($optionreqd) && $optionreqd eq "yes") {
-        $optiondesc = "(REQUIRED) " . $optiondesc;
+        $optiondesc = "(" . &gsprintf::lookup_string($language, "{PrintUsage.required}") . ") " . $optiondesc;
     }
     &display_text_in_column($optiondesc, $optiondescoffset, $optionstringlength, 80);
@@ -167 +170 @@
     if (defined($optiondefault)) {
         print STDERR " " x $optiondescoffset;
-        print STDERR "Default: " . $optiondefault . "\n";
+        print STDERR &gsprintf::lookup_string($language, "{PrintUsage.default}");
+        print STDERR ": " . $optiondefault . "\n";
     }
 
@@ -179 +183 @@
         print STDERR "$optionvaluename:";
 
-        local $optionvaluedesc = &lookup_string($language, $optionvalue->{'desc'});
+        local $optionvaluedesc = &gsprintf::lookup_string($language, $optionvalue->{'desc'});
         &display_text_in_column($optionvaluedesc, $optiondescoffset + 2,
                     $optiondescoffset + length($optionvaluename), 80);
@@ -204 +208 @@
 
 
-sub lookup_string
-{
-    local ($language, $stringkey) = @_;
-
-    # 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;
-}
-
-
-my $cachedlanguage = "<none>";
-my %cachedresourcebundle = ();
-
-sub load_resource_bundle
-{
-    local $language = shift(@_);
-
-    # If the desired resource bundle is the one cached, return it
-    if ($language eq $cachedlanguage) {
-    return %cachedresourcebundle;
-    }
-
-    # Open the appropriate resource bundle
-    local $resourcebundlehome = &util::filename_cat("$ENV{'GSDLHOME'}", "perllib");
-    local $resourcebundlename = "strings_" . $language . ".rb";
-    local $resourcebundlefile = &util::filename_cat($resourcebundlehome, $resourcebundlename);
-
-    # If the specific resource bundle cannot be opened, use the generic (English) one
-    if (!open(RESOURCE_BUNDLE, "<$resourcebundlefile")) {
-    $resourcebundlename = "strings.rb";
-    $resourcebundlefile = &util::filename_cat($resourcebundlehome, $resourcebundlename);
-    open(RESOURCE_BUNDLE, "<$resourcebundlefile")
-        or die "Error: Could not open generic resource bundle $resourcebundlefile.\n";
-    }
-
-    local @resourcebundlelines = <RESOURCE_BUNDLE>;
-    close(RESOURCE_BUNDLE);
-
-    # Load and cache this resource bundle
-    $cachedlanguage = $language;
-    %cachedresourcebundle = ();
-    foreach $line (@resourcebundlelines) {
-    # Remove any trailing whitespace
-    $line =~ s/(\s*)$//;
-
-    # Ignore comments and empty lines
-    if ($line !~ /^\#/ && $line ne "") {
-        # Parse key (everything up to the first colon)
-        $line =~ /^([^:]+):(.+)$/;
-        local $linekey = "{" . $1 . "}";
-        local $linetext = $2;
-
-        # Map key to text
-        $cachedresourcebundle{$linekey} = $linetext;
-    }
-    }
-
-    return %cachedresourcebundle;
-}
-
-
 sub display_text_in_column
 {