Changeset 1529:9f6e5c3c8344 for admin/update.php

Timestamp:

08/23/13 10:41:38 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

1530:18df991c4c1a, 1531:18a9e84c04e3, 1641:ae5dc7a055e1, 1885:d4803b6eba12

Parents:

1528:41b40915bb82 (diff), 1515:03b3235091cf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2.5 commits into default branch

Files:

• admin/update.php (modified) (3 diffs)
• admin/update.php (modified) (1 diff)

admin/update.php

@@ -174 +174 @@
           dcPage::jsPageTabs($default_tab).
           dcPage::jsLoad('js/_update.js')
-     : '')
+          : ''),
+     dcPage::breadcrumb(
+          array(
+               __('System') => '',
+               '<span class="page-title">'.__('Dotclear update').'</span>' => ''
+          ))
 );
 
 if (!$core->error->flag()) {
-     echo '<h2>'.__('Dotclear update').'</h2>';
-     
      if (!empty($_GET['nocache'])) {
           dcPage::message(__('Manual checking of update done successfully.'));
@@ -200 +203 @@
           echo
                '<p class="static-msg">'.sprintf(__('Dotclear %s is available.'),$new_v).
-                    ($version_info ? ' <a href="'.$version_info.'">('.__('information about this version').')</a>' : '').
+                    ($version_info ? ' <a href="'.$version_info.'">('.__('Information about this version').')</a>' : '').
                     '</p>'.
           
@@ -246 +249 @@
      '<p class="message">'.
      __("Congratulations, you're one click away from the end of the update.").
-     ' <strong><a href="index.php?logout=1">'.__('Finish the update.').'</a></strong>'.
+     ' <strong><a href="index.php?logout=1">'.__('Finish the update').'</a>.</strong>'.
      '</p>';
 }

admin/update.php

@@ -106 +106 @@
                          throw new Exception(
                               sprintf(__('Downloaded Dotclear archive seems to be corrupted. '.
-                              'Try <a %s>download it</a> again.'),'href="'.$p_url.'?step=download"')
+                              'Try <a %s>download it</a> again.'),'href="'.$p_url.'?step=download"').
+                              ' '.
+                              __('If this problem persists try to '.
+                              '<a href="http://dotclear.org/download">update manually</a>.')
                          );
                     }