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
author: patdenice <patdenice@piwigo.org> 2008-11-03 19:55:35 +0000
committer: patdenice <patdenice@piwigo.org> 2008-11-03 19:55:35 +0000
commit: 78af3df65b04929447517efccad6b7c79ff269d3 (patch)
tree: d22a0b2e57dd8ac751bb981c31b1a41797712c11
parent: 2ddd90f3c3ed80dac3cc00455da9a462d769b5b5 (diff)
11 files changed, 338 insertions, 58 deletions
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:
-<pre>' . implode(', ', $plugins) . '</pre>'
-      );
+    array_push($page['infos'],
+      l10n('deactivated plugins') . '<pre>' . implode(', ', $plugins) . '</pre>');
   }
 }
 
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$ *}
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
 "http://www.w3.org/TR/html4/strict.dtd">
-<html lang="fr">
+<html lang="{$lang_info.code}" dir="{$lang_info.direction}">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset={$T_CONTENT_ENCODING}">
 <meta http-equiv="Content-script-type" content="text/javascript">
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$ *}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html lang="{$lang_info.code}" dir="{$lang_info.direction}">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-script-type" content="text/javascript">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico">
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/layout.css">
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/default-colors.css">
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/theme/{$themeconf.theme}/theme.css">
+{literal}
+<style type="text/css">
+#theHeader { height: 105px; }
 
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"  />
-    <title>Piwigo : Upgrade to {$RELEASE}</title>
-  </head>
+.content {
+ width: 800px;
+ min-height: 0px !important;
+ margin: auto;
+ padding: 25px;
+ text-align: left;
+}
 
-  <body>
-    {if isset($introduction)}
-    <h1>Welcome to Piwigo upgrade page.</h1>
+h2 { width: 770px !important; }
+</style>
+{/literal}
+<title>Piwigo {$RELEASE} - {'Upgrade'|@translate}</title>
+</head>
 
-    <p>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
-<strong>release {$introduction.CURRENT_RELEASE}</strong> (or equivalent).</p>
+<body>
+<div id="headbranch"></div> {* Dummy block for double background management *}
+<div id="theHeader"></div>
+<div id="content" class="content">
 
-    <p><a href="{$introduction.RUN_UPGRADE_URL}">Upgrade from release
-{$introduction.CURRENT_RELEASE} to {$RELEASE}</a></p>
-    {/if}
+{if isset($introduction)}
+<h2>Piwigo {$RELEASE} - {'Upgrade'|@translate}</h2>
 
-    {if isset($upgrade)}
-    <h1>Upgrade from version {$upgrade.VERSION} to {$RELEASE}</h1>
+<p>{'language'|@translate} &nbsp;
+<select name="language" onchange="document.location = 'upgrade.php?language='+this.options[this.selectedIndex].value;">
+  {html_options options=$language_options selected=$language_selection}
+</select>
+</p>
 
-    <p>Statistics</p>
-    <ul>
-      <li>total upgrade time : {$upgrade.TOTAL_TIME}</li>
-      <li>total SQL time : {$upgrade.SQL_TIME}</li>
-      <li>SQL queries : {$upgrade.NB_QUERIES}</li>
-    </ul>
+<p>{'introduction message'|@translate|@sprintf:$introduction.CURRENT_RELEASE}</p>
 
-    <p>Upgrade informations</p>
+<p style="text-align: center;">
+<a href="{$introduction.RUN_UPGRADE_URL}">{'Upgrade from %s to %s'|@translate|@sprintf:$introduction.CURRENT_RELEASE:$RELEASE}</b>
+</p>
+{/if}
 
-    <ul>
-      {foreach from=$infos item=info}
-      <li>{$info}</li>
-      {/foreach}
-    </ul>
+{if isset($upgrade)}
+<h2>{'Upgrade from %s to %s'|@translate|@sprintf:$upgrade.VERSION:$RELEASE}</h2>
 
-    {/if}
-  </body>
+<p><b>{'Statistics'|@translate}</b></p>
+<ul>
+  <li>{'total upgrade time'|@translate} : {$upgrade.TOTAL_TIME}</li>
+  <li>{'total SQL time'|@translate} : {$upgrade.SQL_TIME}</li>
+  <li>{'SQL queries'|@translate} : {$upgrade.NB_QUERIES}</li>
+</ul>
 
