From 2a529cf743274f63cd15f7f33b58b943338e1049 Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Tue, 15 Jan 2013 18:27:29 -0800 Subject: [PATCH 1/1] BUGFIX: use english language as default in set_language before the previous language was kept which could have been e.g. German, even if the person didn't choose German. --- include/functions.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/include/functions.php b/include/functions.php index d7ff065..a332347 100644 --- a/include/functions.php +++ b/include/functions.php @@ -1726,16 +1726,19 @@ function set_language($l,$type='lang') case 'de': putenv("LC_ALL=de_DE"); setlocale(LC_ALL, "de_DE"); - // Specify location of translation tables - bindtextdomain("edoko", "./locale"); - bind_textdomain_codeset("edoko", 'UTF-8'); - // Choose domain - textdomain("edoko"); break; default: - /* do nothing */ + putenv("LC_ALL=en_US"); + setlocale(LC_ALL, "en_US"); + break; } + // Specify location of translation tables + bindtextdomain("edoko", "./locale"); + bind_textdomain_codeset("edoko", 'UTF-8'); + // Choose domain + textdomain("edoko"); + return; } -- 2.17.1