Changeset 31419

Timestamp:

2017-02-16T14:34:57+13:00 (7 years ago)

Author:

kjdon

Message:

new arg to lookup_string: pass in a 1 if you want the output to be perl internal (unicode-aware) strings, rather than utf8. We want this for eg when we get the 'this document has no text' message, its going into doc_obj which is using perl strings not utf8. Strangely, the few places where we are calling lookup_string for this purpose, it is already passing in an extra 1 arg. do do do do...

File:

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

main/trunk/greenstone2/perllib/gsprintf.pm

@@ -30 +30 @@
 @gsprintf::ISA=qw(Exporter);
 
+use Encode;
+
 use unicode;
 use util;
@@ -87 +89 @@
 }
 
+    
 
 sub lookup_string
 {
-    my ($stringkey) = @_;
+    my ($stringkey, $native_perl) = @_;
+    
+    if (!defined $native_perl || $native_perl != 1) {
+    $native_perl = 0;
+    }
     return "" unless defined $stringkey;
     # Try the language-specific resource bundle first
@@ -119 +126 @@
     }
     
-    # Return the string matching the key
-    return $utf8string if (!defined($outputencoding) || $outputstringsinUTF8
-               || $outputencoding eq "utf8");
-    
+    if ($native_perl ==1) {
+    # decode the utf8 string to perl internal format
+    return decode("utf8", $utf8string);
+    }
+    
+    # Return the utf8 string if our output encoding is utf8
+    if (!defined($outputencoding) || $outputstringsinUTF8
+    || $outputencoding eq "utf8") {
+    return $utf8string;
+    }
+
     # If an 8-bit output encoding has been defined, encode the string appropriately
     my $encoded=unicode::unicode2singlebyte(&unicode::utf82unicode($utf8string), $outputencoding);