+<p><b>{'Upgrade informations'|@translate}</b></p>
+<ul>
+  {foreach from=$infos item=info}
+  <li>{$info}</li>
+  {/foreach}
+</ul>
+{/if}
+
+</div> {* content *}
+</body>
 </html>
diff --git a/install/upgrade_1.7.0.php b/install/upgrade_1.7.0.php
index 1b2b5abe1..413170f4a 100644
--- a/install/upgrade_1.7.0.php
+++ b/install/upgrade_1.7.0.php
@@ -85,6 +85,7 @@ if (!empty($inserts))
 // |                          Perform upgrades                             |
 // +-----------------------------------------------------------------------+
 
+ob_start();
 echo '<pre>';
 
 for ($upgrade_id = 61; ; $upgrade_id++)
@@ -115,6 +116,7 @@ INSERT INTO `'.PREFIX_TABLE.'upgrade`
 }
 
 echo '</pre>';
+ob_clean();
 
 // now we upgrade from 2.0.0
 // include_once(PHPWG_ROOT_PATH.'install/upgrade_2.0.0.php');
diff --git a/language/de_DE/upgrade.lang.php b/language/de_DE/upgrade.lang.php
new file mode 100644
index 000000000..04ed605a7
--- /dev/null
+++ b/language/de_DE/upgrade.lang.php
@@ -0,0 +1,39 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+/* TODO */
+$lang['Upgrade'] = 'Upgrade';
+$lang['introduction message'] = '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 <strong>release %s</strong> (or equivalent).';
+$lang['Upgrade from %s to %s'] = 'Upgrade from version %s to %s';
+$lang['Statistics'] = 'Statistics';
+$lang['total upgrade time'] = 'total upgrade time';
+$lang['total SQL time'] = 'total SQL time';
+$lang['SQL queries'] = 'SQL queries';
+$lang['Upgrade informations'] = 'Upgrade informations';
+$lang['delete upgrade files'] = '[Security] Delete files "upgrade.php", "upgrade_feed.php", "install.php" and "install" directory';
+$lang['remove line from mysql.inc.php'] = 'In include/mysql.inc.php, remove:';
+$lang['perform a maintenance check'] = 'Perform a maintenance check in [Administration>General>Maintenance] if you encounter any problem.';
+$lang['deactivated plugins'] = 'As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:';
+
+?>
+\ No newline at end of file
diff --git a/language/en_UK/upgrade.lang.php b/language/en_UK/upgrade.lang.php
new file mode 100644
index 000000000..8a65bf810
--- /dev/null
+++ b/language/en_UK/upgrade.lang.php
@@ -0,0 +1,38 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+$lang['Upgrade'] = 'Upgrade';
+$lang['introduction message'] = '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 <strong>release %s</strong> (or equivalent).';
+$lang['Upgrade from %s to %s'] = 'Upgrade from version %s to %s';
+$lang['Statistics'] = 'Statistics';
+$lang['total upgrade time'] = 'total upgrade time';
+$lang['total SQL time'] = 'total SQL time';
+$lang['SQL queries'] = 'SQL queries';
+$lang['Upgrade informations'] = 'Upgrade informations';
+$lang['delete upgrade files'] = '[Security] Delete files "upgrade.php", "upgrade_feed.php", "install.php" and "install" directory';
+$lang['remove line from mysql.inc.php'] = 'In include/mysql.inc.php, remove:';
+$lang['perform a maintenance check'] = 'Perform a maintenance check in [Administration>General>Maintenance] if you encounter any problem.';
+$lang['deactivated plugins'] = 'As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:';
+
+?>
+\ No newline at end of file
diff --git a/language/es_ES/upgrade.lang.php b/language/es_ES/upgrade.lang.php
new file mode 100644
index 000000000..04ed605a7
--- /dev/null
+++ b/language/es_ES/upgrade.lang.php
@@ -0,0 +1,39 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+/* TODO */
+$lang['Upgrade'] = 'Upgrade';
+$lang['introduction message'] = '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 <strong>release %s</strong> (or equivalent).';
+$lang['Upgrade from %s to %s'] = 'Upgrade from version %s to %s';
+$lang['Statistics'] = 'Statistics';
+$lang['total upgrade time'] = 'total upgrade time';
+$lang['total SQL time'] = 'total SQL time';
+$lang['SQL queries'] = 'SQL queries';
+$lang['Upgrade informations'] = 'Upgrade informations';
+$lang['delete upgrade files'] = '[Security] Delete files "upgrade.php", "upgrade_feed.php", "install.php" and "install" directory';
+$lang['remove line from mysql.inc.php'] = 'In include/mysql.inc.php, remove:';
+$lang['perform a maintenance check'] = 'Perform a maintenance check in [Administration>General>Maintenance] if you encounter any problem.';
+$lang['deactivated plugins'] = 'As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:';
+
+?>
+\ No newline at end of file
diff --git a/language/fr_FR/upgrade.lang.php b/language/fr_FR/upgrade.lang.php
new file mode 100644
index 000000000..41ec88d58
--- /dev/null
+++ b/language/fr_FR/upgrade.lang.php
@@ -0,0 +1,38 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+$lang['Upgrade'] = 'Mise à jour';
+$lang['introduction message'] = 'Cette page vous propose de mettre à jour la base de donnée correspondante à votre ancienne version de piwigo vers la nouvelle version.
+L\'assistant de mise à jour pense la version actuelle est une <strong>version %s</strong> (ou équivalente).';
+$lang['Upgrade from %s to %s'] = 'Mise à jour de la version %s à %s';
+$lang['Statistics'] = 'Statistiques';
+$lang['total upgrade time'] = 'temps total de la mise à jour';
+$lang['total SQL time'] = 'temps total des requêtes SQL';
+$lang['SQL queries'] = 'nombre de requêtes SQL';
+$lang['Upgrade informations'] = 'Informations sur la mise à jour';
+$lang['delete upgrade files'] = '[Sécurité] Effacez les fichiers "upgrade.php", "upgrade_feed.php", "install.php" ainsi que le dossier "install"';
+$lang['remove line from mysql.inc.php'] = 'Dans le fichier include/mysql.inc.php, effacez la ligne suivante:';
+$lang['perform a maintenance check'] = 'Veuillez effectuer une maintenance dans [Administration>Spéciales>Maintenance] si vous rencontrez des problèmes.';
+$lang['deactivated plugins'] = 'Par précaution, les plugins suivants ont été désactivés. Vérifiez s\'il existe des mises à jour avant de les réactiver:';
+
+?>
+\ No newline at end of file
diff --git a/language/it_IT/upgrade.lang.php b/language/it_IT/upgrade.lang.php
new file mode 100644
index 000000000..04ed605a7
--- /dev/null
+++ b/language/it_IT/upgrade.lang.php
@@ -0,0 +1,39 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+/* TODO */
+$lang['Upgrade'] = 'Upgrade';
+$lang['introduction message'] = '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 <strong>release %s</strong> (or equivalent).';
+$lang['Upgrade from %s to %s'] = 'Upgrade from version %s to %s';
+$lang['Statistics'] = 'Statistics';
+$lang['total upgrade time'] = 'total upgrade time';
+$lang['total SQL time'] = 'total SQL time';
+$lang['SQL queries'] = 'SQL queries';
+$lang['Upgrade informations'] = 'Upgrade informations';
+$lang['delete upgrade files'] = '[Security] Delete files "upgrade.php", "upgrade_feed.php", "install.php" and "install" directory';
+$lang['remove line from mysql.inc.php'] = 'In include/mysql.inc.php, remove:';
+$lang['perform a maintenance check'] = 'Perform a maintenance check in [Administration>General>Maintenance] if you encounter any problem.';
+$lang['deactivated plugins'] = 'As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:';
+
+?>
+\ No newline at end of file
diff --git a/language/nl_NL/upgrade.lang.php b/language/nl_NL/upgrade.lang.php
new file mode 100644
index 000000000..04ed605a7
--- /dev/null
+++ b/language/nl_NL/upgrade.lang.php
@@ -0,0 +1,39 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008      Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+/* TODO */
+$lang['Upgrade'] = 'Upgrade';
+$lang['introduction message'] = '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 <strong>release %s</strong> (or equivalent).';
+$lang['Upgrade from %s to %s'] = 'Upgrade from version %s to %s';
+$lang['Statistics'] = 'Statistics';
+$lang['total upgrade time'] = 'total upgrade time';
+$lang['total SQL time'] = 'total SQL time';
+$lang['SQL queries'] = 'SQL queries';
+$lang['Upgrade informations'] = 'Upgrade informations';
+$lang['delete upgrade files'] = '[Security] Delete files "upgrade.php", "upgrade_feed.php", "install.php" and "install" directory';
+$lang['remove line from mysql.inc.php'] = 'In include/mysql.inc.php, remove:';
+$lang['perform a maintenance check'] = 'Perform a maintenance check in [Administration>General>Maintenance] if you encounter any problem.';
+$lang['deactivated plugins'] = 'As a precaution, following plugins have been deactivated. You must check for plugins upgrade before reactiving them:';
+
+?>
+\ No newline at end of file
diff --git a/upgrade.php b/upgrade.php
index cb1d7337e..83d1f12a0 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -148,13 +148,48 @@ function print_time($message)
 // }
 
 // +-----------------------------------------------------------------------+
