From b32a0b4336a3182df4896ca207f3f30c264b0061 Mon Sep 17 00:00:00 2001
From: Max Kanat-Alexander <mkanat@bugzilla.org>
Date: Sun, 28 Mar 2010 14:19:26 -0700
Subject: Bug 550765: Unicode strings from install_string were showing up as
 garbage when used in the web interface r=LpSolit, a=LpSolit

---
 Bugzilla/Install/Util.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Bugzilla/Install/Util.pm')

diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm
index 233e08e19..6621a7a41 100644
--- a/Bugzilla/Install/Util.pm
+++ b/Bugzilla/Install/Util.pm
@@ -265,6 +265,8 @@ sub install_string {
     die "No language defines the string '$string_id'"
         if !defined $string_template;
 
+    utf8::decode($string_template) if !utf8::is_utf8($string_template);
+
     $vars ||= {};
     my @replace_keys = keys %$vars;
     foreach my $key (@replace_keys) {
@@ -281,7 +283,7 @@ sub install_string {
         }
         $string_template =~ s/\Q##$key##\E/$replacement/g;
     }
-    
+
     return $string_template;
 }
 
-- 
cgit v1.2.3-24-g4f1b