diff options
| author | Romain d'Alverny <rda@mageia.org> | 2011-06-09 10:35:02 +0000 |
|---|---|---|
| committer | Romain d'Alverny <rda@mageia.org> | 2011-06-09 10:35:02 +0000 |
| commit | 87fd78f9bddcda4a0a319a23b106cf2ca03fd542 (patch) | |
| tree | 9f83fede891799d1f6ebd7d3e622da13241cb7f9 /en | |
| parent | 33528e6da0b9f7b7d6eeff90ae30026605c8c432 (diff) | |
| download | www-87fd78f9bddcda4a0a319a23b106cf2ca03fd542.tar www-87fd78f9bddcda4a0a319a23b106cf2ca03fd542.tar.gz www-87fd78f9bddcda4a0a319a23b106cf2ca03fd542.tar.bz2 www-87fd78f9bddcda4a0a319a23b106cf2ca03fd542.tar.xz www-87fd78f9bddcda4a0a319a23b106cf2ca03fd542.zip | |
add actual upgrade command + cli_6 string
Diffstat (limited to 'en')
| -rw-r--r-- | en/1/migrate/index.php | 32 | ||||
| -rw-r--r-- | en/1/migrate/locales.php | 3 |
2 files changed, 20 insertions, 15 deletions
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]); ?> <!DOCTYPE html> <html lang="<?php echo $locale; ?>"> <head> - <meta charset="utf-8" /> + <meta charset="utf-8"> <title><?php echo $_t['page_title']; ?></title> - <meta name="description" content="<?php echo $_t['page_desc']; ?>" /> - <meta name="keywords" content="<?php echo $_t['page_kw']; ?>" /> - <meta name="author" content="Mageia" /> - <link rel="stylesheet" type="text/css" href="/g/style/all.css" > + <meta name="description" content="<?php echo $_t['page_desc']; ?>"> + <meta name="keywords" content="<?php echo $_t['page_kw']; ?>"> + <meta name="author" content="Mageia"> + <link rel="stylesheet" type="text/css" href="/g/style/all.css"> <?php include '../../../analytics.php'; ?> </head> <body class="release"> @@ -79,21 +80,24 @@ $_t = $_t[$locale]; <p><?php echo $_t['cli_1']; ?></p> <ul> <li><p><?php echo $_t['cli_2']; ?></p> - <p><code class="term">$ su<br /> - # urpmi.removemedia -a</code></p></li> + <p><code class="term">$ su<br> + # urpmi.removemedia -a</code></p></li> <li><p><?php echo $_t['cli_3']; ?></p> <ul> <li><p><?php echo $_t['cli_4']; ?></p> - <p><code class="term">$ su<br /> + <p><code class="term"> # urpmi.addmedia --distrib --mirrorlist http://mirrors.mageia.org/api/mageia.1.$ARCH.list</code></p> <p>replacing <code>$ARCH</code> by <code>i586</code> or <code>x86_64</code>.</p> </li> <li><p><?php echo $_t['cli_5']; ?></p> - <p><code class="term">$ su<br /> - # urpmi.addmedia --distrib <mirror_url></code></p> + <p><code class="term"># urpmi.addmedia --distrib <mirror_url></code></p> </li> </ul> </li> + <li><p><?php echo $_t['cli_6']; ?></p> + <p><code class="term"># urpmi --replacefiles --auto-update --auto + </code></p> + </li> </ul> <hr> <h2><?php echo $_t['h2_thats_it']; ?></h2> 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, <em>you must have installed the <code>mgaonline</code> package (see above)</em>:', 'cli_5' => 'Or using a specific media mirror (you can get the <i>mirror_url</i> from <a href="http://mirrors.mageia.org/distrib">our mirrors list</a>):', - '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 <a href="irc://irc.freenode.net/#mageia">#mageia</a> IRC channel on Freenode or posting in <a href="http://forums.mageia.org/">our forum</a> |