From 78af3df65b04929447517efccad6b7c79ff269d3 Mon Sep 17 00:00:00 2001 From: patdenice Date: Mon, 3 Nov 2008 19:55:35 +0000 Subject: merge -c2819 from trunk to branch 2.0 - Add roma theme to upgrade page. - Upgrade translation. git-svn-id: http://piwigo.org/svn/branches/2.0@2820 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/include/functions_upgrade.php | 7 +-- admin/template/goto/install.tpl | 2 +- admin/template/goto/upgrade.tpl | 92 ++++++++++++++++++++++++------------- 3 files changed, 63 insertions(+), 38 deletions(-) (limited to 'admin') diff --git a/admin/include/functions_upgrade.php b/admin/include/functions_upgrade.php index b21cc7c01..e29eb15c3 100644 --- a/admin/include/functions_upgrade.php +++ b/admin/include/functions_upgrade.php @@ -132,11 +132,8 @@ WHERE id IN ("' . implode('","', $plugins) . '") ;'; mysql_query($query); - array_push( - $page['infos'], - 'As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them: -
' . implode(', ', $plugins) . '
' - ); + array_push($page['infos'], + l10n('deactivated plugins') . '
' . implode(', ', $plugins) . '
'); } } diff --git a/admin/template/goto/install.tpl b/admin/template/goto/install.tpl index 553eb737d..a0e8eff6f 100644 --- a/admin/template/goto/install.tpl +++ b/admin/template/goto/install.tpl @@ -1,7 +1,7 @@ {* $Id$ *} - + diff --git a/admin/template/goto/upgrade.tpl b/admin/template/goto/upgrade.tpl index 2af91c70e..c36d25b5a 100644 --- a/admin/template/goto/upgrade.tpl +++ b/admin/template/goto/upgrade.tpl @@ -1,44 +1,72 @@ {* $Id$ *} - - + + + + + + + + + + +{literal} + +{/literal} +Piwigo {$RELEASE} - {'Upgrade'|@translate} + -

This page proposes to upgrade your database corresponding to your old -version of Piwigo to the current version. The upgrade assistant -thinks you are currently running a -release {$introduction.CURRENT_RELEASE} (or equivalent).

+ +
{* Dummy block for double background management *} +
+
-

Upgrade from release -{$introduction.CURRENT_RELEASE} to {$RELEASE}

- {/if} +{if isset($introduction)} +

Piwigo {$RELEASE} - {'Upgrade'|@translate}

- {if isset($upgrade)} -

Upgrade from version {$upgrade.VERSION} to {$RELEASE}

+

{'language'|@translate}   + +

-

Statistics

- +

{'introduction message'|@translate|@sprintf:$introduction.CURRENT_RELEASE}

-

Upgrade informations

+

+{'Upgrade from %s to %s'|@translate|@sprintf:$introduction.CURRENT_RELEASE:$RELEASE} +

+{/if} -
    - {foreach from=$infos item=info} -
  • {$info}
    • - {/foreach} -
+{if isset($upgrade)} +

{'Upgrade from %s to %s'|@translate|@sprintf:$upgrade.VERSION:$RELEASE}

- {/if} - +

{'Statistics'|@translate}

+
    +
  • {'total upgrade time'|@translate} : {$upgrade.TOTAL_TIME}
    • +
  • {'total SQL time'|@translate} : {$upgrade.SQL_TIME}
    • +
  • {'SQL queries'|@translate} : {$upgrade.NB_QUERIES}
    • +
+

{'Upgrade informations'|@translate}

+
    + {foreach from=$infos item=info} +
  • {$info}
    • + {/foreach} +
+{/if} + +
{* content *} + -- cgit v1.2.3