--- loncom/interface/loncommon.pm	2015/04/06 19:06:45	1.1075.2.91
+++ loncom/interface/loncommon.pm	2015/05/11 16:07:35	1.1075.2.94
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.91 2015/04/06 19:06:45 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 Apache::courseclassifier();
 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 @@ sub select_datelocale {
                         $locale_names{$id} = '('.$en_terr.')';
                     }
                 }
+                $locale_names{$id} = Encode::encode('UTF-8',$locale_names{$id});
                 push (@possibles,$id);
             }
         }
@@ -991,7 +993,7 @@ sub select_datelocale {
         }
         $output.=">$item";
         if ($locale_names{$item} ne '') {
-            $output.="  $locale_names{$item}</option>\n";
+            $output.='  '.$locale_names{$item};
         }
         $output.="</option>\n";
     }
@@ -4648,13 +4650,15 @@ END_MYBLOCK
   
     my $popupUrl = "/adm/blockingstatus/$querystring";
     my $text = &mt('Communication Blocked');
+    my $class = 'LC_comblock';
     if ($activity eq 'docs') {
         $text = &mt('Content Access Blocked');
+        $class = '';
     } elsif ($activity eq 'printout') {
         $text = &mt('Printing Blocked');
     }
     $output .= <<"END_BLOCK";
-<div class='LC_comblock'>
+<div class='$class'>
   <a onclick='openWindow("$popupUrl","Blocking Table",600,300,"no","no");return false;' href='/adm/blockingstatus/$querystring'
   title='$text'>
   <img class='LC_noBorder LC_middle' title='$text' src='/res/adm/pages/comblock.png' alt='$text'/></a>
@@ -7483,20 +7487,22 @@ ADDMETA
                                 $result.=<<OFFLOAD
 <meta http-equiv="pragma" content="no-cache" />
 <script type="text/javascript">
+// <![CDATA[
 function LC_Offload_Now() {
     var dest = "$newurl";
     if (dest != '') {
         window.location.href="$newurl";
     }
 }
-window.alert('$msg');
-if ($disable_submit) {
-    \$(document).ready(function () {
+\$(document).ready(function () {
+    window.alert('$msg');
+    if ($disable_submit) {
         \$(".LC_hwk_submit").prop("disabled", true);
         \$( ".LC_textline" ).prop( "readonly", "readonly");
-    });
-}
-setTimeout('LC_Offload_Now()', $timeout);
+    }
+    setTimeout('LC_Offload_Now()', $timeout);
+});
+// ]]>
 </script>
 OFFLOAD
                             }
@@ -15959,7 +15965,7 @@ sub create_recaptcha {
     my $captcha = Captcha::reCAPTCHA->new;
     return $captcha->get_options_setter({theme => 'white'})."\n".
            $captcha->get_html($pubkey,undef,$use_ssl).
-           &mt('If either word is hard to read, [_1] will replace them.',
+           &mt('If the text is hard to read, [_1] will replace them.',
                '<img src="/res/adm/pages/refresh.gif" alt="reCAPTCHA refresh" />').
            '<br /><br />';
 }