# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1400256730 -10800
# Node ID 9e863763108915d0b6648c8167f2aa8a213f853c
# Parent  4024f663a8e75858fc73e6e3c08f0bd39ce0ea04
Fix stStrChop() and stStrChopPad() UTF-8 handling.

diff -r 4024f663a8e7 -r 9e8637631089 msitegen.inc.php
--- a/msitegen.inc.php	Tue May 06 16:26:48 2014 +0300
+++ b/msitegen.inc.php	Fri May 16 19:12:10 2014 +0300
@@ -644,13 +644,16 @@
 
 function stStrChop($str, $len)
 {
-  return (strlen($str) > $len) ? substr($str, 0, $len - 3)."..." : $str;
+  return (mb_strlen($str) > $len) ? mb_substr($str, 0, $len - 3)."..." : $str;
 }
 
 
 function stStrChopPad($str, $len)
 {
-  return sprintf("%-".$len."s", stStrChop($str, $len));
+  $tmp = stStrChop($str, $len);
+  for ($i = mb_strlen($tmp); $i < $len; $i++)
+    $tmp .= " ";
+  return $tmp;
 }
 
 
@@ -792,9 +795,7 @@
 {
   $localeInited = TRUE;
 
-  if (!isset($pageCharset))
-    $pageCharset = "UTF-8";
-
+  $pageCharset = "UTF-8";
   mb_internal_encoding($pageCharset);
 
   $tmp = "en_US.".strtolower(str_replace("-", "", $pageCharset));