Item13378: couple of patches from JozefMojzis for encoding issues

foswiki · May 14, 2015 · a9a5f7c · a9a5f7c
1 parent fd18802
commit a9a5f7c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/SpreadSheetPlugin/lib/Foswiki/Plugins/SpreadSheetPlugin/Calc.pm b/SpreadSheetPlugin/lib/Foswiki/Plugins/SpreadSheetPlugin/Calc.pm
@@ -313,11 +313,10 @@ my $Function = {
     PERCENTILE       => \&_PERCENTILE,
     PI               => sub { 3.1415926535897932384 },
     PRODUCT          => \&_PRODUCT,
-    PROPER           => sub {    # FIXME: I18N
-                         my $rslt = lc( $_[0]);
-                         $rslt =~ s/(^|[^a-z])([a-z])/$1 . uc($2)/ge;
-                         return $rslt;
-                       },
+    PROPER           => sub {
+        $_[0] =~ s/(\w+)/\u\L$1/g;
+        return $_[0];
+    },
     PROPERSPACE      => sub { _properSpace($_[0]) },
     RAND             => sub {
                         my $max = _getNumber($_[0]);

diff --git a/core/lib/Foswiki/I18N.pm b/core/lib/Foswiki/I18N.pm
@@ -339,7 +339,7 @@ sub _discover_languages {
         foreach my $tag ( available_languages() ) {
             my $h = Foswiki::I18N->get_handle($tag);
             my $name = eval { $h->maketext("_language_name") } or next;
-            print LANGUAGE "$tag=$name\n" if $cache_open;
+            print LANGUAGE Encode::encode_utf8("$tag=$name\n") if $cache_open;
 
             # Filter on enabled languages
             next