Changeset 145 for trunk

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

Files:

• config-sample/config.php (modified) (1 diff)
• globals/classes/userdata.php (modified) (1 diff)
• globals/common.php (modified) (1 diff)
• globals/functions.php (modified) (2 diffs)
• globals/language/english.php (modified) (5 diffs)
• globals/language/greek.php (modified) (3 diffs)
• includes/main.php (modified) (1 diff)
• includes/main_menu.php (modified) (1 diff)
• includes/pages/users/users.php (modified) (2 diffs)
• templates/basic/images/flags (added)
• templates/basic/images/flags/english.gif (added)
• templates/basic/images/flags/greek.gif (added)
• templates/basic/includes/body.tpl (modified) (1 diff)
• templates/basic/includes/main_menu_logged.tpl (added)

trunk/config-sample/config.php

@@ -31 +31 @@
                 
         'language' => array(
-                'default' => 'greek'
+                'default' => 'greek',
+                'enabled' => array(
+                        'greek' => TRUE,
+                        'english' => TRUE)
                 ),
                 

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' => 'Αγγλικά'
         )
 

trunk/includes/main.php

@@ -51 +51 @@
                 global $lang;
                 
+                if (get('session_lang') != '') $_SESSION['lang'] = get('session_lang');
+                language_set($this->userdata->info['language']);
+                
                 $this->html->head->add_title($lang['site_title']);
                 $this->html->head->add_meta("text/html; charset=".$lang['charset'], "", "Content-Type");

trunk/includes/main_menu.php

@@ -34 +34 @@
                 if ($this->hide) return;
                 if ($_SERVER['REQUEST_METHOD'] == 'POST' && method_exists($this, 'output_onpost_'.$_POST['form_name'])) call_user_func(array($this, 'output_onpost_'.$_POST['form_name']));
-                global $construct, $main, $db;
+                global $construct, $main, $db, $vars, $lang;
                 $this->tpl['logged'] = $main->userdata->logged;
                 $this->tpl['form_login'] = $construct->form($this->form_login(), __FILE__);
-                $main->html->dody->tpl['form_login'] = $this->tpl['form_login'];
+                
+                $main->html->body->tpl['form_login'] = $this->tpl['form_login'];
+                $main->html->body->tpl['logged_username'] = $main->userdata->info['username'];
+                $main->html->body->tpl['link_logged_profile'] = makelink(array("page" => "users", "user" => $main->userdata->user));
+                
+                foreach($vars['language']['enabled'] as $key => $value) {
+                        if ($value) {
+                                $main->html->body->tpl['languages'][$key]['name'] = ($lang['languages'][$key]==''?$key:$lang['languages'][$key]);
+                                $main->html->body->tpl['languages'][$key]['link'] = makelink(array("session_lang" => $key), TRUE);
+                        }
+                }
+                
                 if ($main->userdata->logged) {
                         $this->tpl = array_merge($this->tpl, $main->userdata->info);

trunk/includes/pages/users/users.php

@@ -34 +34 @@
         
         function form_user() {
-                global $main, $db;
+                global $main, $db, $vars, $lang;
                 $form_user = new form(array('FORM_NAME' => 'form_user'));
                 $form_user->db_data('users.username, users.password, users.surname, users.name, users.email, users.phone, users.info'.($main->userdata->privileges['admin'] === TRUE?', rights.type, users.status':''));
-                $form_user->db_data_values("users", "id", get('user'));
                 // Hide password...
                 $form_user->data[1]['value'] = '';
@@ -54 +53 @@
                         $form_user->db_data_pickup("users_nodes.node_id", "nodes", $db->get("nodes.id AS value, CONCAT(nodes.name, ' (#', nodes.id, ')') AS output", "users_nodes, nodes", "nodes.id = users_nodes.node_id AND users_nodes.user_id = '".get('user')."' AND users_nodes.owner != 'Y'"), TRUE);           
                 }
+                $form_user->db_data('users.language');
+                $form_user->data[12]['Type'] = 'enum';
+                $form_user->data[12]['Null'] = '';
+                $form_user->data[12]['Type_Enums'][0] = array("value" => "", "output" => $lang['default']);
+                foreach($vars['language']['enabled'] as $key => $value) {
+                        if ($value) array_push($form_user->data[12]['Type_Enums'], array("value" => $key, "output" => ($lang['languages'][$key]==''?$key:$lang['languages'][$key])));
+                }
+                $form_user->db_data_values("users", "id", get('user'));
+                $form_user->data[1]['value'] = '';
                 return $form_user;
         }

trunk/templates/basic/includes/body.tpl

@@ -34 +34 @@
     <td class="table-middle-right-td">
         <table border="0" cellpadding="0" cellspacing="0" class="table-middle-right">
-  {if $menu != '' && $form_login != '' && $logged != TRUE}
-                <tr><td class="quick-login">
-                {$form_login}
-                </td></tr>
-  {/if}
-                <tr><td class="main-page">
-    {if $message==''}
-                {$center}
-    {else}
-        <table width="100%" border="0" cellpadding="50" cellspacing="0">
-        <tr><td align="center">
-        {$message}
-        </td></tr>
-        </table>
-    {/if}
-        </td></tr>
+        {if $menu != ''}
+                <tr>
+                        <td class="quick-login" width="100%">
+                        {if $logged}
+                                {include file="includes/main_menu_logged.tpl"}
+                        {else}
+                                {$form_login}
+                        {/if}
+                        </td>
+                        <td nowrap="nowrap" class="quick-login-field">
+                                {foreach key=key item=item from=$languages}
+                                <a href="{$item.link}"><img alt="{$item.name}" src="{$img_dir}flags/{$key}.gif" /></a> 
+                                {/foreach}
+                        </td>
+                </tr>
+          {/if}
+                <tr>
+                        <td class="main-page" colspan="2">
+                        {if $message==''}
+                                        {$center}
+                        {else}
+                                <table width="100%" border="0" cellpadding="50" cellspacing="0">
+                                        <tr>
+                                                <td align="center">
+                                                        {$message}
+                                                </td>
+                                        </tr>
+                                </table>
+                        {/if}
+                        </td>
+                </tr>
         </table>
-
-</td></tr>
+        
+        </td>
+</tr>
     
   {if $footer != ''}