From e5c6709ef98b466293479cafb012951218475f47 Mon Sep 17 00:00:00 2001
From: Manuel Hiebel <leuhmanu@mageia.org>
Date: Sat, 1 Feb 2014 20:25:45 +0000
Subject: use var for release notes/upgrade guide/errata

---
 en/4/download_index.php | 8 ++++----
 en/4/index.php          | 2 +-
 en/4/nav.php            | 7 +++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'en/4')

diff --git a/en/4/download_index.php b/en/4/download_index.php
index 3bdab007a..6315cfbfe 100755
--- a/en/4/download_index.php
+++ b/en/4/download_index.php
@@ -120,7 +120,7 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
                         <h2><?php _e('LiveCDs and LiveDVDs');?></h2>
                         <p class="dlinfo"><?php _e('Use LiveCDs and LiveDVDs for fresh new installs ONLY.');?>
                             <span class="warn"><?php _e('DO NOT use these LiveCDs or LiveDVDs to upgrade from Mageia 3!'); ?></span>
-			<?php _e('Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>.', array('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3'));?></p>
+			<?php _e('Use above DVD or CD and see <a href="%s" hreflang="en">upgrade guide</a>.', array($upgradeguide));?></p>
                         <table class="fr-table dlt2">
                         <thead>
                             <tr>
@@ -222,8 +222,8 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
                         <h2>Mageia 4</h2>
                         <?php _h('February 1<sup>st</sup> 2014')?>
                         <ul class="hl">
-                            <li><?php _e('<a href="%s%s_%s_%s">Release notes</a>', array('https://wiki.mageia.org/en/','Mageia',4,'Release_Notes'))?></li>
-                            <li><?php _e('<a href="%s">Errata</a>', array('https://wiki.mageia.org/en/Mageia_4_Errata'))?></li>
+                            <li><?php _e('<a href="%s">Release notes</a>', array($releasenotes))?></li>
+                            <li><?php _e('<a href="%s">Errata</a>', array($errata))?></li>
                             <li><?php _e('<a href="%s">Which to choose</a>', array('https://wiki.mageia.org/en/Installation_Media'))?></li>
                             <li><?php _e('<a href="%s">Get ISO on USB flash stick</a>', array('https://wiki.mageia.org/en/Installation_Media#Dump_Mageia_ISO_on_a_USB_flash_stick.3F'))?></li>
                             <li><?php _e('Newcomer? <a href="%s">Here\'s a wiki page for you.</a>', array('https://wiki.mageia.org/en/Newcomers_start_here'))?></li>
@@ -233,7 +233,7 @@ function dl_link($variant = null, $arch = 'i586', $medium, $torrent = false, $un
                         <?php _h('Upgrading<br>from Mageia 3?', null, 'h3')?>
                         <ul class="hl"><?php
                             _h('<strong>do not</strong> use LiveCDs;', null, 'li');
-                            _h('see the <a href="%s" hreflang="en">upgrade guide</a>', array('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3'), 'li');
+                            _h('see the <a href="%s" hreflang="en">upgrade guide</a>', array($upgradeguide), 'li');
                         ?></ul>
                         <br>
                         <br>
diff --git a/en/4/index.php b/en/4/index.php
index 16ce50792..1aa35f7ca 100644
--- a/en/4/index.php
+++ b/en/4/index.php
@@ -46,7 +46,7 @@ _lang_load($locale, '4');
 
             _h('What\'s new?', null, 'h2');
 
-            _h('There\'s plenty of new goodness in Mageia 4, too much to include here - see the <a hreflang="en" href="%s">release notes</a> for an extensive exposé.',array('https://wiki.mageia.org/en/Mageia_4_Release_Notes'));
+            _h('There\'s plenty of new goodness in Mageia 4, too much to include here - see the <a hreflang="en" href="%s">release notes</a> for an extensive exposé.',array($releasenotes));
 
             _h('To help users configure and use Mageia, and to provide some information about the community and the project, we\'ve added the new <a href="%s">MageiaWelcome</a>.It starts automatically when a session opens for the first time in any of the graphical environments.',array('https://wiki.mageia.org/en/Feature:MageiaWelcome'));
 
diff --git a/en/4/nav.php b/en/4/nav.php
index 5ce75c060..8ea54b83e 100644
--- a/en/4/nav.php
+++ b/en/4/nav.php
@@ -1,10 +1,13 @@
 <?php
+$releasenotes = _d('https://wiki.mageia.org/en/Mageia_4_Release_Notes');
+$errata = _d('https://wiki.mageia.org/en/Mageia_4_Errata');
+$upgradeguide = _d('https://wiki.mageia.org/en/Mageia_4_Release_Notes#Upgrading_from_Mageia_3');
 
 $nav = array( 
     "/{$locale}/4/"  => _t('Mageia&nbsp;4'),
     "/{$locale}/downloads/" => _t('Download'),
-    _t('https://wiki.mageia.org/en/Mageia_4_Release_Notes') => _t('Release notes'),
-    _t('https://wiki.mageia.org/en/Mageia_4_Errata') => _t('Errata'),
+    $releasenotes => _t('Release notes'),
+    $errata => _t('Errata'),
 );
 
 $sru = trim($_SERVER['REQUEST_URI']);
-- 
cgit v1.2.1