Changeset 398 for trunk/include

Timestamp:

Mar 27, 2004, 2:24:26 PM (20 years ago)

Author:

gweltas

Message:

• Split of infos.lang.php

Location:

trunk/include

Files:

• config.inc.php (modified) (1 diff)
• functions_user.inc.php (modified) (2 diffs)
• htmlfunctions.inc.php (modified) (3 diffs)
• page_header.php (modified) (1 diff)

trunk/include/config.inc.php

@@ -54 +54 @@
 $conf['anti-flood_time']    = 60; // seconds between 2 comments : 0 to disable
 $conf['max_LOV_categories'] = 50;
-$conf['default_style']      = 'default';
-$conf['default_lang']       = 'en_EN';
+
 ?>

trunk/include/functions_user.inc.php

@@ -231 +231 @@
 {
   global $conf, $template, $lang, $lang_info;
-  include_once(PHPWG_ROOT_PATH . 'language/infos.lang.php');
-  
+    
   $language = (!empty($userdata['language']) && !$userdata['is_the_guest'] )?$userdata['language']:$conf['default_lang'];
   $style = (!empty($userdata['template'])&& !$userdata['is_the_guest'] )?$userdata['template']:$conf['default_style'];
@@ -252 +251 @@
   }
   
-  $lang_info['current_code']=$language;
   $template= setup_style($style);
   return;

trunk/include/htmlfunctions.inc.php

@@ -113 +113 @@
 function language_select($default, $select_name = "language")
 {
-  global $lang_info;
+
   $dir = opendir(PHPWG_ROOT_PATH . 'language');
   $available_lang= array();
@@ -119 +119 @@
   while ( $file = readdir($dir) )
   {
-    if (is_dir ( realpath(PHPWG_ROOT_PATH.'language/'.$file) ) 
-          && !is_link(realpath(PHPWG_ROOT_PATH  . 'language/' . $file))
-          && isset($lang_info['language'][$file]))
+    $path= realpath(PHPWG_ROOT_PATH . 'language/'.$file);
+    if (is_dir ($path) && !is_link($path) && file_exists($path . '/iso.txt'))
     {
-      $available_lang[$file] = $lang_info['language'][$file];
+          list($displayname) = @file($path . '/iso.txt');
+          $available_lang[$displayname] = $file;
     }
   }
@@ -131 +131 @@
 
   $lang_select = '<select name="' . $select_name . '" onchange="this.form.submit()">';
-  while ( list($code, $displayname) = @each($available_lang) )
+  foreach ($available_lang as $displayname => $code)
   {
     $selected = ( strtolower($default) == strtolower($code) ) ? ' selected="selected"' : '';

trunk/include/page_header.php

@@ -31 +31 @@
 $template->set_filenames(array('header'=>'header.tpl'));
 
-$charset = empty($lang_info['charset'][$lang_info['current_code']])?
-  $lang_info['default']['charset']:$lang_info['charset'][$lang_info['current_code']];
-$dir = empty($lang_info['direction'][$lang_info['current_code']])?
-  $lang_info['default']['direction']:$lang_info['direction'][$lang_info['current_code']];
-
 $css = PHPWG_ROOT_PATH.'template/'.$user['template'].'/'.$user['template'].'.css';
 $template->assign_vars(array(
-  'CONTENT_ENCODING' => $charset,
+  'CONTENT_ENCODING' => $lang_info['charset'],
   'PAGE_TITLE' => $title,
-  'LANG'=>substr($lang_info['current_code'],0,2),
-  'DIR'=>$dir,
+  'LANG'=>$lang_info['code'],
+  'DIR'=>$lang_info['direction'],
   
   'T_STYLE' => $css