From 887c4eca28baab0c83d974a96e7534d5b5d3e4bb Mon Sep 17 00:00:00 2001
From: michael <michael@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Tue, 11 May 2004 12:09:49 +0000
Subject: [PATCH] Set $default->defaultLanguage even if we're using the Accept Language header.

---
 config/dmsDefaults.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/config/dmsDefaults.php b/config/dmsDefaults.php
index e827bc2..466cfe6 100644
--- a/config/dmsDefaults.php
+++ b/config/dmsDefaults.php
@@ -37,12 +37,10 @@ if (in_array("gettext", get_loaded_extensions()) && function_exists('gettext') &
 	if ($default->useAcceptLanguageHeader) {
 	    $aInstalledLocales = getInstalledLocales();
 	    $sLocale=al2gt($aInstalledLocales, 'text/html');
-	    putenv('LANG=' . $sLocale);
-	    setlocale(LC_MESSAGES, $sLocale);
-	} else {		
-		putenv('LANG=' . $default->defaultLanguage); 
-		setlocale(LC_MESSAGES, $default->defaultLanguage);
-	}
+	    $default->defaultLanguage = $sLocale;
+	}		
+	putenv('LANG=' . $default->defaultLanguage); 
+	setlocale(LC_MESSAGES, $default->defaultLanguage);
 	// Set the text domain
 	$sDomain = 'knowledgeTree';
 	bindtextdomain($sDomain, $default->fileSystemRoot . "/i18n"); 
--
libgit2 0.21.4