[geeklog-cvs] geeklog: Set language before setting theme in lib-common.php - a...

[geeklog-cvs at lists.geeklog.net]

changeset 8552:048e06f372c9
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/048e06f372c9
user: Rouslan Placella <rouslan at placella.com>
date: Fri Mar 23 19:25:20 2012 +0000
description:
Set language before setting theme in lib-common.php - allows themes to be language aware

diffstat:

 public_html/lib-common.php |  88 +++++++++++++++++++++++-----------------------
 1 files changed, 44 insertions(+), 44 deletions(-)

diffs (112 lines):

diff -r 64bbee5effd4 -r 048e06f372c9 public_html/lib-common.php
--- a/public_html/lib-common.php	Fri Mar 23 19:08:44 2012 +0000
+++ b/public_html/lib-common.php	Fri Mar 23 19:25:20 2012 +0000
@@ -286,6 +286,50 @@
 */
 require_once( $_CONF['path_system'] . 'lib-mbyte.php' );
 
+// Set language
+
+if( isset( $_COOKIE[$_CONF['cookie_language']] ) && empty( $_USER['language'] ))
+{
+    $language = COM_sanitizeFilename($_COOKIE[$_CONF['cookie_language']]);
+    if( is_file( $_CONF['path_language'] . $language . '.php' ) &&
+            ( $_CONF['allow_user_language'] == 1 ))
+    {
+        $_USER['language'] = $language;
+        $_CONF['language'] = $language;
+    }
+}
+else if( !empty( $_USER['language'] ))
+{
+    if( is_file( $_CONF['path_language'] . $_USER['language'] . '.php' ) &&
+            ( $_CONF['allow_user_language'] == 1 ))
+    {
+        $_CONF['language'] = $_USER['language'];
+    }
+}
+else if( !empty( $_CONF['languages'] ) && !empty( $_CONF['language_files'] ))
+{
+    $_CONF['language'] = COM_getLanguage();
+}
+
+/**
+*
+* Language include
+*
+*/
+
+require_once $_CONF['path_language'] . $_CONF['language'] . '.php';
+
+if (empty($LANG_DIRECTION)) {
+    // default to left-to-right
+    $LANG_DIRECTION = 'ltr';
+}
+
+COM_switchLocaleSettings();
+
+if( setlocale( LC_ALL, $_CONF['locale'] ) === false ) {
+    setlocale( LC_TIME, $_CONF['locale'] );
+}
+
 // Set theme
 
 $usetheme = '';
@@ -369,30 +413,6 @@
     $_IMAGE_TYPE = 'gif';
 }
 
-// Similarly set language
-
-if( isset( $_COOKIE[$_CONF['cookie_language']] ) && empty( $_USER['language'] ))
-{
-    $language = COM_sanitizeFilename($_COOKIE[$_CONF['cookie_language']]);
-    if( is_file( $_CONF['path_language'] . $language . '.php' ) &&
-            ( $_CONF['allow_user_language'] == 1 ))
-    {
-        $_USER['language'] = $language;
-        $_CONF['language'] = $language;
-    }
-}
-else if( !empty( $_USER['language'] ))
-{
-    if( is_file( $_CONF['path_language'] . $_USER['language'] . '.php' ) &&
-            ( $_CONF['allow_user_language'] == 1 ))
-    {
-        $_CONF['language'] = $_USER['language'];
-    }
-}
-else if( !empty( $_CONF['languages'] ) && !empty( $_CONF['language_files'] ))
-{
-    $_CONF['language'] = COM_getLanguage();
-}
 
 // Handle Who's Online block
 /*
@@ -419,26 +439,6 @@
 DB_query( "UPDATE {$_TABLES['sessions']} SET whos_online = 0 WHERE start_time < " . ( time() - $_CONF['whosonline_threshold'] ));
 
 /**
-*
-* Language include
-*
-*/
-
-require_once $_CONF['path_language'] . $_CONF['language'] . '.php';
-
-if (empty($LANG_DIRECTION)) {
-    // default to left-to-right
-    $LANG_DIRECTION = 'ltr';
-}
-
-COM_switchLocaleSettings();
-
-if( setlocale( LC_ALL, $_CONF['locale'] ) === false )
-{
-    setlocale( LC_TIME, $_CONF['locale'] );
-}
-
-/**
 * Global array of groups current user belongs to
 *
 * @global array $_GROUPS