page documentation and it's archive converted to gettext

author: Filip Komar <filip@mageia.org> 2014-03-19 21:11:55 +0000
committer: Filip Komar <filip@mageia.org> 2014-03-19 21:11:55 +0000
commit: 6848ab831530f925fa79de6dbc7211c0572fc096 (patch)
tree: 8a97db9e3935a90969ea9b7e5d8f8fce962ae5ad /en/doc
parent: b064da86a6f89046aec578ff9df2790b3ff9dec6 (diff)
download: www-6848ab831530f925fa79de6dbc7211c0572fc096.tar
www-6848ab831530f925fa79de6dbc7211c0572fc096.tar.gz
www-6848ab831530f925fa79de6dbc7211c0572fc096.tar.bz2
www-6848ab831530f925fa79de6dbc7211c0572fc096.tar.xz
www-6848ab831530f925fa79de6dbc7211c0572fc096.zip
3 files changed, 35 insertions, 35 deletions
diff --git a/en/doc/archive.php b/en/doc/archive.php
index 76d02cac6..5ea7bfc9a 100644
--- a/en/doc/archive.php
+++ b/en/doc/archive.php
@@ -1,7 +1,7 @@
 <?php
 define('HLANG', true);
 require '../../langs.php';
-_lang_load($locale, 'documentation');
+$dictionary = read_translation_file($locale, 'documentation');
 
 require 'doc.php';
 
@@ -9,27 +9,27 @@ require 'doc.php';
 <html lang="<?php echo $locale; ?>" dir="ltr">
 <head>
     <meta charset="utf-8">
-    <title><?php _e('Mageia Documentation\'s Archive')?></title>
-    <meta name="description" content="<?php _e('Documentation for previous releases of Mageia distribution and its tools.')?>">
-    <meta name="keywords" content="<?php _e('doc,documentation,help,guide,installer,installation,mageia,linux')?>">
+    <title><?php _g('Mageia Documentation\'s Archive')?></title>
+    <meta name="description" content="<?php _g('Documentation for previous releases of Mageia distribution and its tools.')?>">
+    <meta name="keywords" content="<?php _g('doc,documentation,help,guide,installer,installation,mageia,linux')?>">
     <link rel="stylesheet" href="/g/style/all.css" type="text/css">
     <?php include '../../analytics.php'; ?>
 </head>
 <body class="doc">
     <?php echo $hsnav; ?>
-    <h1 id="mgnavt"><?php _e('Mageia Documentation\'s Archive')?></h1>
+    <h1 id="mgnavt"><?php _g('Mageia Documentation\'s Archive')?></h1>
     <div id="doc" class="yui-t7">
         <div id="bd" role="main">
             <div class="yui-g">
                 <div class="para donate" style="padding-top: 2em;">
-                    <h2><?php _e('Some More documentation')?></h2>
-                    <p><?php _e('Here you will find the documentation for the versions of Mageia that have reached their End-Of-Life.')?><br/>
-                    <?php _e('If you are looking for the current versions, see <a href="index.php">here</a>.')?></p>
+                    <h2><?php _g('Some More documentation')?></h2>
+                    <p><?php _g('Here you will find the documentation for the versions of Mageia that have reached their End-Of-Life.')?><br/>
+                    <?php _g('If you are looking for the current versions, see <a href="index.php">here</a>.')?></p>
                     <hr>
                     <h3>Mageia 2</h3>
                     <div style="float: left; margin: 2em;">
                         <p><?php
-                            doc_list(_t('Installer'), 'installer', 2, '<a href="//doc.mageia.org/installer/2/%s/content/index.html">HTML</a>');
+                            doc_list(_r('Installer'), 'installer', 2, '<a href="//doc.mageia.org/installer/2/%s/content/index.html">HTML</a>');
                             ?></p>
                     </div>
                 </div>
@@ -38,8 +38,8 @@ require 'doc.php';
     </div>
     <div style="margin-left: 2em;">
         <hr>
-        <p><a href="//www.mageia.org/<?php echo $locale; ?>/map/"><?php _e('Mageia sitemap')?></a>
-            | <a href="//www.mageia.org/<?php echo $locale; ?>/support/"><?php _e('Support')?></a></p>
+        <p><a href="//www.mageia.org/<?php echo $locale; ?>/map/"><?php _g('Mageia sitemap')?></a>
+            | <a href="//www.mageia.org/<?php echo $locale; ?>/support/"><?php _g('Support')?></a></p>
     </div>
 </body>
 </html>
