Changeset 6181


Ignore:
Timestamp:
05/15/10 14:03:52 (9 years ago)
Author:
patdenice
Message:

Update language keys.
Code cleaning.

Location:
extensions/autoupdate/trunk
Files:
3 deleted
18 edited

Legend:

Unmodified
Added
Removed
  • extensions/autoupdate/trunk/autoupdate.php

    r6168 r6181  
    11<?php 
    22 
    3 load_language('plugin.lang', dirname(__FILE__).'/'); 
    43include(AUTOUPDATE_PATH.'include/functions.inc.php'); 
    54include(PHPWG_ROOT_PATH.'admin/include/pclzip.lib.php'); 
     
    1312*/ 
    1413$step = isset($_GET['step']) ? $_GET['step'] : 0; 
     14$upgrade_to = isset($_GET['to']) ? $_GET['to'] : ''; 
    1515 
    1616// +-----------------------------------------------------------------------+ 
     
    1919if ($step == 0) 
    2020{ 
    21   if (preg_match('/(\d+\.\d+)\.(\d+)/', PHPWG_VERSION, $matches) 
    22     and @fetchRemote(PHPWG_URL.'/download/all_versions.php', $result) 
    23     and $all_versions = @explode("\n", $result) 
    24     and is_array($all_versions)) 
     21  $template->assign(array( 
     22    'CHECK_VERSION' => false, 
     23    'DEV_VERSION' => false, 
     24    ) 
     25  ); 
     26 
     27  if (preg_match('/(\d+\.\d+)\.(\d+)/', PHPWG_VERSION, $matches)) 
    2528  { 
    26     $template->assign('CHECK_VERSION', true); 
     29    if (@fetchRemote(PHPWG_URL.'/download/all_versions.php', $result) 
     30      and $all_versions = @explode("\n", $result) 
     31      and is_array($all_versions)) 
     32    { 
     33      $template->assign('CHECK_VERSION', true); 
    2734 
    28     $last_version = trim($all_versions[0]); 
     35      $last_version = trim($all_versions[0]); 
     36      $upgrade_to = $last_version; 
    2937 
    30     if (version_compare(PHPWG_VERSION, $last_version, '<')) 
    31     { 
    32       $new_branch = preg_replace('/(\d+\.\d+)\.\d+/', '$1', $last_version); 
    33       $actual_branch = $matches[1]; 
     38      if (version_compare(PHPWG_VERSION, $last_version, '<')) 
     39      { 
     40        $new_branch = preg_replace('/(\d+\.\d+)\.\d+/', '$1', $last_version); 
     41        $actual_branch = $matches[1]; 
    3442 
    35       if ($new_branch == $actual_branch) 
    36       { 
    37         $step = 2; 
    38       } 
    39       else 
    40       { 
    41         $step = 3; 
     43        if ($new_branch == $actual_branch) 
     44        { 
     45          $step = 2; 
     46        } 
     47        else 
     48        { 
     49          $step = 3; 
    4250 
    43         // Check if new version exists in same branch 
    44         foreach ($all_versions as $version) 
    45         { 
    46           $new_branch = preg_replace('/(\d+\.\d+)\.\d+/', '$1', $version); 
     51          // Check if new version exists in same branch 
     52          foreach ($all_versions as $version) 
     53          { 
     54            $new_branch = preg_replace('/(\d+\.\d+)\.\d+/', '$1', $version); 
    4755 
    48           if ($new_branch == $actual_branch) 
    49           { 
    50             if (version_compare(PHPWG_VERSION, $version, '<')) 
     56            if ($new_branch == $actual_branch) 
    5157            { 
    52               $step = 1; 
     58              if (version_compare(PHPWG_VERSION, $version, '<')) 
     59              { 
     60                $step = 1; 
     61              } 
     62              break; 
    5363            } 
    54             break; 
    5564          } 
    5665        } 
     
    6069  else 
    6170  { 
    62     $template->assign('CHECK_VERSION', false); 
     71    $template->assign('DEV_VERSION', true); 
    6372  } 
    6473} 
     
    6978if ($step == 1) 
    7079{ 
    71   $new_versions = array($last_version, $version); 
    72   $template->assign('new_versions', $new_versions); 
     80  $template->assign(array( 
     81    'MINOR_VERSION' => $version, 
     82    'MAJOR_VERSION' => $last_version, 
     83    ) 
     84  ); 
    7385} 
    7486 
     
    8092  if (isset($_POST['submit']) and isset($_POST['upgrade_to'])) 
    8193  { 
    82     upgrade_to($_POST['upgrade_to'], $step); 
     94    autoupdate_upgrade_to($_POST['upgrade_to'], $step); 
    8395  } 
    84  
    85   $template->assign('UPGRADE_TO', isset($_GET['to']) ? $_GET['to'] : $last_version); 
    8696} 
    8797 
     
    93103  if (isset($_POST['saveTemplate'])) 
    94104  { 
    95     $path = $conf['local_data_dir'].'/autoupdate'; 
    96  
    97     if (@mkgetdir($path) 
    98       and ($zip = tempnam($path, 'zip')) 
    99       and ($archive = new pclZip($zip)) 
    100       and ($v_list = $archive->add(PHPWG_ROOT_PATH.'template', PCLZIP_OPT_REMOVE_PATH, PHPWG_ROOT_PATH)) 
    101       and is_array($v_list) 
    102       and !empty($v_list)) 
    103     { 
    104       $http_headers = array( 
    105         'Content-Length: '.@filesize($zip), 
    106         'Content-Type: application/zip', 
    107         'Content-Disposition: attachment; filename="template.zip";', 
    108         'Content-Transfer-Encoding: binary', 
    109         ); 
    110  
    111       foreach ($http_headers as $header) { 
    112         header($header); 
    113       } 
    114  
    115       @readfile($zip); 
    116       autoupdate_deltree($conf['local_data_dir'].'/autoupdate'); 
    117       exit(); 
    118     } 
    119  
    120     array_push($page['errors'], l10n('Unable to send template directory.')); 
     105    autoupdate_save_template_dir(); 
    121106  } 
    122107 
    123108  if (isset($_POST['dumpDatabase'])) 
    124109  { 
    125     if (version_compare(PHPWG_VERSION, '2.1', '<')) 
    126     { 
    127       global $cfgBase; 
    128       $conf['db_base'] = $cfgBase; 
    129     } 
    130  
    131     include(AUTOUPDATE_PATH.'include/mysqldump.php'); 
    132  
    133     $path = $conf['local_data_dir'].'/autoupdate'; 
    134  
    135     if (@mkgetdir($path) 
    136       and ($backupFile = tempnam($path, 'sql')) 
    137       and ($dumper = new MySQLDump($conf['db_base'],$backupFile,false,false))) 
    138     { 
    139       $tablesStructure = array( 
    140         CATEGORIES_TABLE, 
    141         COMMENTS_TABLE, 
    142         CONFIG_TABLE, 
    143         FAVORITES_TABLE, 
    144         GROUP_ACCESS_TABLE, 
    145         GROUPS_TABLE, 
    146         HISTORY_TABLE, 
    147         HISTORY_SUMMARY_TABLE, 
    148         IMAGE_CATEGORY_TABLE, 
    149         IMAGES_TABLE, 
    150         SESSIONS_TABLE, 
    151         SITES_TABLE, 
    152         USER_ACCESS_TABLE, 
    153         USER_GROUP_TABLE, 
    154         USERS_TABLE, 
    155         USER_INFOS_TABLE, 
    156         USER_FEED_TABLE, 
    157         WAITING_TABLE, 
    158         RATE_TABLE, 
    159         USER_CACHE_TABLE, 
    160         USER_CACHE_CATEGORIES_TABLE, 
    161         CADDIE_TABLE, 
    162         UPGRADE_TABLE, 
    163         SEARCH_TABLE, 
    164         USER_MAIL_NOTIFICATION_TABLE, 
    165         TAGS_TABLE, 
    166         IMAGE_TAG_TABLE, 
    167         PLUGINS_TABLE, 
    168         OLD_PERMALINKS_TABLE, 
    169         ); 
    170  
    171       $tablesData = $tablesStructure; 
    172  
    173       if (!isset($_POST['includeHistory'])) 
    174       { 
    175         unset($tablesData[6]); 
    176       } 
    177  
    178       foreach ($tablesStructure as $table) 
    179       { 
    180         $dumper->getTableStructure($table);  
    181       } 
    182       foreach ($tablesData as $table) 
    183       { 
    184         $dumper->getTableData($table);  
    185       } 
    186     } 
    187  
    188     if (@filesize($backupFile)) 
    189     { 
    190       $http_headers = array( 
    191         'Content-Length: '.@filesize($backupFile), 
    192         'Content-Type: text/x-sql', 
    193         'Content-Disposition: attachment; filename="database.sql";', 
    194         'Content-Transfer-Encoding: binary', 
    195         ); 
    196  
    197       foreach ($http_headers as $header) { 
    198         header($header); 
    199       } 
    200  
    201       @readfile($backupFile); 
    202       autoupdate_deltree($conf['local_data_dir'].'/autoupdate'); 
    203       exit(); 
    204     } 
    205  
    206     array_push($page['errors'], l10n('Unable to dump database.')); 
     110    autoupdate_dump_database(); 
    207111  } 
    208112 
    209113  if (isset($_POST['submit']) and isset($_POST['upgrade_to'])) 
    210114  { 
    211     upgrade_to($_POST['upgrade_to'], $step); 
     115    autoupdate_upgrade_to($_POST['upgrade_to'], $step); 
    212116  } 
    213  
    214   $template->assign('UPGRADE_TO', isset($_GET['to']) ? $_GET['to'] : $last_version); 
    215117} 
    216118 
     
    220122 
    221123$template->assign(array( 
    222   'STEP' => $step, 
    223   'AU_URL' => get_admin_plugin_menu_link(AUTOUPDATE_PATH . '/autoupdate.php'), 
     124  'STEP'        => $step, 
     125  'AU_URL'      => get_admin_plugin_menu_link(AUTOUPDATE_PATH . '/autoupdate.php'), 
     126  'UPGRADE_TO'  => $upgrade_to, 
     127  'RELEASE_URL' => PHPWG_URL.'/releases/'.$upgrade_to, 
    224128  ) 
    225129); 
  • extensions/autoupdate/trunk/include/functions.inc.php

    r6167 r6181  
    181181} 
    182182 
    183 function upgrade_to($upgrade_to, &$step) 
     183function autoupdate_save_template_dir() 
     184{ 
     185  global $page, $conf; 
     186 
     187  $path = $conf['local_data_dir'].'/autoupdate'; 
     188 
     189  if (@mkgetdir($path) 
     190    and ($zip = tempnam($path, 'zip')) 
     191    and ($archive = new pclZip($zip)) 
     192    and ($v_list = $archive->add(PHPWG_ROOT_PATH.'template', PCLZIP_OPT_REMOVE_PATH, PHPWG_ROOT_PATH)) 
     193    and is_array($v_list) 
     194    and !empty($v_list)) 
     195  { 
     196    $http_headers = array( 
     197      'Content-Length: '.@filesize($zip), 
     198      'Content-Type: application/zip', 
     199      'Content-Disposition: attachment; filename="template.zip";', 
     200      'Content-Transfer-Encoding: binary', 
     201      ); 
     202 
     203    foreach ($http_headers as $header) { 
     204      header($header); 
     205    } 
     206 
     207    @readfile($zip); 
     208    autoupdate_deltree($conf['local_data_dir'].'/autoupdate'); 
     209    exit(); 
     210  } 
     211  else 
     212  { 
     213    array_push($page['errors'], l10n('Unable to send template directory.')); 
     214  } 
     215} 
     216 
     217function autoupdate_dump_database() 
     218{ 
     219  global $page, $conf, $cfgBase; 
     220 
     221  if (version_compare(PHPWG_VERSION, '2.1', '<')) 
     222  { 
     223    $conf['db_base'] = $cfgBase; 
     224  } 
     225 
     226  include(AUTOUPDATE_PATH.'include/mysqldump.php'); 
     227 
     228  $path = $conf['local_data_dir'].'/autoupdate'; 
     229 
     230  if (@mkgetdir($path) 
     231    and ($backupFile = tempnam($path, 'sql')) 
     232    and ($dumper = new MySQLDump($conf['db_base'],$backupFile,false,false))) 
     233  { 
     234    foreach (get_defined_constants() as $constant => $value) 
     235    { 
     236      if (preg_match('/_TABLE$/', $constant)) 
     237      { 
     238        $dumper->getTableStructure($value); 
     239 
     240        if ($constant == 'HISTORY_TABLE' and !isset($_POST['includeHistory'])) 
     241        { 
     242          continue; 
     243        } 
     244 
     245        $dumper->getTableData($value); 
     246      } 
     247    } 
     248  } 
     249 
     250  if (@filesize($backupFile)) 
     251  { 
     252    $http_headers = array( 
     253      'Content-Length: '.@filesize($backupFile), 
     254      'Content-Type: text/x-sql', 
     255      'Content-Disposition: attachment; filename="database.sql";', 
     256      'Content-Transfer-Encoding: binary', 
     257      ); 
     258 
     259    foreach ($http_headers as $header) { 
     260      header($header); 
     261    } 
     262 
     263    @readfile($backupFile); 
     264    autoupdate_deltree($conf['local_data_dir'].'/autoupdate'); 
     265    exit(); 
     266  } 
     267  else 
     268  { 
     269    array_push($page['errors'], l10n('Unable to dump database.')); 
     270  } 
     271} 
     272 
     273function autoupdate_upgrade_to($upgrade_to, &$step) 
    184274{ 
    185275  global $page, $conf, $template; 
  • extensions/autoupdate/trunk/language/cs_CZ/plugin.lang.php

    r5841 r6181  
    1414$lang['Gallery and plugins are up to date'] = 'Galerie Piwigo a doplòky jsou aktuální'; 
    1515$lang['Unable to check upgrades...'] = 'Nebylo možné zkontrolovat aktualizace...'; 
    16 $lang['Piwigo will automaticaly try again later.'] = 'Piwigo se o to automaticky pokusí pozdìji.'; 
    1716$lang['Click here to check upgrades now'] = 'Pro kontrolu aktualizací kliknìte zde'; 
    1817 
     
    2322$lang['Checking upgrades for gallery and plugins...'] = 'Kontrolují se aktualizace pro galerii Piwigo a pro doplòky...'; 
    2423 
     24/*TODO*/$lang['Upgrade to Piwigo %s'] = 'Upgrade to Piwigo %s'; 
     25/*TODO*/$lang['Two upgrades are available'] = 'Two upgrades are available'; 
     26/*TODO*/$lang['This is a minor upgrade, with only bug corrections.'] = 'This is a minor upgrade, with only bug corrections.'; 
     27/*TODO*/$lang['This is a major upgrade, with <a href="%s">new exciting features</a>.'] = 'This is a major upgrade, with <a href="%s">new exciting features</a>.'; 
     28/*TODO*/$lang['Some themes and plugins may be not available yet.'] = 'Some themes and plugins may be not available yet.'; 
     29/*TODO*/$lang['You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'] = 'You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'; 
     30/*TODO*/$lang['First Step'] = 'First Step'; 
     31/*TODO*/$lang['Second Step'] = 'Second Step'; 
     32/*TODO*/$lang['Third Step'] = 'Third Step'; 
     33/*TODO*/$lang['Save Template Directory'] = 'Save template directory'; 
     34/*TODO*/$lang['Dump Database'] = 'Dump Database'; 
     35/*TODO*/$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Include history data (Warning: server memory limit may be exceeded)'; 
     36/*TODO*/$lang['Unable to write new local directory.'] = 'Unable to write new local directory.'; 
     37/*TODO*/$lang['Unable to send template directory.'] = 'Unable to send template directory.'; 
     38/*TODO*/$lang['Unable to dump database.'] = 'Unable to dump database.'; 
     39 
    2540?> 
  • extensions/autoupdate/trunk/language/de_DE/plugin.lang.php

    r4843 r6181  
    22 
    33$lang['Click here to upgrade automatically'] = 'Klicken Sie hier um automatisch zu aktualisieren'; 
    4 $lang['autoupdate_alert'] = 'Sind Sie sicher, das Sie automatisch Aktualisieren möchten?  Warnung: manuell modifizierte Dateien werden dabei überschrieben!'; 
     4$lang['autoupdate_alert'] = 'Sind Sie sicher, das Sie automatisch Aktualisieren möchten?\nWarnung: manuell modifizierte Dateien werden dabei überschrieben!'; 
    55$lang['autoupdate_success'] = 'Piwigo wurde erfolgreich aktualisiert (version %s)'; 
    66$lang['autoupdate_fail'] = 'Ein Fehler trat während des Aktualisierens auf.'; 
     
    1414$lang['Gallery and plugins are up to date'] = 'Galerie und Plugins sind aktuell'; 
    1515$lang['Unable to check upgrades...'] = 'Die überprüfung auf Aktualisierungen ist nicht möglich...'; 
    16 $lang['Piwigo will automaticaly try again later.'] = 'Piwigo wird es später automatisch noch einmal probieren.'; 
    1716$lang['Click here to check upgrades now'] = 'Klicken Sie hier um auf Aktualisierungen zu prüfen'; 
    1817 
     
    2322$lang['Checking upgrades for gallery and plugins...'] = 'Suche nach Aktualisierungen für die Galerie und Plugins...'; 
    2423 
     24/*TODO*/$lang['Upgrade to Piwigo %s'] = 'Upgrade to Piwigo %s'; 
     25/*TODO*/$lang['Two upgrades are available'] = 'Two upgrades are available'; 
     26/*TODO*/$lang['This is a minor upgrade, with only bug corrections.'] = 'This is a minor upgrade, with only bug corrections.'; 
     27/*TODO*/$lang['This is a major upgrade, with <a href="%s">new exciting features</a>.'] = 'This is a major upgrade, with <a href="%s">new exciting features</a>.'; 
     28/*TODO*/$lang['Some themes and plugins may be not available yet.'] = 'Some themes and plugins may be not available yet.'; 
     29/*TODO*/$lang['You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'] = 'You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'; 
     30/*TODO*/$lang['First Step'] = 'First Step'; 
     31/*TODO*/$lang['Second Step'] = 'Second Step'; 
     32/*TODO*/$lang['Third Step'] = 'Third Step'; 
     33/*TODO*/$lang['Save Template Directory'] = 'Save template directory'; 
     34/*TODO*/$lang['Dump Database'] = 'Dump Database'; 
     35/*TODO*/$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Include history data (Warning: server memory limit may be exceeded)'; 
     36/*TODO*/$lang['Unable to write new local directory.'] = 'Unable to write new local directory.'; 
     37/*TODO*/$lang['Unable to send template directory.'] = 'Unable to send template directory.'; 
     38/*TODO*/$lang['Unable to dump database.'] = 'Unable to dump database.'; 
     39 
    2540?> 
  • extensions/autoupdate/trunk/language/en_UK/plugin.lang.php

    r4835 r6181  
    1414$lang['Gallery and plugins are up to date'] = 'Gallery and plugins are up to date'; 
    1515$lang['Unable to check upgrades...'] = 'Unable to check upgrades...'; 
    16 $lang['Piwigo will automaticaly try again later.'] = 'Piwigo will automaticaly try again later.'; 
    1716$lang['Click here to check upgrades now'] = 'Click here to check upgrades now'; 
    1817 
     
    2322$lang['Checking upgrades for gallery and plugins...'] = 'Checking upgrades for gallery and plugins...'; 
    2423 
     24$lang['Upgrade to Piwigo %s'] = 'Upgrade to Piwigo %s'; 
     25$lang['Two upgrades are available'] = 'Two upgrades are available'; 
     26$lang['This is a minor upgrade, with only bug corrections.'] = 'This is a minor upgrade, with only bug corrections.'; 
     27$lang['This is a major upgrade, with <a href="%s">new exciting features</a>.'] = 'This is a major upgrade, with <a href="%s">new exciting features</a>.'; 
     28$lang['Some themes and plugins may be not available yet.'] = 'Some themes and plugins may be not available yet.'; 
     29$lang['You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'] = 'You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'; 
     30$lang['First Step'] = 'First Step'; 
     31$lang['Second Step'] = 'Second Step'; 
     32$lang['Third Step'] = 'Third Step'; 
     33$lang['Save Template Directory'] = 'Save template directory'; 
     34$lang['Dump Database'] = 'Dump Database'; 
     35$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Include history data (Warning: server memory limit may be exceeded)'; 
     36$lang['Unable to write new local directory.'] = 'Unable to write new local directory.'; 
     37$lang['Unable to send template directory.'] = 'Unable to send template directory.'; 
     38$lang['Unable to dump database.'] = 'Unable to dump database.'; 
     39 
    2540?> 
  • extensions/autoupdate/trunk/language/es_ES/plugin.lang.php

    r5887 r6181  
    1414$lang['Gallery and plugins are up to date'] = 'Su galería y sus plugins están actualizados'; 
    1515$lang['Unable to check upgrades...'] = 'Imposible verificar las actualizaciónes...'; 
    16 $lang['Piwigo will automaticaly try again later.'] = 'Piwigo intentara automaticamente más tarde.'; 
    1716$lang['Click here to check upgrades now'] = 'Haga clic aquí para verificar las actualizaciónes'; 
    1817 
     
    2322$lang['Checking upgrades for gallery and plugins...'] = 'Comprobación de las actualizaciónes de la galería y los plugins...'; 
    2423 
     24/*TODO*/$lang['Upgrade to Piwigo %s'] = 'Upgrade to Piwigo %s'; 
     25/*TODO*/$lang['Two upgrades are available'] = 'Two upgrades are available'; 
     26/*TODO*/$lang['This is a minor upgrade, with only bug corrections.'] = 'This is a minor upgrade, with only bug corrections.'; 
     27/*TODO*/$lang['This is a major upgrade, with <a href="%s">new exciting features</a>.'] = 'This is a major upgrade, with <a href="%s">new exciting features</a>.'; 
     28/*TODO*/$lang['Some themes and plugins may be not available yet.'] = 'Some themes and plugins may be not available yet.'; 
     29/*TODO*/$lang['You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'] = 'You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'; 
     30/*TODO*/$lang['First Step'] = 'First Step'; 
     31/*TODO*/$lang['Second Step'] = 'Second Step'; 
     32/*TODO*/$lang['Third Step'] = 'Third Step'; 
     33/*TODO*/$lang['Save Template Directory'] = 'Save template directory'; 
     34/*TODO*/$lang['Dump Database'] = 'Dump Database'; 
     35/*TODO*/$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Include history data (Warning: server memory limit may be exceeded)'; 
     36/*TODO*/$lang['Unable to write new local directory.'] = 'Unable to write new local directory.'; 
     37/*TODO*/$lang['Unable to send template directory.'] = 'Unable to send template directory.'; 
     38/*TODO*/$lang['Unable to dump database.'] = 'Unable to dump database.'; 
     39 
    2540?> 
  • extensions/autoupdate/trunk/language/fr_FR/plugin.lang.php

    r4835 r6181  
    2222$lang['Checking upgrades for gallery and plugins...'] = 'Vérification des mises à jour de la galerie et des plugins...'; 
    2323 
     24$lang['Upgrade to Piwigo %s'] = 'Mettre à jour vers Piwigo %s'; 
     25$lang['Two upgrades are available'] = 'Deux mises à jour sont disponibles'; 
     26$lang['This is a minor upgrade, with only bug corrections.'] = 'Ceci est une mise à jour mineure, avec uniquement des corrections de bugs.'; 
     27$lang['This is a major upgrade, with <a href="%s">new exciting features</a>.'] = 'Ceci est une mise à jour majeure, qui contient <a href="%s">un tas de nouveautés</a>.'; 
     28$lang['Some themes and plugins may be not available yet.'] = 'Certains thèmes ou plugins ne sont peut-être pas encore disponibles.'; 
     29$lang['You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'] = 'Vous pouvez mettre à jour vers Piwigo %s directement, sans passer par Piwigo %s (recommandé).'; 
     30$lang['First Step'] = 'Première étape'; 
     31$lang['Second Step'] = 'Deuxième étape'; 
     32$lang['Third Step'] = 'Troisième étape'; 
     33$lang['Save Template Directory'] = 'Sauvegarder le dossier template'; 
     34$lang['Dump Database'] = 'Sauvegarder la base de données'; 
     35$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Inclure les données de l\'historique (Attention: risque de dépassement de la limite mémoire du serveur)'; 
     36$lang['Unable to write new local directory.'] = 'Impossible d\'écrire le nouveau dossier local.'; 
     37$lang['Unable to send template directory.'] = 'Impossible d\'envoyer le dossier temlate.'; 
     38$lang['Unable to dump database.'] = 'Impossible de sauvegarder la base de données.'; 
     39 
    2440?> 
  • extensions/autoupdate/trunk/language/hr_HR/plugin.lang.php

    r4845 r6181  
    1414$lang['Gallery and plugins are up to date'] = 'Galerija i dodaci su ažurni'; 
    1515$lang['Unable to check upgrades...'] = 'Nemoguće je provjeriti nadogradnje...'; 
    16 $lang['Piwigo will automaticaly try again later.'] = 'Piwigo će sam pokušati ponovo kasnije.'; 
    1716$lang['Click here to check upgrades now'] = 'Kliknite za provjeru nadogradnji sada'; 
    1817 
     
    2322$lang['Checking upgrades for gallery and plugins...'] = 'Provjera nadogradnji galerije i dodataka...'; 
    2423 
     24/*TODO*/$lang['Upgrade to Piwigo %s'] = 'Upgrade to Piwigo %s'; 
     25/*TODO*/$lang['Two upgrades are available'] = 'Two upgrades are available'; 
     26/*TODO*/$lang['This is a minor upgrade, with only bug corrections.'] = 'This is a minor upgrade, with only bug corrections.'; 
     27/*TODO*/$lang['This is a major upgrade, with <a href="%s">new exciting features</a>.'] = 'This is a major upgrade, with <a href="%s">new exciting features</a>.'; 
     28/*TODO*/$lang['Some themes and plugins may be not available yet.'] = 'Some themes and plugins may be not available yet.'; 
     29/*TODO*/$lang['You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'] = 'You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'; 
     30/*TODO*/$lang['First Step'] = 'First Step'; 
     31/*TODO*/$lang['Second Step'] = 'Second Step'; 
     32/*TODO*/$lang['Third Step'] = 'Third Step'; 
     33/*TODO*/$lang['Save Template Directory'] = 'Save template directory'; 
     34/*TODO*/$lang['Dump Database'] = 'Dump Database'; 
     35/*TODO*/$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Include history data (Warning: server memory limit may be exceeded)'; 
     36/*TODO*/$lang['Unable to write new local directory.'] = 'Unable to write new local directory.'; 
     37/*TODO*/$lang['Unable to send template directory.'] = 'Unable to send template directory.'; 
     38/*TODO*/$lang['Unable to dump database.'] = 'Unable to dump database.'; 
     39 
    2540?> 
  • extensions/autoupdate/trunk/language/hu_HU/plugin.lang.php

    r4837 r6181  
    1414$lang['Gallery and plugins are up to date'] = 'A galéria és a bővitmények a legfrissebbek'; 
    1515$lang['Unable to check upgrades...'] = 'A frissítés ellenőrzése nem lehetséges....'; 
    16 $lang['Piwigo will automaticaly try again later.'] = 'A Piwigo megkisérli az automatikus frissítést.'; 
    1716$lang['Click here to check upgrades now'] = 'Kattintson ide a frissítések ellenőrzéséhez'; 
    1817 
     
    2322$lang['Checking upgrades for gallery and plugins...'] = 'Galéria és bővítmény frissítések ellenőrzése...'; 
    2423 
     24/*TODO*/$lang['Upgrade to Piwigo %s'] = 'Upgrade to Piwigo %s'; 
     25/*TODO*/$lang['Two upgrades are available'] = 'Two upgrades are available'; 
     26/*TODO*/$lang['This is a minor upgrade, with only bug corrections.'] = 'This is a minor upgrade, with only bug corrections.'; 
     27/*TODO*/$lang['This is a major upgrade, with <a href="%s">new exciting features</a>.'] = 'This is a major upgrade, with <a href="%s">new exciting features</a>.'; 
     28/*TODO*/$lang['Some themes and plugins may be not available yet.'] = 'Some themes and plugins may be not available yet.'; 
     29/*TODO*/$lang['You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'] = 'You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'; 
     30/*TODO*/$lang['First Step'] = 'First Step'; 
     31/*TODO*/$lang['Second Step'] = 'Second Step'; 
     32/*TODO*/$lang['Third Step'] = 'Third Step'; 
     33/*TODO*/$lang['Save Template Directory'] = 'Save template directory'; 
     34/*TODO*/$lang['Dump Database'] = 'Dump Database'; 
     35/*TODO*/$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Include history data (Warning: server memory limit may be exceeded)'; 
     36/*TODO*/$lang['Unable to write new local directory.'] = 'Unable to write new local directory.'; 
     37/*TODO*/$lang['Unable to send template directory.'] = 'Unable to send template directory.'; 
     38/*TODO*/$lang['Unable to dump database.'] = 'Unable to dump database.'; 
     39 
    2540?> 
  • extensions/autoupdate/trunk/language/it_IT/plugin.lang.php

    r4835 r6181  
    1414$lang['Gallery and plugins are up to date'] = 'La vostra galleria e i vostri plugins sono aggiorno'; 
    1515$lang['Unable to check upgrades...'] = 'Non è stato possibile verificare gli aggiornamenti...'; 
    16 $lang['Piwigo will automaticaly try again later.'] = 'Piwigo riproverà automaticamente più tardi.'; 
    1716$lang['Click here to check upgrades now'] = 'Cliccare qui per verificare gli aggiornameti ora'; 
    1817 
     
    2322/*TODO*/$lang['Checking upgrades for gallery and plugins...'] = 'Checking upgrades for gallery and plugins...'; 
    2423 
     24/*TODO*/$lang['Upgrade to Piwigo %s'] = 'Upgrade to Piwigo %s'; 
     25/*TODO*/$lang['Two upgrades are available'] = 'Two upgrades are available'; 
     26/*TODO*/$lang['This is a minor upgrade, with only bug corrections.'] = 'This is a minor upgrade, with only bug corrections.'; 
     27/*TODO*/$lang['This is a major upgrade, with <a href="%s">new exciting features</a>.'] = 'This is a major upgrade, with <a href="%s">new exciting features</a>.'; 
     28/*TODO*/$lang['Some themes and plugins may be not available yet.'] = 'Some themes and plugins may be not available yet.'; 
     29/*TODO*/$lang['You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'] = 'You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'; 
     30/*TODO*/$lang['First Step'] = 'First Step'; 
     31/*TODO*/$lang['Second Step'] = 'Second Step'; 
     32/*TODO*/$lang['Third Step'] = 'Third Step'; 
     33/*TODO*/$lang['Save Template Directory'] = 'Save template directory'; 
     34/*TODO*/$lang['Dump Database'] = 'Dump Database'; 
     35/*TODO*/$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Include history data (Warning: server memory limit may be exceeded)'; 
     36/*TODO*/$lang['Unable to write new local directory.'] = 'Unable to write new local directory.'; 
     37/*TODO*/$lang['Unable to send template directory.'] = 'Unable to send template directory.'; 
     38/*TODO*/$lang['Unable to dump database.'] = 'Unable to dump database.'; 
     39 
    2540?> 
  • extensions/autoupdate/trunk/language/ja_JP/plugin.lang.php

    r4849 r6181  
    1414$lang['Gallery and plugins are up to date'] = 'ギャラリーおよびプラグインは最新版です。'; 
    1515$lang['Unable to check upgrades...'] = 'アップグレードを確認できません ...'; 
    16 $lang['Piwigo will automaticaly try again later.'] = '後程、Piwigoは自動的に再試行します。'; 
    1716$lang['Click here to check upgrades now'] = 'アップグレードするには、ここをクリックしてください。'; 
    1817 
     
    2322$lang['Checking upgrades for gallery and plugins...'] = 'ギャラリーおよびプラグインのアップグレード確認中 ...'; 
    2423 
     24/*TODO*/$lang['Upgrade to Piwigo %s'] = 'Upgrade to Piwigo %s'; 
     25/*TODO*/$lang['Two upgrades are available'] = 'Two upgrades are available'; 
     26/*TODO*/$lang['This is a minor upgrade, with only bug corrections.'] = 'This is a minor upgrade, with only bug corrections.'; 
     27/*TODO*/$lang['This is a major upgrade, with <a href="%s">new exciting features</a>.'] = 'This is a major upgrade, with <a href="%s">new exciting features</a>.'; 
     28/*TODO*/$lang['Some themes and plugins may be not available yet.'] = 'Some themes and plugins may be not available yet.'; 
     29/*TODO*/$lang['You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'] = 'You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'; 
     30/*TODO*/$lang['First Step'] = 'First Step'; 
     31/*TODO*/$lang['Second Step'] = 'Second Step'; 
     32/*TODO*/$lang['Third Step'] = 'Third Step'; 
     33/*TODO*/$lang['Save Template Directory'] = 'Save template directory'; 
     34/*TODO*/$lang['Dump Database'] = 'Dump Database'; 
     35/*TODO*/$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Include history data (Warning: server memory limit may be exceeded)'; 
     36/*TODO*/$lang['Unable to write new local directory.'] = 'Unable to write new local directory.'; 
     37/*TODO*/$lang['Unable to send template directory.'] = 'Unable to send template directory.'; 
     38/*TODO*/$lang['Unable to dump database.'] = 'Unable to dump database.'; 
     39 
    2540?> 
  • extensions/autoupdate/trunk/language/nl_NL/plugin.lang.php

    r5558 r6181  
    1414$lang['Gallery and plugins are up to date'] = 'Galerie en plugins zijn up to date'; 
    1515$lang['Unable to check upgrades...'] = 'Niet mogelijk om upgrades te controleren...'; 
    16 $lang['Piwigo will automaticaly try again later.'] = 'Piwigo zal het automatisch later nog eens proberen.'; 
    1716$lang['Click here to check upgrades now'] = 'Klik hier om nu naar upgrades te zoeken'; 
    1817 
     
    2322$lang['Checking upgrades for gallery and plugins...'] = 'Bezig met het zoeken naar upgrades voor galerie en plugins...'; 
    2423 
     24/*TODO*/$lang['Upgrade to Piwigo %s'] = 'Upgrade to Piwigo %s'; 
     25/*TODO*/$lang['Two upgrades are available'] = 'Two upgrades are available'; 
     26/*TODO*/$lang['This is a minor upgrade, with only bug corrections.'] = 'This is a minor upgrade, with only bug corrections.'; 
     27/*TODO*/$lang['This is a major upgrade, with <a href="%s">new exciting features</a>.'] = 'This is a major upgrade, with <a href="%s">new exciting features</a>.'; 
     28/*TODO*/$lang['Some themes and plugins may be not available yet.'] = 'Some themes and plugins may be not available yet.'; 
     29/*TODO*/$lang['You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'] = 'You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'; 
     30/*TODO*/$lang['First Step'] = 'First Step'; 
     31/*TODO*/$lang['Second Step'] = 'Second Step'; 
     32/*TODO*/$lang['Third Step'] = 'Third Step'; 
     33/*TODO*/$lang['Save Template Directory'] = 'Save template directory'; 
     34/*TODO*/$lang['Dump Database'] = 'Dump Database'; 
     35/*TODO*/$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Include history data (Warning: server memory limit may be exceeded)'; 
     36/*TODO*/$lang['Unable to write new local directory.'] = 'Unable to write new local directory.'; 
     37/*TODO*/$lang['Unable to send template directory.'] = 'Unable to send template directory.'; 
     38/*TODO*/$lang['Unable to dump database.'] = 'Unable to dump database.'; 
     39 
    2540?> 
  • extensions/autoupdate/trunk/language/pl_PL/plugin.lang.php

    r4838 r6181  
    1414$lang['Gallery and plugins are up to date'] = 'Galeria i wtyczki są aktualne'; 
    1515$lang['Unable to check upgrades...'] = 'Nie można sprawdzić aktualizacji...'; 
    16 $lang['Piwigo will automaticaly try again later.'] = 'Piwigo później automatycznie spróbuje jeszcze raz.'; 
    1716$lang['Click here to check upgrades now'] = 'Kliknij tutaj, aby teraz sprawdzić aktualizacje'; 
    1817 
     
    2322$lang['Checking upgrades for gallery and plugins...'] = 'Sprawdzanie aktualizacji dla galerii oraz wtyczek...'; 
    2423 
     24/*TODO*/$lang['Upgrade to Piwigo %s'] = 'Upgrade to Piwigo %s'; 
     25/*TODO*/$lang['Two upgrades are available'] = 'Two upgrades are available'; 
     26/*TODO*/$lang['This is a minor upgrade, with only bug corrections.'] = 'This is a minor upgrade, with only bug corrections.'; 
     27/*TODO*/$lang['This is a major upgrade, with <a href="%s">new exciting features</a>.'] = 'This is a major upgrade, with <a href="%s">new exciting features</a>.'; 
     28/*TODO*/$lang['Some themes and plugins may be not available yet.'] = 'Some themes and plugins may be not available yet.'; 
     29/*TODO*/$lang['You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'] = 'You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'; 
     30/*TODO*/$lang['First Step'] = 'First Step'; 
     31/*TODO*/$lang['Second Step'] = 'Second Step'; 
     32/*TODO*/$lang['Third Step'] = 'Third Step'; 
     33/*TODO*/$lang['Save Template Directory'] = 'Save template directory'; 
     34/*TODO*/$lang['Dump Database'] = 'Dump Database'; 
     35/*TODO*/$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Include history data (Warning: server memory limit may be exceeded)'; 
     36/*TODO*/$lang['Unable to write new local directory.'] = 'Unable to write new local directory.'; 
     37/*TODO*/$lang['Unable to send template directory.'] = 'Unable to send template directory.'; 
     38/*TODO*/$lang['Unable to dump database.'] = 'Unable to dump database.'; 
     39 
    2540?> 
  • extensions/autoupdate/trunk/language/ru_RU/plugin.lang.php

    r5512 r6181  
    1414$lang['Gallery and plugins are up to date'] = 'Галерея и плагины обновлены'; 
    1515$lang['Unable to check upgrades...'] = 'Невозможно проверить обновления...'; 
    16 $lang['Piwigo will automaticaly try again later.'] = 'Piwigo автоматически попробует еще раз позже.'; 
    1716$lang['Click here to check upgrades now'] = 'Нажмите сюда, чтобы проверить обновления сейчас'; 
    1817 
     
    2322$lang['Checking upgrades for gallery and plugins...'] = 'Проверка обновлений для галереи и плагинов...'; 
    2423 
     24/*TODO*/$lang['Upgrade to Piwigo %s'] = 'Upgrade to Piwigo %s'; 
     25/*TODO*/$lang['Two upgrades are available'] = 'Two upgrades are available'; 
     26/*TODO*/$lang['This is a minor upgrade, with only bug corrections.'] = 'This is a minor upgrade, with only bug corrections.'; 
     27/*TODO*/$lang['This is a major upgrade, with <a href="%s">new exciting features</a>.'] = 'This is a major upgrade, with <a href="%s">new exciting features</a>.'; 
     28/*TODO*/$lang['Some themes and plugins may be not available yet.'] = 'Some themes and plugins may be not available yet.'; 
     29/*TODO*/$lang['You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'] = 'You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'; 
     30/*TODO*/$lang['First Step'] = 'First Step'; 
     31/*TODO*/$lang['Second Step'] = 'Second Step'; 
     32/*TODO*/$lang['Third Step'] = 'Third Step'; 
     33/*TODO*/$lang['Save Template Directory'] = 'Save template directory'; 
     34/*TODO*/$lang['Dump Database'] = 'Dump Database'; 
     35/*TODO*/$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Include history data (Warning: server memory limit may be exceeded)'; 
     36/*TODO*/$lang['Unable to write new local directory.'] = 'Unable to write new local directory.'; 
     37/*TODO*/$lang['Unable to send template directory.'] = 'Unable to send template directory.'; 
     38/*TODO*/$lang['Unable to dump database.'] = 'Unable to dump database.'; 
     39 
    2540?> 
  • extensions/autoupdate/trunk/language/zh_CN/plugin.lang.php

    r4846 r6181  
    1414$lang['Gallery and plugins are up to date'] = '图库和插件已是最新版'; 
    1515$lang['Unable to check upgrades...'] = '不能检查更新...'; 
    16 $lang['Piwigo will automaticaly try again later.'] = 'Piwigo 稍后将会自动再次尝试.'; 
    1716$lang['Click here to check upgrades now'] = '点击此检查更新'; 
    1817 
     
    2322$lang['Checking upgrades for gallery and plugins...'] = '正在检查图库和插件的更新...'; 
    2423 
     24/*TODO*/$lang['Upgrade to Piwigo %s'] = 'Upgrade to Piwigo %s'; 
     25/*TODO*/$lang['Two upgrades are available'] = 'Two upgrades are available'; 
     26/*TODO*/$lang['This is a minor upgrade, with only bug corrections.'] = 'This is a minor upgrade, with only bug corrections.'; 
     27/*TODO*/$lang['This is a major upgrade, with <a href="%s">new exciting features</a>.'] = 'This is a major upgrade, with <a href="%s">new exciting features</a>.'; 
     28/*TODO*/$lang['Some themes and plugins may be not available yet.'] = 'Some themes and plugins may be not available yet.'; 
     29/*TODO*/$lang['You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'] = 'You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'; 
     30/*TODO*/$lang['First Step'] = 'First Step'; 
     31/*TODO*/$lang['Second Step'] = 'Second Step'; 
     32/*TODO*/$lang['Third Step'] = 'Third Step'; 
     33/*TODO*/$lang['Save Template Directory'] = 'Save template directory'; 
     34/*TODO*/$lang['Dump Database'] = 'Dump Database'; 
     35/*TODO*/$lang['Include history data (Warning: server memory limit may be exceeded)'] = 'Include history data (Warning: server memory limit may be exceeded)'; 
     36/*TODO*/$lang['Unable to write new local directory.'] = 'Unable to write new local directory.'; 
     37/*TODO*/$lang['Unable to send template directory.'] = 'Unable to send template directory.'; 
     38/*TODO*/$lang['Unable to dump database.'] = 'Unable to dump database.'; 
     39 
    2540?> 
  • extensions/autoupdate/trunk/main.inc.php

    r6168 r6181  
    1919{ 
    2020  global $template, $page, $conf, $header_notes, $prefixeTable; 
     21 
     22  load_language('plugin.lang', dirname(__FILE__).'/'); 
    2123 
    2224  if ($page['page'] == 'intro') 
  • extensions/autoupdate/trunk/plugins_update.php

    r6168 r6181  
    11<?php 
    2  
    3 load_language('plugin.lang', dirname(__FILE__).'/'); 
    42 
    53function autoupdate_plugins_update_filter($content, &$smarty) 
  • extensions/autoupdate/trunk/template/autoupdate.tpl

    r6167 r6181  
     1{html_head} 
     2{literal} 
     3<style type="text/css"> 
     4form { width: 750px; } 
     5fieldset { padding-bottom: 30px; } 
     6p, form p { text-align: left; margin-left:20px; } 
     7li { margin: 5px; } 
     8</style> 
     9{/literal} 
     10{/html_head} 
     11 
    112<div class="titrePage"> 
    213{if $STEP < 2} 
     
    1021  {if $CHECK_VERSION} 
    1122    <p>{'You are running the latest version of Piwigo.'|@translate}</p> 
    12   {else}   
     23  {elseif $DEV_VERSION}  
     24    <p>{'You are running on development sources, no check possible.'|@translate}</p> 
     25  {else} 
    1326    <p>{'Check for upgrade failed for unknown reasons.'|@translate}</p> 
    1427  {/if} 
     
    1629 
    1730{if $STEP == 1} 
    18 <p>{'2 upgrades are available'|@translate}</p> 
     31<h4>{'Two upgrades are available'|@translate}:</h4> 
    1932<p> 
    2033<ul> 
    21   <li><a href="{$AU_URL}&amp;step=2&amp;to={$new_versions.1}">{'Upgrade to Piwigo %s'|@translate|@sprintf:$new_versions.1}</a>: {'This is a minor upgrade, with only bug corrections'|@translate}</li> 
    22   <li><a href="{$AU_URL}&amp;step=3&amp;to={$new_versions.0}">{'Upgrade to Piwigo %s'|@translate|@sprintf:$new_versions.0}</a>: {'This is a major upgrade, with <a href="http://piwigo.org/releases/%s">new exciting features</a>. Some themes and plugins may be not available yet.'|@translate|@sprintf:$new_versions.0}</li> 
     34  <li><a href="{$AU_URL}&amp;step=2&amp;to={$MINOR_VERSION}"><strong>{'Upgrade to Piwigo %s'|@translate|@sprintf:$MINOR_VERSION}</strong></a>: {'This is a minor upgrade, with only bug corrections.'|@translate}</li> 
     35  <li><a href="{$AU_URL}&amp;step=3&amp;to={$MAJOR_VERSION}"><strong>{'Upgrade to Piwigo %s'|@translate|@sprintf:$MAJOR_VERSION}</strong></a>: {'This is a major upgrade, with <a href="%s">new exciting features</a>.'|@translate|@sprintf:$RELEASE_URL} {'Some themes and plugins may be not available yet.'|@translate}</li> 
    2336</ul> 
    2437</p> 
     38<p>{'You can upgrade to Piwigo %s directly, without upgrading to Piwigo %s (recommended).'|@translate|@sprintf:$MAJOR_VERSION:$MINOR_VERSION}</p> 
    2539{/if} 
    2640 
    2741{if $STEP == 2} 
     42<p> 
     43  {'A new version of Piwigo is available.'|@translate}<br> 
     44  {'This is a minor upgrade, with only bug corrections.'|@translate} 
     45</p> 
    2846<form action="" method="post"> 
    29 <p style="text-align:left; margin-left:20px;"> 
    30   {'A new version of Piwigo is available.'}<br> 
    31   {'This is a minor upgrade, with only bug corrections'|@translate} 
    32 </p> 
    33 <p> 
    34   <input type="hidden" name="upgrade_to" value="{$UPGRADE_TO}"> 
    35   <input type="submit" name="submit" value="{'Upgrade to Piwigo %s'|@translate|@sprintf:$UPGRADE_TO}" onClick="return confirm('{'autoupdate_alert'|@translate}');"> 
    36 </p> 
     47<p><input type="submit" name="submit" value="{'Upgrade to Piwigo %s'|@translate|@sprintf:$UPGRADE_TO}" onClick="return confirm('{'autoupdate_alert'|@translate}');"></p> 
     48<p><input type="hidden" name="upgrade_to" value="{$UPGRADE_TO}"></p> 
    3749</form> 
    3850{/if} 
    3951 
    4052{if $STEP == 3} 
     53<p> 
     54  {'A new version of Piwigo is available.'|@translate}<br> 
     55  {'This is a major upgrade, with <a href="%s">new exciting features</a>.'|@translate|@sprintf:$RELEASE_URL} {'Some themes and plugins may be not available yet.'|@translate} 
     56</p> 
    4157<form action="" method="post"> 
    42 <p style="text-align:left; margin-left:20px;"> 
    43   {'A new version of Piwigo is available.'}<br> 
    44   {'This is a major upgrade, with <a href="http://piwigo.org/releases/%s">new exciting features</a>. Some themes and plugins may be not available yet.'|@translate|@sprintf:$UPGRADE_TO} 
    45 </p> 
    46 <input type="hidden" name="upgrade_to" value="{$UPGRADE_TO}"> 
    47 <fieldset style="text-align:left;"> 
    48   <legend>{'Save template directory'|@translate}</legend> 
    49   <p><input type="submit" name="saveTemplate" value="{'Save template directory'|@translate}"></p> 
     58<fieldset> 
     59  <legend>{'First Step'|@translate}</legend> 
     60  <p><input type="submit" name="saveTemplate" value="{'Save Template Directory'|@translate}"></p> 
    5061</fieldset> 
    5162<fieldset> 
    52   <legend>{'Dump Database'|@translate}</legend> 
    53   <p><input type="checkbox" name="includeHistory"> &nbsp; {'Include history table'|@translate}</p> 
    54   <p><input type="submit" name="dumpDatabase" value="{'Dump Database'|@translate|@sprintf:$UPGRADE_TO}"></p> 
     63  <legend>{'Second Step'|@translate}</legend> 
     64  <p><input type="checkbox" name="includeHistory"> &nbsp; {'Include history data (Warning: server memory limit may be exceeded)'|@translate}</p> 
     65  <p><input type="submit" name="dumpDatabase" value="{'Dump Database'|@translate}"></p> 
    5566</fieldset> 
    5667<fieldset> 
    57   <legend>{'Upgrade to Piwigo %s'|@translate|@sprintf:$UPGRADE_TO}</legend> 
    58   <p><input type="submit" name="submit" value="{'Upgrade to Piwigo %s'|@translate|@sprintf:$UPGRADE_TO}"></p> 
     68  <legend>{'Third Step'|@translate|@sprintf:$UPGRADE_TO}</legend> 
     69  <p><input type="submit" name="submit" value="{'Upgrade to Piwigo %s'|@translate|@sprintf:$UPGRADE_TO}" onClick="return confirm('{'autoupdate_alert'|@translate}');"></p> 
    5970</fieldset> 
     71<p><input type="hidden" name="upgrade_to" value="{$UPGRADE_TO}"></p> 
    6072</form> 
    6173{/if} 
Note: See TracChangeset for help on using the changeset viewer.