Changeset 145 for trunk/globals

Timestamp:

02/27/2006 05:41:32 AM (6 years ago)

Author:

Winner

Message:

Add: Language selection from GUI. Closes #89
Fix: 2 english language addition from changeset [144].

Location:

trunk/globals

Files:

• classes/userdata.php (modified) (1 diff)
• common.php (modified) (1 diff)
• functions.php (modified) (2 diffs)
• language/english.php (modified) (5 diffs)
• language/greek.php (modified) (3 diffs)

trunk/globals/classes/userdata.php

@@ -32 +32 @@
         var $username_key = "username";
         var $password_key = "password";
-        var $info_keys = "username, name, surname, date_in, last_visit, last_session, status";
+        var $info_keys = "username, name, surname, date_in, last_visit, last_session, status, language";
         var $last_session_key = "last_session";
         var $last_visit_key = "last_visit";

trunk/globals/common.php

@@ -61 +61 @@
 }
 
-//INCLUDE LANGUAGE
-if (get('lang') != '') {
-        $tl = get('lang');
-} elseif ($_SESSION['lang'] != '') {
-        $tl = $_SESSION['lang'];
-} else {
-        $tl = $vars['language']['default'];
-}
-include_once(ROOT_PATH."globals/language/".$tl.".php");
-if (file_exists(ROOT_PATH."config/language/".$tl."_overwrite.php")) {
-        include_once(ROOT_PATH."config/language/".$tl."_overwrite.php");
-        $lang = array_multimerge($lang, $lang_overwrite);
-}
-// Set-up mbstring's internal encoding (mainly for supporting UTF-8)
-mb_internal_encoding($lang['charset']);
-
 $db = new mysql($vars['db']['server'], $vars['db']['username'], $vars['db']['password'], $vars['db']['database']);
-
-if($vars['db']['version']>=4.1)
-        $db->query("SET NAMES '".$lang['mysql_charset']."'");
 
 if ($db->error) {

trunk/globals/functions.php

@@ -72 +72 @@
                         array_unshift($valid_array, '');
                         break;
-                case 'lang':
-                        $valid_array = getdirlist(ROOT_PATH."globals/language/", FALSE, TRUE);
-                        for ($key=0;$key<count($valid_array);$key++) {
-                                $valid_array[$key] = basename($valid_array[$key], '.php');
-                        }
-                        array_unshift($valid_array, '');
-                        break;
         }
         if (isset($valid_array) && !in_array($ret, $valid_array)) $ret = $valid_array[0];
@@ -336 +329 @@
 }
 
+function language_set($language='', $force=FALSE) {
+        global $vars, $db, $lang;
+        if ($force) {
+                $tl = $lang;
+        } elseif (get('lang') != '') {
+                $tl = get('lang');
+        } elseif ($_SESSION['lang'] != '') {
+                $tl = $_SESSION['lang'];
+        } elseif ($language != '') {
+                $tl = $language;
+        } else {
+                $tl = $vars['language']['default'];
+        }
+        
+        if ($vars['language']['enabled'][$tl] === TRUE && 
+                        file_exists(ROOT_PATH."globals/language/".$tl.".php")) {
+
+                include_once(ROOT_PATH."globals/language/".$tl.".php");
+                if (file_exists(ROOT_PATH."config/language/".$tl."_overwrite.php")) {
+                        include_once(ROOT_PATH."config/language/".$tl."_overwrite.php");
+                        $lang = array_multimerge($lang, $lang_overwrite);
+                }
+                // Set-up mbstring's internal encoding (mainly for supporting UTF-8)
+                mb_internal_encoding($lang['charset']);
+                
+                // Set-up NAMES on database system
+                if($vars['db']['version']>=4.1)
+                        $db->query("SET NAMES '".$lang['mysql_charset']."'");
+
+        } else {
+
+                if ($tl == $_SESSION['lang']) unset($_SESSION['lang']);
+                die("WiND error: Selected language not found.");
+
+        }
+}
 ?>

trunk/globals/language/english.php

@@ -37 +37 @@
         'home' => "Home",
         'edit_profile' => "User profile",
+        'edit_node' => "Node edit",
         'log_out' => "Log out",
         'login' => "Log in",
@@ -76 +77 @@
         'node' => "Node",
         'node_info' => "Node info",
+        'node_view' => "Node view",
         'node_delete' => "Delete node",
         'ip_range_request' => "IP C-Class request",
@@ -156 +158 @@
         'backbone_nodes' => "Backbone nodes",
         'null' => "(null)",
+        'default' => 'Default',
+        'logged' => 'Logged in as',
 
         'db' => array(
@@ -169 +173 @@
                 'users__status-pending' => 'Pending',
                 'users__status-activated' => 'Activated',
+                'users__language' => 'Language',
                 'fullname' => 'Full Name',
                 
@@ -606 +611 @@
                         'body' => 'In this page you can send a message to the administrator(s) of the node. Your e-mail address will appear to your message, so that you can get a reply from the receiver(s). Each reply to your message will be sent to your e-mail address and will contain the e-mail address of the sender(s), so that you can reply to them back.'
                 )
+        ),
+        
+        'languages' => array(
+                'greek' => 'Greek',
+                'english' => 'English'
         )
 

trunk/globals/language/greek.php

@@ -206 +206 @@
         'backbone_nodes' => "Backbone κόΌβοι",
         'null' => "(ΚεΜό)",
+        'default' => "ΠροεπιλεγΌέΜη",
+        'logged' => "ΣύΜΎεση ως",
 
         'db' => array(
@@ -220 +222 @@
                 'users__status-pending' => 'Σε αΜαΌοΜή',
                 'users__status-activated' => 'ΕΜεργοποιηΌέΜη',
+                'users__language' => 'Γλώσσα',
                 'fullname' => 'ΟΜοΌατεπώΜÏ
 Όο',
@@ -950 +953 @@
 ΎροΌείο.'
                 )
+        ),
+        
+        'languages' => array(
+                'greek' => 'ΕλληΜικά',
+                'english' => 'Αγγλικά'
         )