From 87fd78f9bddcda4a0a319a23b106cf2ca03fd542 Mon Sep 17 00:00:00 2001 From: Romain d'Alverny Date: Thu, 9 Jun 2011 10:35:02 +0000 Subject: add actual upgrade command + cli_6 string --- en/1/migrate/index.php | 32 ++++++++++++++++++-------------- en/1/migrate/locales.php | 3 ++- 2 files changed, 20 insertions(+), 15 deletions(-) (limited to 'en/1/migrate') diff --git a/en/1/migrate/index.php b/en/1/migrate/index.php index 974479a7a..030ffaa10 100644 --- a/en/1/migrate/index.php +++ b/en/1/migrate/index.php @@ -4,22 +4,23 @@ $locale = explode('/', $_SERVER['REQUEST_URI']); $locale = $locale[1]; require 'locales.php'; -if (!array_key_exists($locale, $_t)) { - $locale = 'en'; -} -$_t = $_t[$locale]; +$locale = array_key_exists($locale, $_t) ? $locale : 'en'; + +$_t = ($locale == 'en') + ? $_t['en'] + : array_merge($_t['en'], $_t[$locale]); ?> - + <?php echo $_t['page_title']; ?> - - - - + + + + @@ -79,21 +80,24 @@ $_t = $_t[$locale];

diff --git a/en/1/migrate/locales.php b/en/1/migrate/locales.php index 7bc306c56..a05e10215 100644 --- a/en/1/migrate/locales.php +++ b/en/1/migrate/locales.php @@ -51,7 +51,8 @@ $_t = array( according to your geographical location); note that for this method to work, you must have installed the mgaonline package (see above):', 'cli_5' => 'Or using a specific media mirror (you can get the mirror_url from our mirrors list):', - 'h2_thats_it' => 'That\'s it!', + 'cli_6' => 'Finally, start upgrading:', + 'h2_thats_it' => 'Et voilà!', //'That\'s it!', 'h3_question' => 'Have a question?', 'join_and_ask' => 'Do not hesitate to join our #mageia IRC channel on Freenode or posting in our forum -- cgit v1.2.1