Changeset 12261

Timestamp:

Sep 29, 2011, 4:52:06 PM (13 years ago)

Author:

patdenice

Message:

Add missing language keys for auto-upgrade (only error keys).

Location:

trunk

Files:

• admin/include/updates.class.php (modified) (6 diffs)
• admin/themes/default/template/updates_pwg.tpl (modified) (1 diff)
• language/en_UK/admin.lang.php (modified) (1 diff)

trunk/admin/include/updates.class.php

@@ -39 +39 @@
 
     if (preg_match('/(\d+\.\d+)\.(\d+)/', PHPWG_VERSION, $matches)
-      and @fetchRemote(PHPWG_URL.'/download/all_versions.php', $result))
+      and @fetchRemote(PHPWG_URL.'/download/all_versions.php?rand='.md5(uniqid(rand(), true)), $result))
     {
       $all_versions = @explode("\n", $result);
@@ -137 +137 @@
     if (!$this->get_server_extensions())
     {
-      autoupdate_error();
+      return false;
     }
 
@@ -394 +394 @@
       $end = false;
       $zip = @fopen($filename, 'w');
+
       while (!$end)
       {
@@ -455 +456 @@
             if ($step == 2)
             {
-              array_push($page['infos'], sprintf(l10n('autoupdate_success'), $upgrade_to));
+              array_push($page['infos'], l10n('Update Complete'), $upgrade_to);
               $step = -1;
             }
@@ -467 +468 @@
             file_put_contents($conf['local_data_dir'].'/update/log_error.txt', $error);
             $relative_path = trim(str_replace(dirname(dirname(dirname(dirname(__FILE__)))), '', $conf['local_data_dir']), '/\\');
-            array_push($page['errors'], sprintf(l10n('autoupdate_extract_fail'), PHPWG_ROOT_PATH.$relative_path.'/update/log_error.txt'));
+            array_push(
+              $page['errors'],
+              sprintf(
+                l10n('An error has occured during extract. Please check files permissions of your piwigo installation.<br><a href="%s">Click here to show log error</a>.'),
+                PHPWG_ROOT_PATH.$relative_path.'/update/log_error.txt'
+              )
+            );
           }
         }
@@ -473 +480 @@
         {
           self::deltree($conf['local_data_dir'].'/update');
-          array_push($page['errors'], l10n('autoupdate_fail'));
+          array_push($page['errors'], l10n('An error has occured during upgrade.'));
         }
       }

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

@@ -2 +2 @@
 jQuery(document).ready(function() {ldelim}
         jQuery('input[name="submit"]').click(function() {ldelim}
-    if(!confirm('{'autoupdate_alert'|@translate}'))
+    if(!confirm('{'Are you sure?'|@translate}'))
       return false;
     jQuery(this).hide();

trunk/language/en_UK/admin.lang.php

@@ -861 +861 @@
 $lang['By default, Piwigo will create a new websize from the HD (high definition) version of your photo.'] = 'By default, Piwigo will create a new websize from the HD (high definition) version of your photo.';
 $lang['If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.'] = 'If no HD is available and if the current websize is bigger than resize dimensions, Piwigo will move it as HD and create a downsized websize photo from it.';
+
+$lang['An error has occured during upgrade.'] = 'An error has occured during upgrade.';
+$lang['An error has occured during extract. Please check files permissions of your piwigo installation.<br><a href="%s">Click here to show log error</a>.'] = 'An error has occured during extract. Please check files permissions of your piwigo installation.<br><a href="%s">Click here to show log error</a>.';
+$lang['Piwigo cannot retrieve upgrade file from server'] = 'Piwigo cannot retrieve upgrade file from server';
 ?>