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

Timestamp:

2004-03-05T10:52:59+13:00 (20 years ago)

Author:

mdewsnip

Message:

Hopefully the last piece of the multilingual output functionality: uses the output encoding specified in the resource bundle. (Most times the output won't be wanted in UTF-8 -- rather an 8-bit encoding such as ISO 8859-1 suitable for terminals).

File:

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

trunk/gsdl/perllib/gsprintf.pm

@@ -28 +28 @@
 
 
+use unicode;
 use util;
 
@@ -33 +34 @@
 my $loadedlanguage = "<none>";
 my %loadedresourcebundle = ();
+my $outputencoding;
 
 
@@ -52 +54 @@
 sub lookup_string
 {
-    local ($stringkey) = @_;
+    my ($stringkey) = @_;
 
     # Load the default resource bundle if one isn't already loaded
@@ -59 +61 @@
     }
 
-    # Return the text matching the key (or just the key, if no match was found)
-    return $loadedresourcebundle{$stringkey} || $stringkey;
+    # Return just the key if there is no string matching the key
+    return $stringkey if (!defined($loadedresourcebundle{$stringkey}));
+
+    # Otherwise return the string matching the key
+    my $utf8_string = $loadedresourcebundle{$stringkey};
+    return $utf8_string if (!defined($outputencoding) || $outputencoding eq "UTF-8");
+
+    # If an 8-bit output encoding has been defined, encode the string appropriately
+    return &unicode::unicode2singlebyte(&unicode::utf82unicode($utf8_string), $outputencoding);
 }
 
@@ -66 +75 @@
 sub load_resource_bundle
 {
-    local $language = shift(@_);
+    my $language = shift(@_);
 
     # If the desired resource bundle is the one already loaded, no action is necessary
@@ -74 +83 @@
 
     # 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);
+    my $resourcebundlehome = &util::filename_cat("$ENV{'GSDLHOME'}", "perllib");
+    my $resourcebundlename = "strings_" . $language . ".rb";
+    my $resourcebundlefile = &util::filename_cat($resourcebundlehome, $resourcebundlename);
 
     # If the specific resource bundle cannot be opened, use the generic (English) one
@@ -86 +95 @@
     }
 
-    local @resourcebundlelines = <RESOURCE_BUNDLE>;
+    my @resourcebundlelines = <RESOURCE_BUNDLE>;
     close(RESOURCE_BUNDLE);
 
@@ -100 +109 @@
         # Parse key (everything up to the first colon)
         $line =~ /^([^:]+):(.+)$/;
-        local $linekey = "{" . $1 . "}";
-        local $linetext = $2;
+        my $linekey = "{" . $1 . "}";
+        my $linetext = $2;
 
         # Map key to text
@@ -107 +116 @@
     }
     }
+
+    # Read the output encoding to use from the resource bundle
+    if ($ENV{'GSDLOS'} =~ /windows/) {
+    $outputencoding = $loadedresourcebundle{"{OutputEncoding.windows}"};
+    }
+    else {
+    $outputencoding = $loadedresourcebundle{"{OutputEncoding.unix}"};
+    }
+}
+
+
+sub get_output_encoding
+{
+    return $outputencoding;
+}
+
+
+sub set_output_encoding
+{
+    $outputencoding = shift(@_);
 }