summaryrefslogtreecommitdiffstats
path: root/lib/gettext.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-03-30 05:03:47 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-03-30 05:03:47 +0000
commit828b2288207a9f24ea264d0456d7ff951b931fe3 (patch)
tree1654aca49503078fdef8b94425b461a571c4ea9b /lib/gettext.php
parent4243b22ee54bcef23172d45ae0fff57633f7a9ab (diff)
downloadampache-828b2288207a9f24ea264d0456d7ff951b931fe3.tar.gz
ampache-828b2288207a9f24ea264d0456d7ff951b931fe3.tar.bz2
ampache-828b2288207a9f24ea264d0456d7ff951b931fe3.zip
final commit before beta2 release
Diffstat (limited to 'lib/gettext.php')
-rw-r--r--lib/gettext.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/gettext.php b/lib/gettext.php
index 602f3365..6db831ac 100644
--- a/lib/gettext.php
+++ b/lib/gettext.php
@@ -29,8 +29,10 @@ function load_gettext() {
if (function_exists('bindtextdomain')) {
bindtextdomain('messages', conf('prefix') . "/locale/");
textdomain('messages');
- putenv("LANG=" . conf('lang'));
- setlocale(LC_ALL, conf('lang'));
+ $lang = conf('lang');
+ putenv("LANG=" . $lang);
+ /* Try lang, lang + charset and lang + utf-8 */
+ setlocale(LC_ALL, $lang,$lang . '_'. conf('site_charset'),$lang . '_UTF-8');
}
} // load_gettext