From 244148cbee3d70fb52155631a0e02641498c2424 Mon Sep 17 00:00:00 2001 From: billz Date: Sun, 27 May 2018 15:50:16 +0000 Subject: [PATCH] Cleaned up locale detection --- includes/locale.php | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/includes/locale.php b/includes/locale.php index 30502b94..88709220 100755 --- a/includes/locale.php +++ b/includes/locale.php @@ -17,28 +17,24 @@ if (!isset($_SESSION["locale"])) { $lang = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2); switch ($lang){ - case "de": - $locale = "de_DE.UTF-8"; - break; case "fr": $locale = "fr_FR.UTF-8"; break; case "it": $locale = "it_IT.UTF-8"; break; - case "es": - $locale = "es_ES.UTF-8"; - break; - default: - $locale = "en_US.UTF-8"; + default: + $locale = "en_GB.UTF-8"; break; } } -// Uncomment for testing // Note: the associated locale must be installed on the RPi +// Use: 'sudo raspi-configure' and select 'Localisation Options' +// Uncomment for testing // $locale = "fr_FR.UTF-8"; -$_SESSION["locale"] = $locale; +$_SESSION["locale"] = $locale; + // activate the locale setting putenv("LANG=" . $_SESSION["locale"]); setlocale(LC_ALL, $_SESSION["locale"]);