[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm

[raeburn]

raeburn		Mon May 11 14:21:39 2015 EDT

  Modified files:              
    /loncom/interface	loncommon.pm 
  Log:
  - Country names retrieved from DateTime::Locale::Catalog::Locales need to
    be UTF-8 encoded.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1219 loncom/interface/loncommon.pm:1.1220
--- loncom/interface/loncommon.pm:1.1219	Tue Apr 28 12:59:08 2015
+++ loncom/interface/loncommon.pm	Mon May 11 14:21:39 2015
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1219 2015/04/28 12:59:08 raeburn Exp $
+# $Id: loncommon.pm,v 1.1220 2015/05/11 14:21:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -73,6 +73,7 @@
 use LONCAPA qw(:DEFAULT :match);
 use DateTime::TimeZone;
 use DateTime::Locale::Catalog;
+use Encode();
 use Text::Aspell;
 use Authen::Captcha;
 use Captcha::reCAPTCHA;
@@ -983,6 +984,7 @@
                         $locale_names{$id} = '('.$en_terr.')';
                     }
                 }
+                $locale_names{$id} = Encode::encode('UTF-8',$locale_names{$id});
                 push (@possibles,$id);
             }
         }
@@ -994,7 +996,7 @@
         }
         $output.=">$item";
         if ($locale_names{$item} ne '') {
-            $output.="  $locale_names{$item}</option>\n";
+            $output.='  '.$locale_names{$item};
         }
         $output.="</option>\n";
     }