From: Alan Knowles <alan@roojs.com>
Date: Thu, 10 Dec 2020 06:52:13 +0000 (+0800)
Subject: DataObjects/Core_template.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=ac314ebc88d2c36c64085a4894ab7f89e1a11155

DataObjects/Core_template.php
---

diff --git a/DataObjects/Core_template.php b/DataObjects/Core_template.php
index 143e8a72..684d90a1 100644
--- a/DataObjects/Core_template.php
+++ b/DataObjects/Core_template.php
@@ -401,7 +401,11 @@ WHERE (
     function genGetText($clsname, $lang=false)
     {
         static $done = false;
+        $clsname = strtolower($clsname);
+
         textdomain($clsname);
+     
+
         $ff = HTML_FlexyFramework::get();
         $lang = $lang ? $lang : (isset($ff->locale) ? $ff->locale : 'en');
         
@@ -412,7 +416,6 @@ WHERE (
         
         putenv("LANGUAGE=$lang");
         setlocale(LC_ALL, $lang);
-        $clsname = strtolower($clsname);
         $d = DB_DataObject::factory($this->tableName());
         $d->whereAdd("
             LOWER(
@@ -444,7 +447,9 @@ WHERE (
         
          
         //exit;
-         bindtextdomain($clsname, $compileDir) ;
+        bindtextdomain($clsname, $compileDir) ;
+        bind_textdomain_codeset($clsname, 'UTF-8');
+
         textdomain($clsname);