--- /Users/christophe/Downloads/php-gettext-1.0.11/gettext.inc	2010-12-25 00:30:49.000000000 +0100
+++ /Users/christophe/Desktop/Eclipse Workspace/CheeseBurgames-BackOffice/mfx/3rd-party/php-gettext/gettext.inc	2014-03-04 09:22:37.000000000 +0100
@@ -173,9 +173,9 @@
 /**
  * Convert the given string to the encoding set by bind_textdomain_codeset.
  */
-function _encode($text) {
+function _encode($text, $domain = NULL) {
     $source_encoding = mb_detect_encoding($text);
-    $target_encoding = _get_codeset();
+    $target_encoding = _get_codeset($domain);
     if ($source_encoding != $target_encoding) {
         return mb_convert_encoding($text, $target_encoding, $source_encoding);
     }
@@ -299,7 +299,7 @@
  */
 function _dgettext($domain, $msgid) {
     $l10n = _get_reader($domain);
-    return _encode($l10n->translate($msgid));
+    return _encode($l10n->translate($msgid), $domain);
 }
 
 /**
@@ -307,7 +307,7 @@
  */
 function _dngettext($domain, $singular, $plural, $number) {
     $l10n = _get_reader($domain);
-    return _encode($l10n->ngettext($singular, $plural, $number));
+    return _encode($l10n->ngettext($singular, $plural, $number), $domain);
 }
 
 /**
@@ -315,14 +315,14 @@
  */
 function _dcgettext($domain, $msgid, $category) {
     $l10n = _get_reader($domain, $category);
-    return _encode($l10n->translate($msgid));
+    return _encode($l10n->translate($msgid), $domain);
 }
 /**
  * Plural version of dcgettext.
  */
 function _dcngettext($domain, $singular, $plural, $number, $category) {
     $l10n = _get_reader($domain, $category);
-    return _encode($l10n->ngettext($singular, $plural, $number));
+    return _encode($l10n->ngettext($singular, $plural, $number), $domain);
 }
 
 /**
@@ -338,7 +338,7 @@
  */
 function _dpgettext($domain, $context, $msgid) {
     $l10n = _get_reader($domain);
-    return _encode($l10n->pgettext($context, $msgid));
+    return _encode($l10n->pgettext($context, $msgid), $domain);
 }
 
 /**
@@ -346,7 +346,7 @@
  */
 function _dcpgettext($domain, $context, $msgid, $category) {
     $l10n = _get_reader($domain, $category);
-    return _encode($l10n->pgettext($context, $msgid));
+    return _encode($l10n->pgettext($context, $msgid), $domain);
 }
 
 /**
@@ -362,7 +362,7 @@
  */
 function _dnpgettext($domain, $context, $singular, $plural) {
     $l10n = _get_reader($domain);
-    return _encode($l10n->npgettext($context, $singular, $plural));
+    return _encode($l10n->npgettext($context, $singular, $plural), $domain);
 }
 
 /**
@@ -370,7 +370,7 @@
  */
 function _dcnpgettext($domain, $context, $singular, $plural, $category) {
     $l10n = _get_reader($domain, $category);
-    return _encode($l10n->npgettext($context, $singular, $plural));
+    return _encode($l10n->npgettext($context, $singular, $plural), $domain);
 }