Grab language to use from a cookie, and implement _kt using the internal

i18n infrastructure. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5141 c91229c3-7414-0410-bfa2-8a42b809f60b

Grab language to use from a cookie, and implement _kt using the internal
i18n infrastructure. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5141 c91229c3-7414-0410-bfa2-8a42b809f60b
nbm
1 parent 30453465
Showing 2 changed files with 15 additions and 31 deletions
config/dmsDefaults.php
lib/i18n/i18nutil.inc.php
@@ -120,30 +120,16 @@ class KTInit {
     // {{{ setupI18n()
     /**
-     * setupI
+     * setupI18n
      *
      */
     function setupI18n () {
         require_once(KT_LIB_DIR . '/i18n/i18nutil.inc.php');
         require_once("HTTP.php");
         global $default;
-        if (in_array("gettext", get_loaded_extensions()) && function_exists('gettext') && function_exists('_')) {
-            if ($default->useAcceptLanguageHeader) {
-                $aInstalledLocales = KTi18nUtil::getInstalledLocales();
-                $sLocale = $aInstalledLocales[HTTP::negotiateLanguage($aInstalledLocales)];
-                $default->defaultLanguage = $sLocale;
-            }
-            putenv('LANG=' . $default->defaultLanguage);
-            putenv('LANGUAGE=' . $default->defaultLanguage);
-            setlocale(LC_ALL, $default->defaultLanguage);
-            // Set the text domain
-            $sDomain = 'knowledgeTree';
-            bindtextdomain($sDomain, $default->fileSystemRoot . "/i18n");
-            textdomain($sDomain);
-            return true;
-        } else {
-            return false;
-            $default->log->info("Gettext not installed, i18n disabled.");
+        $language = KTUtil::arrayGet($_COOKIE, 'kt_language');
+        if ($language) {
+            $default->defaultLanguage = $language;
         }
     }
     // }}}
@@ -467,13 +453,6 @@ class KTInit {
 $KTInit = new KTInit();
-// handle unexpected errors in smarty somewhat more gracefully, even if no gettext is installed.
-if (!function_exists('_')) { 
-    function _kt($s) { return $s; }
-} else {
-    function _kt($s) { return _($s); }
-}
-
 $KTInit->prependPath(KT_DIR . '/thirdparty/pear');
 $KTInit->prependPath(KT_DIR . '/thirdparty/Smarty');
 require_once('PEAR.php');
@@ -487,6 +466,9 @@ require_once(KT_LIB_DIR . &#39;/util/ktutil.inc&#39;);
 require_once(KT_LIB_DIR . "/config/config.inc.php");
 $KTInit->initConfig(); 
+
+$KTInit->setupI18n();
+
 $oKTConfig =& KTConfig::getSingleton();
 $KTInit->setupServerVariables();
@@ -506,13 +488,7 @@ require_once(KT_LIB_DIR . &#39;/database/lookup.inc&#39;);
 // table mapping entries
 include("tableMappings.inc");
-$i18nLoaded = $KTInit->setupI18n();
-if ($i18nLoaded === false) {
-    // gettext dummy already loaded.
-}
-
 $default->systemVersion = trim(file_get_contents(KT_DIR . '/docs/VERSION.txt'));
-$default->lastDatebaseVersion = '2.0.2';
 $KTInit->cleanGlobals();
 $KTInit->cleanMagicQuotes();
@@ -529,4 +505,6 @@ if ($checkup !== true) {
     KTPluginUtil::loadPlugins();
 }
+$GLOBALS['main'] =& new KTPage();
+
 ?>
@@ -58,3 +58,9 @@ class KTi18nUtil {
         return $aLocales;
     }
 }
+
+function _kt($sContents) {
+    $oReg =& KTi18nRegistry::getSingleton();
+    $oi18n =& $oReg->geti18n('knowledgeTree');
+    return $oi18n->gettext($sContents);
+}