Changeset 5232 for extensions/AMetaData/JpegMetaData

Timestamp:

Mar 21, 2010, 10:16:56 PM (14 years ago)

Author:

grum

Message:

fix bug : character encoding was wrong if there was no key to translate

File:

• extensions/AMetaData/JpegMetaData/Common/L10n.class.php (modified) (4 diffs)

extensions/AMetaData/JpegMetaData/Common/L10n.class.php

@@ -103 +103 @@
    *
    * @param String $language : the language
+   * @param String $charset  : charset encoding (UTF-8)
    * @return String : the defined language
    */
-  static function setLanguage($language="en_UK")
+  static function setLanguage($language="en_UK", $charset="UTF-8")
   {
     global $supported_locales;
@@ -146 +147 @@
     T_bindtextdomain(self::JMD_TAGDESC, dirname(dirname(__FILE__))."/Locale");
 
+    /*
+     * set the charsets
+     */
+    if($charset!="")
+    {
+      T_bind_textdomain_codeset(self::JMD_TAG, $charset);
+      T_bind_textdomain_codeset(self::JMD_TAGDESC, $charset);
+    }
+
     return(self::$language);
   }
@@ -166 +176 @@
   static function get($key)
   {
+    T_textdomain(self::JMD_TAG);
     return(@T_dgettext(self::JMD_TAG, $key));
   }
@@ -176 +187 @@
   static function getDesc($tagName)
   {
+    T_textdomain(self::JMD_TAGDESC);
     return(@T_dgettext(self::JMD_TAGDESC, $tagName));
   }