Changeset 6993

Timestamp:

2004-03-09T17:00:04+13:00 (20 years ago)

Author:

jrm21

Message:

allow other modules to change the encoding, instead of using the hard-coded
values in the resource file.

File:

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

trunk/gsdl/perllib/gsprintf.pm

@@ -34 +34 @@
 # Language-specific resource bundle
 my %specialresourcebundle = ();
-my $specialoutputencoding;
+our $specialoutputencoding; # our, so that it can be changed outside.
 
 # Default resource bundle
@@ -66 +66 @@
 {
     my ($stringkey) = @_;
-
     # Try the language-specific resource bundle first
     my $utf8string = $specialresourcebundle{$stringkey};
@@ -95 +94 @@
 
     # Return the string matching the key
-    return $utf8string if (!defined($outputencoding) || $outputstringsinUTF8);
+    return $utf8string if (!defined($outputencoding) || $outputstringsinUTF8
+               || $outputencoding eq "utf8");
 
     # If an 8-bit output encoding has been defined, encode the string appropriately