Changeset 9520

Timestamp:

Mar 4, 2011, 12:35:38 PM (13 years ago)

Author:

patdenice

Message:

feature:2210
Update language from piwigo.org extension repository

Location:

trunk

Files:

• admin/include/languages.class.php (modified) (8 diffs)
• admin/languages_update.php (added)
• admin/themes/default/template/languages_update.tpl (added)
• install.php (modified) (1 diff)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/fr_FR/admin.lang.php (modified) (1 diff)

trunk/admin/include/languages.class.php

@@ -33 +33 @@
   function languages($target_charset = null)
   {
-    $this->fs_languages = $this->get_fs_languages($target_charset);
+    $this->get_fs_languages($target_charset);
   }
 
@@ -48 +48 @@
     $tabsheet = new tabsheet();
     $tabsheet->add('languages_installed', l10n('Installed Languages'), $link.'languages_installed');
+    $tabsheet->add('languages_update', l10n('Check for updates'), $link.'languages_update');
     $tabsheet->add('languages_new', l10n('Add New Language'), $link.'languages_new');
     $tabsheet->select($selected);
@@ -171 +172 @@
         {
           $language = array(
+              'name'=>$file,
               'code'=>$file,
               'version'=>'0',
@@ -212 +214 @@
     closedir($dir);
     @uasort($this->fs_languages, 'name_compare');
-
-    return $this->fs_languages;
   }
 
@@ -283 +283 @@
       'version' => implode(',', $versions_to_check),
       'lang' => $user['language'],
+      'get_nb_downloads' => 'true',
       )
     );
@@ -308 +309 @@
         if (preg_match('/^.*? \[[A-Z]{2}\]$/', $language['extension_name']))
         {
-          $this->server_languages[$language['extension_name']] = $language;
-        }
-      }
-      @ksort($this->server_languages);
+          $this->server_languages[$language['extension_id']] = $language;
+        }
+      }
+      @uasort($this->server_languages, array($this, 'extension_name_compare'));
       return true;
     }
@@ -379 +380 @@
                 if ($status == 'ok')
                 {
-                  $this->fs_languages = $this->get_fs_languages();
-                  $this->perform_action('activate', $dest);
+                  $this->get_fs_languages();
+                  if ($action == 'install')
+                  {
+                    $this->perform_action('activate', $dest);
+                  }
                 }
                 if (file_exists($extract_path.'/obsolete.list')
@@ -472 +476 @@
     }
   }
+
+  /**
+   * Sort functions
+   */
+  function language_version_compare($a, $b)
+  {
+    $pattern = array('/([a-z])/ei', '/\.+/', '/\.\Z|\A\./');
+    $replacement = array( "'.'.intval('\\1', 36).'.'", '.', '');
+
+    $array = preg_replace($pattern, $replacement, array($a, $b));
+
+    return version_compare($array[0], $array[1], '>=');
+  }
+
+  function extension_name_compare($a, $b)
+  {
+    return strcmp(strtolower($a['extension_name']), strtolower($b['extension_name']));
+  }
 }
 ?>

trunk/install.php

@@ -341 +341 @@
 
     // fill languages table
-    foreach ($languages->get_fs_languages() as $language_code => $fs_language)
+    foreach ($languages->fs_languages as $language_code => $fs_language)
     {
       $languages->perform_action('activate', $language_code);

trunk/language/en_UK/admin.lang.php

@@ -771 +771 @@
 $lang['[Simulation]'] = "[Simulation]";
 $lang['Themes which need upgrade'] = 'Themes which need upgrade';
+$lang['Languages which need upgrade'] = 'Languages which need upgrade';
 $lang['All themes are up to date.'] = 'All themes are up to date.';
 $lang['All plugins are up to date.'] = 'All plugins are up to date.';
+$lang['All languages are up to date.'] = 'All languages are up to date.';
 $lang['Visit theme site'] = 'Visit theme site';
 $lang['New Version'] = 'New Version';

trunk/language/fr_FR/admin.lang.php

@@ -782 +782 @@
 $lang['Remove from caddie'] = 'Retirer du panier';
 $lang['Themes which need upgrade'] = 'Thèmes à mettre à jour';
+$lang['Languages which need upgrade'] = 'Langues à mettre à jour';
 $lang['All themes are up to date.'] = 'Tous les thèmes sont à jour.';
 $lang['All plugins are up to date.'] = 'Tous les plugins sont à jour.';
+$lang['All languages are up to date.'] = 'Toutes les langues sont à jour.';
 $lang['Visit theme site'] = 'Visitez le site du thème';
 $lang['New Version'] = 'Nouvelle version';