+// |                             language                                  |
+// +-----------------------------------------------------------------------+
+if (isset($_GET['language']))
+{
+  $language = strip_tags($_GET['language']);
+}
+else
+{
+  $language = 'en_UK';
+  // Try to get browser language
+  foreach (get_languages('utf-8') as $language_code => $language_name)
+  {
+    if (substr($language_code,0,2) == @substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2))
+    {
+      $language = $language_code;
+      break;
+    }
+  }
+}
+
+load_language( 'common.lang', '', array('language'=>$language, 'target_charset'=>'utf-8') );
+load_language( 'admin.lang', '', array('language'=>$language, 'target_charset'=>'utf-8') );
+load_language( 'upgrade.lang', '', array('language'=>$language, 'target_charset'=>'utf-8') );
+
+// +-----------------------------------------------------------------------+
 // |                        template initialization                        |
 // +-----------------------------------------------------------------------+
 
-$template = new Template(PHPWG_ROOT_PATH.'admin/template/goto');
+$template = new Template(PHPWG_ROOT_PATH.'admin/template/goto', 'roma');
 $template->set_filenames(array('upgrade'=>'upgrade.tpl'));
 $template->assign('RELEASE', PHPWG_VERSION);
 
+foreach (get_languages('utf-8') as $language_code => $language_name)
+{
+  if ($language == $language_code)
+  {
+    $template->assign('language_selection', $language_code);
+  }
+  $languages_options[$language_code] = $language_name;
+}
+$template->assign('language_options', $languages_options);
+
 // +-----------------------------------------------------------------------+
 // |                            upgrade choice                             |
 // +-----------------------------------------------------------------------+
