summaryrefslogtreecommitdiffstats
path: root/lib/gettext.php
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-10-14 17:29:07 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2006-10-14 17:29:07 +0000
commit78167c02518ff9d757741f0e8df524da300d067d (patch)
treed5fbbc41f6e807439de0d34ca9a06616dd961d04 /lib/gettext.php
parent9a16ee2c2ce55e7693c9432be2466210a0ebc6df (diff)
downloadampache-78167c02518ff9d757741f0e8df524da300d067d.tar.gz
ampache-78167c02518ff9d757741f0e8df524da300d067d.tar.bz2
ampache-78167c02518ff9d757741f0e8df524da300d067d.zip
removed extra lines from ajax, down to 86, updated ajax calls, added ldap auth
Diffstat (limited to 'lib/gettext.php')
-rw-r--r--lib/gettext.php20
1 files changed, 16 insertions, 4 deletions
diff --git a/lib/gettext.php b/lib/gettext.php
index 56e175e9..4af41a59 100644
--- a/lib/gettext.php
+++ b/lib/gettext.php
@@ -27,13 +27,25 @@
function load_gettext() {
/* If we have gettext */
if (function_exists('bindtextdomain')) {
- bindtextdomain('messages', conf('prefix') . "/locale/");
- textdomain('messages');
$lang = conf('lang');
putenv("LANG=" . $lang);
+ putenv("LANGUAGE=" . $lang);
/* Try lang, lang + charset and lang + utf-8 */
- setlocale(LC_ALL, $lang,$lang . '.'. conf('site_charset'),$lang . '.UTF-8',$lang . '.' . conf('lc_charset'));
- }
+ setlocale(LC_ALL,
+ $lang,
+ $lang . '.'. conf('site_charset'),
+ $lang . '.UTF-8',
+ $lang . '.utf-8',
+ $lang . '.' . conf('lc_charset'));
+
+ /* Bind the Text Domain */
+ bindtextdomain('messages', conf('prefix') . "/locale/");
+ textdomain('messages');
+ if (function_exists('bind_textdomain_codeset')) {
+ bind_textdomain_codeset('messages',conf('site_charset'));
+ } // if we can codeset the textdomain
+
+ } // If bindtext domain exists
} // load_gettext