Changeset 1604 for branches/multiuser/init.php

Timestamp:

10/16/06 06:31:35 (2 years ago)

Author:

mdodoo

Message:

Sync with trunk up to (but not including changeset [1585]). I should *definitely* do this more often, because this was really annoying.

Files:

• branches/multiuser/init.php (modified) (3 diffs)

branches/multiuser/init.php

@@ -114 +114 @@
 ////////////////////////////////////////////////////////////////////////////////
 // Localization
-//
+_pf('Loading l10n...');
+
 require_once('cls/l10n.php');
-$GLOBALS['rssl10n'] = new RSSl10n('de_CH');
-
-$lang = getConfig('rss.output.lang');
-if (!preg_match('#^[a-zA-Z_]+$#', $lang)) {
-    die('woopsie, bad lang: ' .$lang);
-}
-if ($lang && file_exists(dirname(__FILE__) . "/" . "intl/$lang.php")) {
-    rss_require("intl/$lang.php");
-} else {
-    rss_require('intl/en.php');
-}
+$GLOBALS['rssl10n'] = new RSSl10n();
+$lang = $GLOBALS['rssl10n']->getLocale();
+_pf('done');
 
 // Theme  specific l10n handling
@@ -144 +137 @@
 }
 
-
+/*
 // Load the right locale
 if (defined('OVERRIDE_LOCALE')) {
@@ -164 +157 @@
     }
 }
-
+*/