@@ -210,7 +245,7 @@ if (!isset($_GET['version']))
     array(
       'CURRENT_RELEASE' => $current_release,
       'RUN_UPGRADE_URL' =>
-        PHPWG_ROOT_PATH.'upgrade.php?version='.$current_release,
+        PHPWG_ROOT_PATH.'upgrade.php?version='.$current_release.'&amp;language='.$language,
       )
     );
 }
@@ -263,24 +298,10 @@ else
         )
       );
 
-    array_push(
-      $page['infos'],
-      '[security] delete files "upgrade.php", "upgrade_feed.php", "install.php" and "install"
-directory'
-      );
-
-    array_push(
-      $page['infos'],
-      'in include/mysql.inc.php, remove
-<pre style="background-color:lightgray">
-define(\'PHPWG_IN_UPGRADE\', true);
-</pre>'
-      );
-
-    array_push(
-      $page['infos'],
-      'Perform a maintenance check in [Administration>General>Maintenance]
-if you encounter any problem.'
+    array_push($page['infos'],
+      l10n('delete upgrade files'),
+      l10n('remove line from mysql.inc.php') . '<pre>define(\'PHPWG_IN_UPGRADE\', true);</pre>',
+      l10n('perform a maintenance check')
       );
 
     $template->assign('infos', $page['infos']);
author	patdenice <patdenice@piwigo.org>	2008-11-03 19:55:35 +0000
committer	patdenice <patdenice@piwigo.org>	2008-11-03 19:55:35 +0000
commit	78af3df65b04929447517efccad6b7c79ff269d3 (patch)
tree	d22a0b2e57dd8ac751bb981c31b1a41797712c11
parent	2ddd90f3c3ed80dac3cc00455da9a462d769b5b5 (diff)