Changeset 5357

Timestamp:

Mar 25, 2010, 9:18:28 PM (14 years ago)

Author:

patdenice

Message:

Feature 1535: Add language manager.

Location:

trunk

Files:

• admin.php (modified) (1 diff)
• admin/include/functions.php (modified) (1 diff)
• admin/include/languages.class.php (added)
• admin/languages_installed.php (added)
• admin/themes/default/default-layout.css (modified) (3 diffs)
• admin/themes/default/template/admin.tpl (modified) (1 diff)
• admin/themes/default/template/languages_installed.tpl (added)
• include/functions.inc.php (modified) (1 diff)
• install.php (modified) (5 diffs)
• install/db/90-database.php (modified) (1 diff)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/fr_FR/admin.lang.php (modified) (1 diff)

trunk/admin.php

@@ -112 +112 @@
     'U_CONFIG_EXTENTS'=> $link_start.'extend_for_templates',
     'U_CONFIG_MENUBAR'=> $link_start.'menubar',
+    'U_CONFIG_LANGUAGES' => $link_start.'languages_installed',
     'U_CONFIG_THEMES'=> $link_start.'themes_installed',
     'U_CATEGORIES'=> $link_start.'cat_list',

trunk/admin/include/functions.php

@@ -1950 +1950 @@
     case 'themes_new':
     case 'themes_installed':
+    case 'languages_installed':
       return 5;
   }

trunk/admin/themes/default/default-layout.css

@@ -37 +37 @@
 }
 
-/* Plugins tables */
+/* Plugins, languages tables */
 TABLE.plugins { min-width: 400px; }
 TABLE.plugins A { border: 0; }
@@ -43 +43 @@
 TABLE.plugins TR TD.pluginState { padding: 4px 16px; }
 
-TABLE.plugins TR TD.active {
+TABLE.plugins TR TD.active,
+TABLE.languages TR TD.active {
         background: url(icon/plugin_active.gif) no-repeat center left;
         background-color: inherit; /* IE need it */
@@ -63 +64 @@
 
 TABLE.plugins ul.pluginsActions li { display: inline; }
+
+TABLE.languages  { min-width: 400px; }
+TABLE.languages TR TD { text-align: center; padding: 4px 20px; }
 
 /* categoryOrdering */

trunk/admin/themes/default/template/admin.tpl

@@ -85 +85 @@
         <li><a href="{$U_CONFIG_MENUBAR}">{'Menu'|@translate}</a></li>
         <li><a href="{$U_CONFIG_EXTENTS}">{'Templates'|@translate}</a></li>
+        <li><a href="{$U_CONFIG_LANGUAGES}">{'Languages'|@translate}</a></li>
         <li><a href="{$U_CONFIG_THEMES}">{'Themes'|@translate}</a></li>
       </ul>

trunk/include/functions.inc.php

@@ -397 +397 @@
  * @returns array
  */
-function get_languages($target_charset = null)
-{
-  if ( empty($target_charset) )
-  {
-    $target_charset = get_pwg_charset();
-  }
-  $target_charset = strtolower($target_charset);
-
-  $dir = opendir(PHPWG_ROOT_PATH.'language');
+function get_languages()
+{
+  $query = '
+SELECT id, name
+  FROM '.LANGUAGES_TABLE.'
+  ORDER BY name ASC
+;';
+  $result = pwg_query($query);
+
   $languages = array();
-
-  while ($file = readdir($dir))
-  {
-    $path = PHPWG_ROOT_PATH.'language/'.$file;
-    if (!is_link($path) and is_dir($path) and file_exists($path.'/iso.txt'))
-    {
-      list($language_name) = @file($path.'/iso.txt');
-
-      $languages[$file] = convert_charset($language_name, $target_charset);
-    }
-  }
-  closedir($dir);
-  @asort($languages);
+  while ($row = pwg_db_fetch_assoc($result))
+  {
+    if (is_dir(PHPWG_ROOT_PATH.'language/'.$row['id']))
+    {
+      $languages[ $row['id'] ] = $row['name'];
+    }
+  }
 
   return $languages;

trunk/install.php

@@ -189 +189 @@
 include(PHPWG_ROOT_PATH . 'admin/include/functions_upgrade.php');
 
+include(PHPWG_ROOT_PATH . 'admin/include/languages.class.php');
+$languages = new languages('utf-8');
+
 if (isset($_GET['language']))
 {
@@ -197 +200 @@
   $language = 'en_UK';
   // Try to get browser language
-  foreach (get_languages('utf-8') as $language_code => $language_name)
+  foreach ($languages->fs_languages as $language_code => $language_name)
   {
     if (substr($language_code,0,2) == @substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2))
@@ -287 +290 @@
       $pwg_db_charset = 'latin1';
       $install_charset_collate = '';
-      if ( !array_key_exists($language, get_languages($pwg_charset) ) )
+      if ( !array_key_exists($language, $languages->get_fs_languages($pwg_charset) ) )
       {
         $language='en_UK';
@@ -376 +379 @@
 
     // fill languages table
-    $inserts = array();
-    foreach (get_languages('utf-8') as $language_code => $language_name)
-    {
-      $inserts[] = array(
-        'id' => $language_code,
-        'name' => $language_name,
-      );
-    }
-    mass_inserts(LANGUAGES_TABLE, array('id', 'name'), $inserts);
+    foreach ($languages->get_fs_languages($pwg_charset) as $language_code => $language_name)
+    {
+      $languages->perform_action('activate', $language_code);
+    }
 
     // fill $conf global array
@@ -476 +474 @@
   $dbengines = available_engines();
 
-  foreach (get_languages('utf-8') as $language_code => $language_name)
+  foreach ($languages->fs_languages as $language_code => $language_name)
   {
     if ($language == $language_code)

trunk/install/db/90-database.php

@@ -45 +45 @@
 
 // Fill table
-$inserts = array();
-foreach (get_languages('utf-8') as $language_code => $language_name)
+include_once(PHPWG_ROOT_PATH.'include/constants.php');
+include_once(PHPWG_ROOT_PATH.'admin/include/languages.class.php');
+
+$languages = new languages(PWG_CHARSET);
+
+foreach ($languages->fs_languages as $language_code => $language_name)
 {
-  $inserts[] = array(
-    'id' => $language_code,
-    'name' => $language_name,
-  );
+  $languages->perform_action('activate', $language_code);
 }
-mass_inserts(PREFIX_TABLE.'languages', array('id', 'name'), $inserts);
 
 echo

trunk/language/en_UK/admin.lang.php

@@ -750 +750 @@
 $lang['Activate field "%s"'] = 'Activate field "%s"';
 $lang['Photo Properties'] = 'Photo Properties';
-$lang['Allow user customization'] = 'Allow user customization'; 
+$lang['Allow user customization'] = 'Allow user customization';
+$lang['Languages'] = 'Languages';
 ?>

trunk/language/fr_FR/admin.lang.php

@@ -752 +752 @@
 $lang['Visit Piwigo project website'] = 'Visiter le site web du projet Piwigo';
 $lang['pLoader stands for <em>Piwigo Uploader</em>. From your computer, pLoader prepares your photos and transfer them to your Piwigo photo gallery.'] = 'pLoader signifie <em>Piwigo Uploader</em>. Depuis votre ordinateur, pLoader prépare vos photos et les transfert vers votre galerie photo Piwigo.';
+$lang['Languages'] = 'Langues';
 ?>