diff --git a/en/doc/doc.php b/en/doc/doc.php
index 98e44ce54..d0cb4f150 100644
--- a/en/doc/doc.php
+++ b/en/doc/doc.php
@@ -50,11 +50,11 @@ function doc_list($documentation_name, $type, $version, $link, $epub_link = null
         if ($link_locale == $lng) {
             $your_language_present = TRUE;
             if (is_null($epub_link) or is_null($pdf_link) or $hide_epub_pdf) {
-                $your_language = sprintf(_t('%s available in %s') . '<br/>%s',
+                $your_language = sprintf(_r('%s available in %s') . '<br/>%s',
                                         '<span style="font-weight:bold">' . $documentation_name . '</span>', $lng_name, sprintf($link, $lng));
             } else {
-                $your_language = sprintf(_t('%s available in %s') . '<br/>%s <span style="font-size: 07pt;">('.
-                                        _t('also as') . '%s , %s)</span>',
+                $your_language = sprintf(_r('%s available in %s') . '<br/>%s <span style="font-size: 07pt;">('.
+                                        _r('also as') . '%s , %s)</span>',
                                         '<span style="font-weight:bold">' . $documentation_name . '</span>',
                                         $lng_name, sprintf($link, $lng), sprintf($epub_link, $lng), sprintf($pdf_link, $lng));
             }
@@ -64,7 +64,7 @@ function doc_list($documentation_name, $type, $version, $link, $epub_link = null
                 $others[] = sprintf('%s<br/>%s', $lng_name, sprintf($link, $lng));
             } else {
                 if(!$note_printed) {
-                    $note = _t('also as');
+                    $note = _r('also as');
                     $note_printed = TRUE;
                 } else {
                     $note = '';
@@ -75,9 +75,9 @@ function doc_list($documentation_name, $type, $version, $link, $epub_link = null
         }
     }
     if ($your_language_present) {
-        $text_your_language = '<span style="font-weight:bold">' . _t('Documentation in your language:') . '</span><br/>';
+        $text_your_language = '<span style="font-weight:bold">' . _r('Documentation in your language:') . '</span><br/>';
         if ($other_languages_present) {
-            $text_others = '<span style="font-weight:bold">' . _t('Other languages:') . '</span>';
+            $text_others = '<span style="font-weight:bold">' . _r('Other languages:') . '</span>';
         }
         $table .= sprintf("\t\t<tr><td>%s</td></tr>" . PHP_EOL .
                         "\t\t<tr><td>&nbsp;</td></tr>" . PHP_EOL .
@@ -87,14 +87,14 @@ function doc_list($documentation_name, $type, $version, $link, $epub_link = null
         foreach($documentation[$type] as $single_version => $all_languages) {
             if($single_version < $version && in_array($link_locale, $all_languages)) {
                 $language_present_before = "\t\t<tr><td>" .
-                    sprintf(_t('Translation was present in %s before.<br/>Maybe you can check documentation for %s in Mageia %s.'),
+                    sprintf(_r('Translation was present in %s before.<br/>Maybe you can check documentation for %s in Mageia %s.'),
                             $langs[$locale], $documentation_name, $single_version) . "</td></tr>" . PHP_EOL;
                 break;
             } else {
                 $language_present_before = '';
             }
         }
-        $text_your_language = _t('Please help <a href="../community/">us</a> translate it in your language.') . '<br/>';
+        $text_your_language = _r('Please help <a href="../community/">us</a> translate it in your language.') . '<br/>';
         $table .= sprintf("\t\t<tr><td>%s</td></tr>" . PHP_EOL .
                         "\t\t<tr><td>%s</td></tr>" . PHP_EOL . '%s' .
                         "\t\t<tr><td>&nbsp;</td></tr>" . PHP_EOL,
diff --git a/en/doc/index.php b/en/doc/index.php
index 749167992..c8bc5cc98 100644
--- a/en/doc/index.php
+++ b/en/doc/index.php
@@ -1,7 +1,7 @@
 <?php
 define('HLANG', true);
 require '../../langs.php';
-_lang_load($locale, 'documentation');
+$dictionary = read_translation_file($locale, 'documentation');
 
 
 require 'doc.php';
@@ -11,36 +11,36 @@ require 'doc.php';
 <html lang="<?php echo $locale; ?>" dir="ltr">
 <head>
     <meta charset="utf-8">
-    <title><?php _e('Mageia Documentation')?></title>
-    <meta name="description" content="<?php _e('Documentation for Mageia distribution and its tools.')?>">
-    <meta name="keywords" content="<?php _e('doc,documentation,help,guide,installer,installation,mageia,linux')?>">
+    <title><?php _g('Mageia Documentation')?></title>
+    <meta name="description" content="<?php _g('Documentation for Mageia distribution and its tools.')?>">
+    <meta name="keywords" content="<?php _g('doc,documentation,help,guide,installer,installation,mageia,linux')?>">
     <link rel="stylesheet" href="/g/style/all.css" type="text/css">
     <?php include '../../analytics.php'; ?>
 </head>
 <body class="doc">
     <?php echo $hsnav; ?>
-    <h1 id="mgnavt"><?php _e('Mageia Documentation')?></h1>
+    <h1 id="mgnavt"><?php _g('Mageia Documentation')?></h1>
     <div id="doc" class="yui-t7">
         <div id="bd" role="main">
             <div class="yui-g">
                 <div class="para donate" style="padding-top: 2em;">
-                    <h2><?php _e('Find your documentation')?></h2>
-                    <p><?php _e('Select the manual, the release of Mageia and the language you want to see.')?><br/>
-                    <?php _e('Documentation of old versions are available in the <a href="archive.php">archive page</a>.')?></p>
-                    <p><?php _e('Those manuals are the result of common work of <a href="https://wiki.mageia.org/en/Documentation_team">documentation</a> and <a href="https://wiki.mageia.org/en/Internationalisation_Team_(i18n)">translation</a> teams.')?><br/>
-                    <?php _e('Feel free to help us improving it!')?></p>
+                    <h2><?php _g('Find your documentation')?></h2>
+                    <p><?php _g('Select the manual, the release of Mageia and the language you want to see.')?><br/>
+                    <?php _g('Documentation of old versions are available in the <a href="archive.php">archive page</a>.')?></p>
+                    <p><?php _g('Those manuals are the result of common work of <a href="https://wiki.mageia.org/en/Documentation_team">documentation</a> and <a href="https://wiki.mageia.org/en/Internationalisation_Team_(i18n)">translation</a> teams.')?><br/>
+                    <?php _g('Feel free to help us improving it!')?></p>
                     <hr>
                     <h3>Mageia 4</h3>
                     <div style="float: left; margin: 1em; width: 24em;">
                         <p style="margin-left: 2em;"><?php
-                            doc_list(_t('Installer'), 'installer', 4, '<a href="//doc.mageia.org/installer/4/%s/content/index.html">HTML</a>',
+                            doc_list(_r('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: 1em; width: 24em;">
                         <p style="margin-left: 2em;"><?php
-                            doc_list(_t('Control Center'), 'control_center', 4, '<a href="//doc.mageia.org/mcc/4/%s/content/index.html">HTML</a>',
+                            doc_list(_r('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>
@@ -49,12 +49,12 @@ require 'doc.php';
                     <h3>Mageia 3</h3>
                     <div style="float: left; margin: 1em; width: 24em;">
                         <p style="margin-left: 2em;"><?php
-                            doc_list(_t('Installer'), 'installer', 3, '<a href="//doc.mageia.org/installer/3/%s/content/index.html">HTML</a>');
+                            doc_list(_r('Installer'), 'installer', 3, '<a href="//doc.mageia.org/installer/3/%s/content/index.html">HTML</a>');
                             ?></p>
                     </div>
                     <div style="float: right; margin: 1em; width: 24em;">
                         <p style="margin-left: 2em;"><?php
-                            doc_list(_t('Control Center'), 'control_center', 3, '<a href="//doc.mageia.org/mcc/3/%s/content/index.html">HTML</a>');
+                            doc_list(_r('Control Center'), 'control_center', 3, '<a href="//doc.mageia.org/mcc/3/%s/content/index.html">HTML</a>');
                             ?></p>
                     </div>
                 </div>
@@ -63,8 +63,8 @@ require 'doc.php';
     </div>
     <div style="margin-left: 2em;">
         <hr>
-        <p><a href="//www.mageia.org/<?php echo $locale; ?>/map/"><?php _e('Mageia sitemap')?></a>
-            | <a href="//www.mageia.org/<?php echo $locale; ?>/support/"><?php _e('Support')?></a></p>
+        <p><a href="//www.mageia.org/<?php echo $locale; ?>/map/"><?php _g('Mageia sitemap')?></a>
+            | <a href="//www.mageia.org/<?php echo $locale; ?>/support/"><?php _g('Support')?></a></p>
     </div>
 </body>
 </html>
author	Filip Komar <filip@mageia.org>	2014-03-19 21:11:55 +0000
committer	Filip Komar <filip@mageia.org>	2014-03-19 21:11:55 +0000
commit	6848ab831530f925fa79de6dbc7211c0572fc096 (patch)
tree	8a97db9e3935a90969ea9b7e5d8f8fce962ae5ad /en/doc
parent	b064da86a6f89046aec578ff9df2790b3ff9dec6 (diff)
download	www-6848ab831530f925fa79de6dbc7211c0572fc096.tar www-6848ab831530f925fa79de6dbc7211c0572fc096.tar.gz www-6848ab831530f925fa79de6dbc7211c0572fc096.tar.bz2 www-6848ab831530f925fa79de6dbc7211c0572fc096.tar.xz www-6848ab831530f925fa79de6dbc7211c0572fc096.zip