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

[raeburn]

raeburn		Mon May 11 16:07:36 2015 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncommon.pm 
  Log:
  - For 2.11
    Backport 1.1220
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.93 loncom/interface/loncommon.pm:1.1075.2.94
--- loncom/interface/loncommon.pm:1.1075.2.93	Mon Apr 20 11:48:27 2015
+++ loncom/interface/loncommon.pm	Mon May 11 16:07:35 2015
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.93 2015/04/20 11:48:27 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.94 2015/05/11 16:07:35 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 Authen::Captcha;
 use Captcha::reCAPTCHA;
 use Crypt::DES;
@@ -980,6 +981,7 @@
                         $locale_names{$id} = '('.$en_terr.')';
                     }
                 }
+                $locale_names{$id} = Encode::encode('UTF-8',$locale_names{$id});
                 push (@possibles,$id);
             }
         }
@@ -991,7 +993,7 @@
         }
         $output.=">$item";
         if ($locale_names{$item} ne '') {
-            $output.="  $locale_names{$item}</option>\n";
+            $output.='  '.$locale_names{$item};
         }
         $output.="</option>\n";
     }