Changeset 2625

Show
Ignore:
Timestamp:
09/28/06 09:00:56 (7 years ago)
Author:
qldrob
Message:

Huge thanks to shimi for helping me out with fixing these translation bugs. The non-Latin1 languages now work properly. Yay! Fixes #1000 and probably #988 too.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • freepbx/trunk/amp_conf/htdocs/admin/config.php

    r2617 r2625  
    122122        if(is_dir("modules/{$key}/i18n")) { 
    123123          bindtextdomain($key,"modules/{$key}/i18n"); 
     124          bind_textdomain_codeset($key, 'utf8') 
    124125          textdomain($key); 
    125126        } else { 
     
    187188          if(is_dir("./modules/{$modkey}/i18n")) { 
    188189            bindtextdomain($modkey,"./modules/{$modkey}/i18n"); 
     190            bind_textdomain_codeset($modkey, 'utf8'); 
    189191            textdomain($modkey); 
    190192          } 
     
    275277if (extension_loaded('gettext')) { 
    276278  bindtextdomain('amp','./i18n'); 
     279  bind_textdomain_codeset('amp', 'utf8'); 
    277280  textdomain('amp'); 
    278281} 
  • freepbx/trunk/amp_conf/htdocs/admin/header.php

    r2617 r2625  
    5555    if (isset($_COOKIE['lang'])) { 
    5656      setlocale(LC_MESSAGES,  $_COOKIE['lang']); 
    57       putenv("LANG=".$_COOKIE['lang']); 
     57      putenv("LANGUAGE=".$_COOKIE['lang']); 
    5858    } else { 
    5959      setlocale(LC_MESSAGES,  'en_US');