Add Mageia 9 to other pages

7 files changed, 43 insertions, 14 deletions

diff --git a/en/9/nav.php b/en/9/nav.php
index e5da5ff40..91739d67b 100644
--- a/en/9/nav.php
+++ b/en/9/nav.php
@@ -10,7 +10,7 @@ $upgradeguide = _r('https://wiki.mageia.org/en/Mageia_9_Release_Notes#Upgrading_
 
 $nav = array(
     "/{$locale}/9/"  => 'Mageia 9',
-    "/{$locale}/9/download_index.php" => _r('Download'),
+    "/{$locale}/downloads/" => _r('Download'),
     $releasenotes => _r('Release notes'),
     $errata => _r('Errata'),
 //     "//bugs.mageia.org/" => _r('Bugs Reports'),
diff --git a/en/doc/archive.php b/en/doc/archive.php
index 5b7e11b64..96cf76a37 100644
--- a/en/doc/archive.php
+++ b/en/doc/archive.php
@@ -29,6 +29,22 @@ $rtl = is_locale_rtl($locale);
                     <?php _g('If you are looking for the current versions, see <a href="index.php">here</a>.')?></p>
                     <?php _g('Documentation built using the <a href="%s">Calenco tool from NeoDoc</a>.', 'http://www.neodoc.biz/', 'p')?>
                     <hr>
+                    <h3>Mageia 7</h3>
+                    <div class="row">
+                        <div class="col">
+                            <?php doc_list(_r('Control Center'), 'control_center', 7); ?>
+                        </div>
+                        <div class="col">
+                            <?php doc_list(_r('Installer'), 'installer', 7); ?>
+                        </div>
+                        <div class="col">
+                            <?php doc_list(_r('Installation from LIVE medium'), 'draklive', 7); ?>
+                        </div>
+                        <div class="col">
+                            <?php doc_list(_r('Network installation'), 'netinstall', 7); ?>
+                        </div>
+                    </div>
+                    <hr>					
                     <h3>Mageia 6</h3>
                     <div class="row">
                         <div class="col">
diff --git a/en/doc/doc.php b/en/doc/doc.php
index 260cf2cb6..68231c9db 100644
--- a/en/doc/doc.php
+++ b/en/doc/doc.php
@@ -1,5 +1,11 @@
 <?php
 
+//blind copy from 8, dont know if it's correct
+$documentation['installer'     ][9] = array('ca','cs','de','el','en','eo','es','et','eu','fr','hr','hu','ja','nb','nl','pl','pt_br','ro','ru','sk','sl','sq','sr','sv','tr','uk','zh_cn');
+$documentation['control_center'][9] = array('ca','cs','da','de','el','en','es','et','eu','fr','id','it','ja','nb','nl','pl','pt_br','ro','ru','sl','sq','sr','sv','tr','uk','zh_cn');
+$documentation['draklive'      ][9] = array('cs','de','el','en','es','et','eu','fr','hr','ja','nl','pt_br','ro','sk','sl','sq','sr','sv','uk');
+$documentation['netinstall'    ][9] = array('ca','de','el','en','es','et','eu','fr','hu','ja','nb','nl','pt_br','ru','sl','sq','sr','sv','tr','uk','zh_cn');
+
 $documentation['installer'     ][8] = array('ca','cs','de','el','en','eo','es','et','eu','fr','hr','hu','ja','nb','nl','pl','pt_br','ro','ru','sk','sl','sq','sr','sv','tr','uk','zh_cn');
 $documentation['control_center'][8] = array('ca','cs','da','de','el','en','es','et','eu','fr','id','it','ja','nb','nl','pl','pt_br','ro','ru','sl','sq','sr','sv','tr','uk','zh_cn');
 $documentation['draklive'      ][8] = array('cs','de','el','en','es','et','eu','fr','hr','ja','nl','pt_br','ro','sk','sl','sq','sr','sv','uk');
diff --git a/en/doc/index.php b/en/doc/index.php
index db0750f59..163fe8ced 100644
--- a/en/doc/index.php
+++ b/en/doc/index.php
@@ -32,35 +32,35 @@ $rtl = is_locale_rtl($locale);
                     <?php _g('Feel free to help <a href="../community/">us improve</a> them, or to assist in translating them into your language.')?></p>
                     <?php _g('Documentation built using the <a href="%s">Calenco tool from NeoDoc</a>.', 'http://www.neodoc.biz/', 'p')?>
                     <hr>
-                    <h3>Mageia 8</h3>
+                    <h3>Mageia 9</h3>
                     <div class="row">
                         <div class="col">
-                            <?php doc_list(_r('Control Center'), 'control_center', 8); ?>
+                            <?php doc_list(_r('Control Center'), 'control_center', 9); ?>
                         </div>
                         <div class="col">
-                            <?php doc_list(_r('Installer'), 'installer', 8); ?>
+                            <?php doc_list(_r('Installer'), 'installer', 9); ?>
                         </div>
                         <div class="col">
-                            <?php doc_list(_r('Installation from LIVE medium'), 'draklive', 8); ?>
+                            <?php doc_list(_r('Installation from LIVE medium'), 'draklive', 9); ?>
                         </div>
                         <div class="col">
-                            <?php doc_list(_r('Network installation'), 'netinstall', 8); ?>
+                            <?php doc_list(_r('Network installation'), 'netinstall', 9); ?>
                         </div>
                     </div>
                     <hr>
-                    <h3>Mageia 7</h3>
+                    <h3>Mageia 8</h3>
                     <div class="row">
                         <div class="col">
-                            <?php doc_list(_r('Control Center'), 'control_center', 7); ?>
+                            <?php doc_list(_r('Control Center'), 'control_center', 8); ?>
                         </div>
                         <div class="col">
-                            <?php doc_list(_r('Installer'), 'installer', 7); ?>
+                            <?php doc_list(_r('Installer'), 'installer', 8); ?>
                         </div>
                         <div class="col">
-                            <?php doc_list(_r('Installation from LIVE medium'), 'draklive', 7); ?>
+                            <?php doc_list(_r('Installation from LIVE medium'), 'draklive', 8); ?>
                         </div>
                         <div class="col">
-                            <?php doc_list(_r('Network installation'), 'netinstall', 7); ?>
+                            <?php doc_list(_r('Network installation'), 'netinstall', 8); ?>
                         </div>
                     </div>
                     <hr>
diff --git a/en/map/index.php b/en/map/index.php
index 51ca8a08c..2f3603d14 100644
--- a/en/map/index.php
+++ b/en/map/index.php
@@ -38,6 +38,7 @@ $map = array(
         't' => _r('Downloads'),
         'l' => '/{L}/downloads/',
         'i' => array(
+            array('t' => _r('9 (August 2023)'),  'l' => '/{L}/9/'),
             array('t' => _r('8 (February 2021)'),  'l' => '/{L}/8/'),
             array('t' => _r('7 (June 2019)'),      'l' => '/{L}/7/'),
             array('t' => _r('6 (July 2017)'),      'l' => '/{L}/6/'),
diff --git a/en/support/index.php b/en/support/index.php
index 4f691614c..265014be9 100644
--- a/en/support/index.php
+++ b/en/support/index.php
@@ -41,8 +41,8 @@ $rtl = is_locale_rtl($locale);
                             '<a href="' . _r('https://wiki.mageia.org') . '">', '</a>'), 'p');
                         echo '<hr>';
                         _g('Updates', null, 'h2 id="updates"');
-//                        _g('Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis.', array('<a href="//advisories.mageia.org/6.html">Mageia 6</a>', '<a href="//advisories.mageia.org/7.html">Mageia 7</a>'), 'p');
-                         _g('Updates are available for %s (security and bug fixes) and published on an ongoing basis.', array('<a href="//advisories.mageia.org/8.html">Mageia 8</a>'), 'p');
+                        _g('Updates are available for %s and %s (security and bug fixes) and published on an ongoing basis.', array('<a href="//advisories.mageia.org/8.html">Mageia 8</a>', '<a href="//advisories.mageia.org/9.html">Mageia 9</a>'), 'p');
+ //                        _g('Updates are available for %s (security and bug fixes) and published on an ongoing basis.', array('<a href="//advisories.mageia.org/8.html">Mageia 8</a>'), 'p');
                         _g('You can install these from the Mageia Control Center.', null, 'p');
                         _g('You may subscribe to our %s announce list to be notified of these.', array('<a href="https://ml.mageia.org/l/info/updates-announce">updates-announce</a>'), 'p');
                         echo '<hr>';
@@ -54,7 +54,10 @@ $rtl = is_locale_rtl($locale);
                         // _g('And at least three months after the new release is out.');
                         echo '</p>';
                         echo '<ul class="hl">';
-                        _g('Mageia 8 will be supported until August 31st, 2022, or for at least 3 months after Mageia 9 release.', null, 'li'); // _g('Mageia 8 was supported for at least 3 months after Mageia 9 release.', null, 'li');
+						_g('Mageia 9 will be supported until March 31st, 2025', null, 'li');
+						//_g('Mageia 8 was supported until November 30th, 2023', null, 'li');
+						_g('Mageia 8 will be supported until November 30th, 2023', null, 'li');
+                        //_g('Mageia 8 will be supported until August 31st, 2022, or for at least 3 months after Mageia 9 release.', null, 'li'); // _g('Mageia 8 was supported for at least 3 months after Mageia 9 release.', null, 'li');
                         _g('Mageia 7 was supported until June 30th, 2021.', null, 'li');
                         _g('Mageia 6 was supported until September 30th, 2019.', null, 'li');
                         echo '<li>';
diff --git a/en/timeline/index.php b/en/timeline/index.php
index c7e9033b2..3ee187694 100644
--- a/en/timeline/index.php
+++ b/en/timeline/index.php
@@ -37,6 +37,9 @@ function list_events($events = array(), $rtl = false)
 }
 
 $events = array(
+    _r('2023') => array(
+        _r('August') => array(sprintf(_r('<a href=%s>Mageia %s</a> is released.'), '"../9/"', '9')),
+    ),
     _r('2021') => array(
         _r('March') => array(_r('General Assembly on IRC.')),
         _r('February') => array(sprintf(_r('<a href=%s>Mageia %s</a> is released.'), '"../8/"', '8')),