From 828b2288207a9f24ea264d0456d7ff951b931fe3 Mon Sep 17 00:00:00 2001
From: Karl 'vollmerk' Vollmer <vollmer@ampache.org>
Date: Thu, 30 Mar 2006 05:03:47 +0000
Subject: final commit before beta2 release

---
 lib/gettext.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/gettext.php')

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
-- 
cgit