Peter M. Groen / knowledgetree

Commit 887c4eca28baab0c83d974a96e7534d5b5d3e4bb

Authored by michael
1 parent 1505fdb7

Set $default->defaultLanguage even if we're using the Accept Language header. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@2849 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 4 additions and 6 deletions
config/dmsDefaults.php
  View file @887c4ec
@@ -37,12 +37,10 @@ if (in_array("gettext", get_loaded_extensions()) && function_exists('gettext') & @@ -37,12 +37,10 @@ if (in_array("gettext", get_loaded_extensions()) && function_exists('gettext') &
37 if ($default->useAcceptLanguageHeader) { 37 if ($default->useAcceptLanguageHeader) {
38 $aInstalledLocales = getInstalledLocales(); 38 $aInstalledLocales = getInstalledLocales();
39 $sLocale=al2gt($aInstalledLocales, 'text/html'); 39 $sLocale=al2gt($aInstalledLocales, 'text/html');
40 - putenv('LANG=' . $sLocale);  
41 - setlocale(LC_MESSAGES, $sLocale);  
42 - } else {  
43 - putenv('LANG=' . $default->defaultLanguage);  
44 - setlocale(LC_MESSAGES, $default->defaultLanguage);  
45 - } 40 + $default->defaultLanguage = $sLocale;
  41 + }
  42 + putenv('LANG=' . $default->defaultLanguage);
  43 + setlocale(LC_MESSAGES, $default->defaultLanguage);
46 // Set the text domain 44 // Set the text domain
47 $sDomain = 'knowledgeTree'; 45 $sDomain = 'knowledgeTree';
48 bindtextdomain($sDomain, $default->fileSystemRoot . "/i18n"); 46 bindtextdomain($sDomain, $default->fileSystemRoot . "/i18n");