Item13399: re-apply patches lost when I deleted the url-encoding code

foswiki · May 14, 2015 · 003ff53 · 003ff53
1 parent a9a5f7c
commit 003ff53
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/lib/Foswiki/I18N.pm b/core/lib/Foswiki/I18N.pm
@@ -80,7 +80,7 @@ sub _loadLexicon {
         unless (
             eval {
                 Locale::Maketext::Lexicon->import(
-                    { $lang => [ Gettext => $langFile ] } );
+                    { _decode => 1, $lang => [ Gettext => $langFile ] } );
                 1;
             }
           )
@@ -320,7 +320,7 @@ sub _discover_languages {
     #use the cache, if available
     if ( open LANGUAGE, '<', "$Foswiki::cfg{WorkingDir}/languages.cache" ) {
         $cache_open = 1;
-        foreach my $line (<LANGUAGE>) {
+        foreach my $line ( map { Encode::decode( 'utf-8', $_ ) } <LANGUAGE> ) {
             my ( $key, $name ) = split( '=', $line );
 
             # Filter on enabled languages