aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Burger <obgr_seneca@mageia.org>2011-05-31 19:54:29 +0000
committerOliver Burger <obgr_seneca@mageia.org>2011-05-31 19:54:29 +0000
commit1afb6f96ab70c572cbdeff50bc28bfa0ff8892c7 (patch)
tree1c61cb89997c61a55253afe3774ff7d5b09da0a1
parent009659116bb6dc10b759c49af999833aa2fec77c (diff)
downloadwww-1afb6f96ab70c572cbdeff50bc28bfa0ff8892c7.tar
www-1afb6f96ab70c572cbdeff50bc28bfa0ff8892c7.tar.gz
www-1afb6f96ab70c572cbdeff50bc28bfa0ff8892c7.tar.bz2
www-1afb6f96ab70c572cbdeff50bc28bfa0ff8892c7.tar.xz
www-1afb6f96ab70c572cbdeff50bc28bfa0ff8892c7.zip
internationalized migrate
-rw-r--r--1/migrate/index.php7
-rw-r--r--1/migrate/migrate.php117
-rw-r--r--1/migrate/migrate_locales.php62
-rw-r--r--en/1/migrate/index.php131
4 files changed, 187 insertions, 130 deletions
diff --git a/1/migrate/index.php b/1/migrate/index.php
new file mode 100644
index 000000000..e91a55f26
--- /dev/null
+++ b/1/migrate/index.php
@@ -0,0 +1,7 @@
+<?php
+
+require_once '../langs.inc.php';
+$langs = array(
+ 'en' => 'English'
+);
+relocate($langs, '1/migrate/');
diff --git a/1/migrate/migrate.php b/1/migrate/migrate.php
new file mode 100644
index 000000000..e034cf953
--- /dev/null
+++ b/1/migrate/migrate.php
@@ -0,0 +1,117 @@
+<?php
+
+$locale = explode('/', $_SERVER['REQUEST_URI']);
+$locale = $locale[1];
+
+require 'migrate_locales.php';
+if (!array_key_exists($locale, $_t)) {
+ $locale = 'en';
+}
+
+$_t = $_t[$locale];
+
+?>
+
+<!DOCTYPE html>
+<html lang="<?php echo $locale; ?>">
+<head>
+ <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" >
+ <?php include '../../../analytics.php'; ?>
+</head>
+<body class="release">
+ <?php include '../../../langs.php'; ?>
+
+ <div id="doc" class="yui-t7">
+ <div id="hd" role="banner"><h1><a id="logo" href="/"><span>Mageia</span></a> <span class="lsep">|</span> <span class="subh"><?php echo $_t['page_h1']; ?></span></h1></div>
+ <div id="bd" role="main">
+ <div class="yui-g">
+ <?php include '../nav.php'; ?>
+ <div class="para">
+ <p><?php echo $_t['upgrading_general']; ?></p>
+ <ul>
+ <?php foreach ( $_t['upgrading_general_array'] as $anItem ) {
+ echo '<li>'.$anItem.'</li>';
+ } ?>
+ </ul>
+ <p><?php echo $_t['upgrading_ways']; ?></p>
+ <ul>
+ <li><?php echo $_t['upgrading_ways_dvd']; ?></li>
+ <li><?php echo $_t['upgrading_ways_inline']; ?></li>
+ </ul>
+ <hr>
+ <h2 id="dvd"><?php echo $_t['h2_dvd']; ?></h2>
+ <p><?php echo $_t['dvd_clean_install']; ?></p>
+ <p><?php echo $_t['to_upgrade']; ?></p>
+ <ul>
+ <?php foreach ( $_t['to_upgrade_array'] as $anItem ) {
+ echo '<li>'.$anItem.'</li>';
+ } ?>
+ </ul>
+ <p><?php echo $_t['recommended']; ?></p>
+ <hr>
+ <h2 id="inline"><?php echo $_t['h2_inline']; ?></h2>
+ <p><?php echo $_t['inline_1']; ?></p>
+ <p><?php echo $_t['inline_2']; ?></p>
+
+ <p style="text-align: center;"><a href="/en/downloads/dl.php?product=mgaonline" rel="nofollow" title="Download mgaonline"><img src="/g/images/oxygen/application-x-rpm.png" alt="mgaonline"><br>
+ mgaonline<br>
+ <br><?php echo $_t['mgaonline_image_title']; ?></a></p>
+
+ <br>
+ <p><?php echo $_t['inline_3']; ?></p>
+
+ <p><?php echo $_t['a_or_b']; ?></p>
+ <br>
+ <h2 id="mgaonline"><?php echo $_t['h2_a']; ?></h2>
+ <p><?php echo $_t['popup_window_1']; ?></p>
+ <img src="/g/1/mgaonline/mgaonline8.png" alt="mgaonline pop-up" class="screen-copy">
+
+ <p><?php echo $_t['popup_window_2']; ?></p>
+ <img src="/g/1/mgaonline/mgaonline2.png" alt="mgaonline pop-up" class="screen-copy">
+
+ <p><?php echo $_t['as_soon_complete']; ?></p>
+
+ <br>
+ <h2 id="urpmi"><?php echo $_t['h2_b']; ?></h2>
+ <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>
+ <li><p><?php echo $_t['cli_3']; ?></p>
+ <ul>
+ <li><p><?php echo $_t['cli_4']; ?></p>
+ <p><code class="term">$ su<br />
+ # urpmi.addmedia --distrib --mirrorlist</code></p>
+ </li>
+ <li><p><?php echo $_t['cli_5']; ?></p>
+ <p><code class="term">$ su<br />
+ # urpmi.addmedia --distrib &lt;media_url&gt;</code></p>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ <hr>
+ <h2><?php echo $_t['h2_thats_it']; ?></h2>
+ </div></div>
+ <hr>
+ <div class="yui-g">
+ <div class="yui-u first"><div class="para" style="padding-right: 0;">
+ <h3><?php echo $_t['h3_question']; ?></h3>
+ <p><?php echo $_t['join_and_ask']; ?></p>
+
+ </div></div>
+ <div class="yui-u"><div class="para">
+ <h3><?php echo $_t['h3_feedback']; ?></h3>
+ <p><?php echo $_t['tweet_it']; ?></p>
+ </div></div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
diff --git a/1/migrate/migrate_locales.php b/1/migrate/migrate_locales.php
new file mode 100644
index 000000000..29d08d3a8
--- /dev/null
+++ b/1/migrate/migrate_locales.php
@@ -0,0 +1,62 @@
+<?php
+$_t = array(
+ 'en' => array(
+ 'page_title' => 'Migrate from Mandriva Linux to Mageia',
+ 'page_desc' => 'How to migrate from Mandriva Linux 2010.1/2010.2 to Mageia 1 in a few, safe steps.',
+ 'page_kw' => 'mageia, mandriva, upgrade, migrate',
+ 'page_h1' => 'Migrate from Mandriva Linux',
+ 'upgrading_general' => 'Upgrading from Mandriva Linux 2010.1 and 2010.2 is supported, and has been fine tuned over the past
+ months, so it should work. But as always and before:',
+ 'upgrading_general_array' => array('back up your data before upgrading;',
+ 'if you are upgrading a laptop, connect to power!
+ You might be updating over 2000 packages, and this can take some time;',
+ 'do not start up any net-intensive applications during the upgrade
+ &ndash; you need to reserve bandwidth for the upgrade.'),
+ 'upgrading_ways' => 'There are several ways to upgrade from one of those previous Mandriva releases:',
+ 'upgrading_ways_dvd' => '<a href="#dvd">using the Mageia 1 DVD</a>',
+ 'upgrading_ways_inline' => '<a href="#inline">using the online media sources directly</a>,
+ using <a href="#mgaonline">mgaonline</a> or <a href="#urpmi">urpmi</a>.',
+ 'h2_dvd' => 'Upgrade using the Mageia 1 DVD',
+ 'dvd_clean_install' => 'You can use the <a href="/downloads/">Mageia 1 DVD</a> to do a clean install
+ but also to upgrade from previous releases.',
+ 'to_upgrade' => 'To upgrade:',
+ 'to_upgrade_array' => array('<a href="/downloads/">Download the ISO</a> and burn it on a DVD;',
+ 'Boot the DVD and select "Install Mageia 1" from the bootloader menu;',
+ 'Select the "Upgrade" option in the installer.'),
+ 'recommended' => 'It is recommended to set up the online repositories, if possible
+ &ndash; the installer will ask you about this during the upgrade.
+ The reason is that the DVD only includes a subset
+ of these full fledged online Mageia repositories.',
+ 'h2_inline' => 'Upgrading inline',
+ 'inline_1' => 'You can upgrade using the online media sources directly, from within your Mandriva installation.',
+ 'inline_2' => 'This can be done either using the graphical <code>mgaonline</code> tool
+ or the command-line <code>urpmi</code>.
+ Both methods are outlined below. But first, download and install
+ this <code>mgaonline</code> package that will help you through the process:',
+ 'mgaonline_image_title' => 'for Mandriva Linux 2010.1 or 2010.2',
+ 'inline_3' => 'Note that you may get a security warning, due to invalid package signatures.
+ This is because a Mandriva system does not recognise Mageia signatures;
+ you can safely ignore these warnings.
+ Yes, that sucks, we know.',
+ 'a_or_b' => 'So, it installed the package? Good, let\'s move on and pick a) or b) below:',
+ 'h2_a' => 'a) Upgrading inline, using mgaonline (GUI)',
+ 'popup_window_1' => 'a) Upgrading inline, using mgaonline (GUI)',
+ 'popup_window_2' => 'Just follow the wizard instructions; it will configure Mageia media sources and start the migration.',
+ 'as_soon_complete' => 'As soon as the migration is complete, you should restart your system; and here you are.',
+ 'h2_b' => 'b) Upgrading inline, using urpmi (CLI)',
+ 'cli_1' => 'You can also upgrade using <code>urpmi</code> from your favourite terminal emulator,
+ if you are confortable with it. Here are the steps:',
+ 'cli_2' => 'Remove all the existing media sources on your system:',
+ 'cli_3' => 'Add the Mageia online sources:',
+ 'cli_4' => 'either directly (this will select a best matching mirror, after your location):',
+ 'cli_5' => 'either using a specific media mirror (you can decide from <a href="http://mirrors.mageia.org/distrib">our mirrors list</a>):',
+ 'h2_thats_it' => '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 go in <a href="http://forums.mageia.org/">our forum</a>
+ to ask for assistance or details.',
+ 'h3_feedback' => 'Want to send some feedback?',
+ 'tweet_it' => 'Just <a href="http://twitter.com/mageia_org">tweet it to @mageia_org</a>.'
+ )
+);
+?> \ No newline at end of file
diff --git a/en/1/migrate/index.php b/en/1/migrate/index.php
index d8eef0075..96776ab51 100644
--- a/en/1/migrate/index.php
+++ b/en/1/migrate/index.php
@@ -1,130 +1 @@
-<?php
-$_t = array(
- 'page_title' => 'Migrate from Mandriva Linux to Mageia',
- 'page_desc' => 'How to migrate from Mandriva Linux 2010.1/2010.2 to Mageia 1 in a few, safe steps.',
- 'page_kw' => 'mageia, mandriva, upgrade, migrate',
- 'page_h1' => 'Migrate from Mandriva Linux'
-);
-
-
-?><!DOCTYPE html>
-<html lang="<?php echo $locale; ?>">
-<head>
- <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" >
- <?php include '../../../analytics.php'; ?>
-</head>
-<body class="release">
- <?php include '../../../langs.php'; ?>
-
- <div id="doc" class="yui-t7">
- <div id="hd" role="banner"><h1><a id="logo" href="/"><span>Mageia</span></a> <span class="lsep">|</span> <span class="subh"><?php echo $_t['page_h1']; ?></span></h1></div>
- <div id="bd" role="main">
- <div class="yui-g">
- <?php include '../nav.php'; ?>
- <div class="para">
- <p>Upgrading from Mandriva Linux 2010.1 and 2010.2 is supported, and has been fine tuned over the past
- months, so it should work. But as always and before:</p>
- <ul>
- <li>back up your data before upgrading;</li>
- <li>if you are upgrading a laptop, connect to power!
- You might be updating over 2000 packages, and this can take some time;</li>
- <li>do not start up any net-intensive applications during the upgrade
- &ndash; you need to reserve bandwidth for the upgrade.</li>
- </ul>
- <p>There are several ways to upgrade from one of those previous Mandriva releases:</p>
- <ul>
- <li><a href="#dvd">using the Mageia 1 DVD</a></li>
- <li><a href="#inline">using the online media sources directly</a>,
- using <a href="#mgaonline">mgaonline</a> or <a href="#urpmi">urpmi</a>.</li>
- </ul>
- <hr>
- <h2 id="dvd">Upgrade using the Mageia 1 DVD</h2>
- <p>You can use the <a href="/downloads/">Mageia 1 DVD</a> to do a clean install
- but also to upgrade from previous releases.</p>
- <p>To upgrade:</p>
- <ul>
- <li><a href="/downloads/">Download the ISO</a> and burn it on a DVD;</li>
- <li>Boot the DVD and select "Install Mageia 1" from the bootloader menu;</li>
- <li>Select the "Upgrade" option in the installer.</li>
- </ul>
- <p>It is recommended to set up the online repositories, if possible
- &ndash; the installer will ask you about this during the upgrade.
- The reason is that the DVD only includes a subset
- of these full fledged online Mageia repositories.</p>
- <hr>
- <h2 id="inline">Upgrading inline</h2>
- <p>You can upgrade using the online media sources directly, from within your Mandriva installation.</p>
- <p>This can be done either using the graphical <code>mgaonline</code> tool
- or the command-line <code>urpmi</code>.
- Both methods are outlined below. But first, download and install
- this <code>mgaonline</code> package that will help you through the process:</p>
-
- <p style="text-align: center;"><a href="/en/downloads/dl.php?product=mgaonline" rel="nofollow" title="Download mgaonline"><img src="/g/images/oxygen/application-x-rpm.png" alt="mgaonline"><br>
- mgaonline<br>
- for Mandriva Linux<br> 2010.1 or 2010.2</a></p>
-
- <br>
- <p>Note that you may get a security warning, due to invalid package signatures.
- This is because a Mandriva system does not recognise Mageia signatures;
- you can safely ignore these warnings.
- Yes, that sucks, we know.</p>
-
- <p>So, it installed the package? Good, let's move on and pick a) or b) below:</p>
- <br>
- <h2 id="mgaonline">a) Upgrading inline, using mgaonline (GUI)</h2>
- <p>Just close your graphical session and log in again.
- A pop-up window will notify you of the availability of the new Mageia 1 distribution:</p>
- <img src="/g/1/mgaonline/mgaonline8.png" alt="mgaonline pop-up" class="screen-copy">
-
- <p>Just follow the wizard instructions; it will configure Mageia media sources and start the migration.</p>
- <img src="/g/1/mgaonline/mgaonline2.png" alt="mgaonline pop-up" class="screen-copy">
-
- <p>As soon as the migration is complete, you should restart your system; and here you are.</p>
-
- <br>
- <h2 id="urpmi">b) Upgrading inline, using urpmi (CLI)</h2>
- <p>You can also upgrade using <code>urpmi</code> from your favourite terminal emulator,
- if you are confortable with it. Here are the steps:</p>
- <ul>
- <li><p>Remove all the existing media sources on your system:</p>
- <p><code class="term">$ su<br />
- # urpmi.removemedia -a</code></p></li>
- <li><p>Add the Mageia online sources:</p>
- <ul>
- <li><p>either directly (this will select a best matching mirror, after your location):</p>
- <p><code class="term">$ su<br />
- # urpmi.addmedia --distrib --mirrorlist</code></p>
- </li>
- <li><p>either using a specific media mirror (you can decide from <a href="http://mirrors.mageia.org/distrib">our mirrors list</a>):</p>
- <p><code class="term">$ su<br />
- # urpmi.addmedia --distrib &lt;media_url&gt;</code></p>
- </li>
- </ul>
- </li>
- </ul>
- <hr>
- <h2>That's it!</h2>
- </div></div>
- <hr>
- <div class="yui-g">
- <div class="yui-u first"><div class="para" style="padding-right: 0;">
- <h3>Have a question?</h3>
- <p>Do not hesitate to join our <a href="irc://irc.freenode.net/#mageia">#mageia</a>
- IRC channel on Freenode or go in <a href="http://forums.mageia.org/">our forum</a>
- to ask for assistance or details.</p>
-
- </div></div>
- <div class="yui-u"><div class="para">
- <h3>Want to send some feedback?</h3>
- <p>Just <a href="http://twitter.com/mageia_org">tweet it to @mageia_org</a>.</p>
- </div></div>
- </div>
- </div>
- </div>
-</body>
-</html>
+<?php require '../../../1/migrate/migrate.php'; ?>