doc entry page prepared better ;) for warning about old existing translation

3 files changed, 8 insertions, 7 deletions

diff --git a/en/doc/archive.php b/en/doc/archive.php
index d0b5de611..00f42b2fe 100644
--- a/en/doc/archive.php
+++ b/en/doc/archive.php
@@ -28,7 +28,7 @@ require 'doc.php';
                     <h3>Mageia 2</h3>
                     <div style="float: left; margin: 2em;">
                         <p><?php
-                            doc_list(_t('Installer'), $documentation['installer'][2], '<a href="//doc.mageia.org/installer/2/%s/content/index.html">HTML</a>');
+                            doc_list(_t('Installer'), 'installer', 2, '<a href="//doc.mageia.org/installer/2/%s/content/index.html">HTML</a>');
                             ?></p>
                     </div>
                 </div>
diff --git a/en/doc/doc.php b/en/doc/doc.php
index f715b03aa..cb2289de7 100644
--- a/en/doc/doc.php
+++ b/en/doc/doc.php
@@ -8,10 +8,11 @@ $documentation['control_center'][3] = array('en','et','fr');
 
 $documentation['installer'][2]      = array('de','el','en','eo','fr','nl','pt_br','uk');
 
-function doc_list($documentation_name, $languages, $link, $epub_link = null, $pdf_link = null)
+function doc_list($documentation_name, $type, $version, $link, $epub_link = null, $pdf_link = null)
 {
     global $locale;
     global $langs;
+    global $documentation;
     $your_language = '';
     $others = '';
     $text_others = '';
@@ -20,7 +21,7 @@ function doc_list($documentation_name, $languages, $link, $epub_link = null, $pd
     $table = PHP_EOL . '<table class="dlt2 dlinfo"  style="font-size: 10pt;">' . PHP_EOL;
 //    $table .= '<thead><tr><th></th></tr></thead>';
     $table .= "\t<tbody>" . PHP_EOL;
-    foreach ($languages as $lng) {
+    foreach ($documentation[$type][$version] as $current_version => $lng) {
         // hopefully temporary exception for pt-br as convention for lang-abbrev in /langs.inc.php is different as link in doc.mageia.org
         if ($lng == 'pt_br') {
             $lng_name = $langs['pt-br'];
diff --git a/en/doc/index.php b/en/doc/index.php
index 610e6090f..7125ab9cd 100644
--- a/en/doc/index.php
+++ b/en/doc/index.php
@@ -32,14 +32,14 @@ require 'doc.php';
                     <h3>Mageia 4</h3>
                     <div style="float: left; margin: 2em;">
                         <p style="margin-left: 2em;"><?php
-                            doc_list(_t('Installer'), $documentation['installer'][4], '<a href="//doc.mageia.org/installer/4/%s/content/index.html">HTML</a>',
+                            doc_list(_t('Installer'), 'installer', 4, '<a href="//doc.mageia.org/installer/4/%s/content/index.html">HTML</a>',
                                 '<a href="//doc.mageia.org/installer/4/%s/content/index.html">EPUB</a>',
                                 '<a href="//doc.mageia.org/installer/4/%s/content/index.html">PDF</a>');
                             ?></p>
                     </div>
                     <div style="float: right; margin: 2em;">
                         <p style="margin-left: 2em;"><?php
-                            doc_list(_t('Control Center'), $documentation['control_center'][4], '<a href="//doc.mageia.org/mcc/4/%s/content/index.html">HTML</a>',
+                            doc_list(_t('Control Center'), 'control_center', 4, '<a href="//doc.mageia.org/mcc/4/%s/content/index.html">HTML</a>',
                                 '<a href="//doc.mageia.org/mcc/4/%s/content/index.html">EPUB</a>',
                                 '<a href="//doc.mageia.org/mcc/4/%s/content/index.html">PDF</a>');
                             ?></p>
@@ -48,12 +48,12 @@ require 'doc.php';
                     <h3>Mageia 3</h3>
                     <div style="float: left; margin: 2em;">
                         <p style="margin-left: 2em;"><?php
-                            doc_list(_t('Installer'), $documentation['installer'][3], '<a href="//doc.mageia.org/installer/3/%s/content/index.html">HTML</a>');
+                            doc_list(_t('Installer'), 'installer', 3, '<a href="//doc.mageia.org/installer/3/%s/content/index.html">HTML</a>');
                             ?></p>
                     </div>
                     <div style="float: right; margin: 2em;">
                         <p style="margin-left: 2em;"><?php
-                            doc_list(_t('Control Center'), $documentation['control_center'][3], '<a href="//doc.mageia.org/mcc/3/%s/content/index.html">HTML</a>');
+                            doc_list(_t('Control Center'), 'control_center', 3, '<a href="//doc.mageia.org/mcc/3/%s/content/index.html">HTML</a>');
                             ?></p>
                     </div>
                 </div>