page community converted to gettext + bug fix (sorry for nonatomic commit)

author: Filip Komar <filip@mageia.org> 2014-03-13 21:28:06 +0000
committer: Filip Komar <filip@mageia.org> 2014-03-13 21:28:06 +0000
commit: 981aa2995e5c7f2d271a4a680568ff22a396fd2d (patch)
tree: 9fe5196548ed178949b8c1f193b86bf5c5a047be /en
parent: 709b49c6c3d017c47765a5304b4aa59d49a50698 (diff)
download: www-981aa2995e5c7f2d271a4a680568ff22a396fd2d.tar
www-981aa2995e5c7f2d271a4a680568ff22a396fd2d.tar.gz
www-981aa2995e5c7f2d271a4a680568ff22a396fd2d.tar.bz2
www-981aa2995e5c7f2d271a4a680568ff22a396fd2d.tar.xz
www-981aa2995e5c7f2d271a4a680568ff22a396fd2d.zip
1 files changed, 60 insertions, 60 deletions
diff --git a/en/community/index.php b/en/community/index.php
index dc4d88937..d0aa3a6bf 100644
--- a/en/community/index.php
+++ b/en/community/index.php
@@ -2,7 +2,7 @@
 
 define('HLANG', true);
 require '../../langs.php';
-_lang_load($locale, 'community');
+$dictionary = read_translation_file($locale, 'community');
 include '../../lib/news.php';
 
 ?>
@@ -10,9 +10,9 @@ include '../../lib/news.php';
 <html lang="<?php echo $locale; ?>">
 <head>
     <meta charset="utf-8">
-    <title><?php _e('Mageia Community')?></title>
-    <meta name="description" content="<?php _e('Mageia Community Central is the place where all contributors and users can find the latest news about Mageia and learn more about what to do in the project.')?>">
-    <meta name="keywords" content="<?php _e('mageia, community, news, tools, tasks')?>">
+    <title><?php _g('Mageia Community')?></title>
+    <meta name="description" content="<?php _g('Mageia Community Central is the place where all contributors and users can find the latest news about Mageia and learn more about what to do in the project.')?>">
+    <meta name="keywords" content="<?php _g('mageia, community, news, tools, tasks')?>">
     <meta name="author" content="Mageia">
     <link rel="stylesheet" type="text/css" href="/g/style/all.css">
     <link rel="icon" type="image/png" href="/g/favicon.png" />    <style>
@@ -28,27 +28,27 @@ include '../../lib/news.php';
 <body class="community">
     <?php echo $hsnav; ?>
     <header id="mgnavt">
-        <h1><?php _e('Mageia Community Central')?></h1>
+        <h1><?php _g('Mageia Community Central')?></h1>
         <ul>
-            <li><a href="<?php _e('https://blog.mageia.org/en/')?>"><?php _e('Blog');?></a></li>
-            <li><a href="<?php _e('https://planet.mageia.org/en/')?>"><?php _e('Planet');?></a></li>
-            <li><a href="../calendar/"><?php _e('Calendar');?></a></li>
+            <li><a href="<?php _g('https://blog.mageia.org/en/')?>"><?php _g('Blog');?></a></li>
+            <li><a href="<?php _g('https://planet.mageia.org/en/')?>"><?php _g('Planet');?></a></li>
+            <li><a href="../calendar/"><?php _g('Calendar');?></a></li>
             <li><a href="https://wiki.mageia.org/en/IRC">IRC</a></li>
-            <li><a href="<?php _e('https://forum.mageia.org/en/')?>"><?php _e('Forums');?></a></li>
-            <li><a href="//ml.mageia.org/"><?php _e('Mailing-lists');?></a></li>
-            <li><a href="<?php _e('https://wiki.mageia.org/')?>">Wiki</a></li>
+            <li><a href="<?php _g('https://forum.mageia.org/en/')?>"><?php _g('Forums');?></a></li>
+            <li><a href="//ml.mageia.org/"><?php _g('Mailing-lists');?></a></li>
+            <li><a href="<?php _g('https://wiki.mageia.org/')?>">Wiki</a></li>
             <li><a href="https://bugs.mageia.org/">Bugzilla</a></li>
-            <li><a href="//people.mageia.org/"><?php _e('People');?></a></li>
+            <li><a href="//people.mageia.org/"><?php _g('People');?></a></li>
         </ul>
     </header>
     <div class="para" style="width: 400px;">
         <section>
-            <h2><a href="<?php _e('https://blog.mageia.org/en/')?>"><?php _e('News');?></a></h2>
+            <h2><a href="<?php _g('https://blog.mageia.org/en/')?>"><?php _g('News');?></a></h2>
             <?php
-            if (_d('https://planet.mageia.org/en/') != 'https://planet.mageia.org/en/') {
-                show_feed($locale, null, _d('https://planet.mageia.org/en/'), _d('https://planet.mageia.org/en/') . '?type=rss10', 9, null, true);
+            if (_r('https://planet.mageia.org/en/') != 'https://planet.mageia.org/en/') {
+                show_feed($locale, null, _r('https://planet.mageia.org/en/'), _r('https://planet.mageia.org/en/') . '?type=rss10', 9, null, true);
             } else {
-                show_feed($locale, null, _d('https://blog.mageia.org/en/'), _d('https://blog.mageia.org/en/') . '?feed=rss', 9, null, true);
+                show_feed($locale, null, _r('https://blog.mageia.org/en/'), _r('https://blog.mageia.org/en/') . '?feed=rss', 9, null, true);
             }
             // don't work:
             //show_feed('Mageia MLs', '', 'https://ml.mageia.org/l/rss/active_lists?count=20&for=10');
@@ -56,59 +56,59 @@ include '../../lib/news.php';
             ?>
             <hr>
             <p><?php
-                echo sprintf('<a href="%s">%s</a>', _t('https://planet.mageia.org/en/', null, ''), _t('Planet', null, '')) . ' | ';
-                echo sprintf('<a href="%s">%s</a>', _t('https://blog.mageia.org/en/', null, ''), _t('Blog', null, '')) . ' | ';
-                echo sprintf('<a href="%s">%s</a>', _t('https://forum.mageia.org/en/', null, ''), _t('Forums', null, ''));
+                echo sprintf('<a href="%s">%s</a>', _r('https://planet.mageia.org/en/'), _r('Planet')) . ' | ';
+                echo sprintf('<a href="%s">%s</a>', _r('https://blog.mageia.org/en/'), _r('Blog')) . ' | ';
+                echo sprintf('<a href="%s">%s</a>', _r('https://forum.mageia.org/en/'), _r('Forums'));
             ?></p>
         </section>
     </div>
     <div class="para" style="width: 300px">
-        <h2><a href="../contribute/"><?php _e('How to contribute?')?></a></h2>
+        <h2><a href="../contribute/"><?php _g('How to contribute?')?></a></h2>
         <ul class="hl">
-            <li><a href="../contribute/"><?php echo _d('Start here')?></a>,</li>
-            <li><?php _e('and meet us on <a href="https://wiki.mageia.org/en/IRC">IRC</a>.')?></li>
-            <li><?php _e('You can also <a href="../donate/">support financially</a> the project!')?></li>
+            <li><a href="../contribute/"><?php echo _r('Start here')?></a>,</li>
+            <li><?php _g('and meet us on <a href="https://wiki.mageia.org/en/IRC">IRC</a>.')?></li>
+            <li><?php _g('You can also <a href="../donate/">support financially</a> the project!')?></li>
         </ul>
         <hr>
-        <h2><?php _e('Toolbox')?></h2>
+        <h2><?php _g('Toolbox')?></h2>
         <ul class="hl">
-            <li><a href="<?php _e('https://wiki.mageia.org/')?>"><?php _e('Wiki</a> &larr; collaborative documentation')?></li>
-            <li><a href="https://bugs.mageia.org/"><?php _e('Bugzilla</a> &larr; to report bugs')?></li>
-            <li><a href="<?php _e('https://forum.mageia.org/en/')?>"><?php _e('Forums')?></a></li>
-            <li><a href="../calendar/"><?php _e('Calendar')?></a></li>
-            <li><a href="http://mageia.madb.org"><?php _e('Mageia Applications Database')?></a></li>
+            <li><a href="<?php _g('https://wiki.mageia.org/')?>"><?php _g('Wiki</a> &larr; collaborative documentation')?></li>
+            <li><a href="https://bugs.mageia.org/"><?php _g('Bugzilla</a> &larr; to report bugs')?></li>
+            <li><a href="<?php _g('https://forum.mageia.org/en/')?>"><?php _g('Forums')?></a></li>
+            <li><a href="../calendar/"><?php _g('Calendar')?></a></li>
+            <li><a href="http://mageia.madb.org"><?php _g('Mageia Applications Database')?></a></li>
         </ul>
         <hr>
-        <h2><?php _e('For developers &amp; packagers')?></h2>
+        <h2><?php _g('For developers &amp; packagers')?></h2>
         <ul class="hl">
-            <li><a href="//svn.mageia.org/"><?php echo _d('Subversion')?></a>,
-                <a href="//gitweb.mageia.org/"><?php _e('Git</a> code repositories')?></li>
-            <li><a href="//pkgsubmit.mageia.org/"><?php echo _d('Packages submission queue')?></a>,
-                <a href="//pkgsubmit.mageia.org/data/unmaintained.txt"><?php _e('unmaintained packages')?></a></li>
-            <li><a href="//check.mageia.org/"><?php _e('Global QA report')?></a></li>
+            <li><a href="//svn.mageia.org/"><?php echo _r('Subversion')?></a>,
+                <a href="//gitweb.mageia.org/"><?php _g('Git</a> code repositories')?></li>
+            <li><a href="//pkgsubmit.mageia.org/"><?php echo _r('Packages submission queue')?></a>,
+                <a href="//pkgsubmit.mageia.org/data/unmaintained.txt"><?php _g('unmaintained packages')?></a></li>
+            <li><a href="//check.mageia.org/"><?php _g('Global QA report')?></a></li>
         </ul>
     </div>
     <div class="para">
-        <h2><?php _e('Conversations')?></h2>
-        <p><?php _e('... or, how to get in touch with us? Easy:')?></p>
+        <h2><?php _g('Conversations')?></h2>
+        <p><?php _g('... or, how to get in touch with us? Easy:')?></p>
         <ul class="hl">
-            <li><a href="https://wiki.mageia.org/en/IRC" title="Internet Relay Chat"><?php echo _d('IRC</a> on Freenode')?>,</li>
-            <li><a href="https://wiki.mageia.org/en/Mailing_lists"><?php echo _d('Mailing-lists')?></a>,</li>
-            <li><a href="<?php _e('https://forum.mageia.org/en/')?>"><?php echo _d('Forums')?></a>,</li>
-            <li><a href="<?php _e('https://blog.mageia.org/en/')?>"><?php echo _d('Blog')?></a>,</li>
-            <li><?php _e('in real life!')?></li>
-            <li><a href="https://wiki.mageia.org/en/Events"><?php _e('during events!')?></a></li>
+            <li><a href="https://wiki.mageia.org/en/IRC" title="Internet Relay Chat"><?php echo _r('IRC</a> on Freenode')?>,</li>
+            <li><a href="https://wiki.mageia.org/en/Mailing_lists"><?php echo _r('Mailing-lists')?></a>,</li>
+            <li><a href="<?php _g('https://forum.mageia.org/en/')?>"><?php echo _r('Forums')?></a>,</li>
+            <li><a href="<?php _g('https://blog.mageia.org/en/')?>"><?php echo _r('Blog')?></a>,</li>
+            <li><?php _g('in real life!')?></li>
+            <li><a href="https://wiki.mageia.org/en/Events"><?php _g('during events!')?></a></li>
         </ul>
         <hr>
-        <h2><?php _e('Teams you can join!')?></h2>
+        <h2><?php _g('Teams you can join!')?></h2>
         <ul class="hl">
-            <li><a href="https://wiki.mageia.org/en/Atelier_team" hreflang="en"><?php _e('Atelier')?></a></li>
-            <li><a href="https://wiki.mageia.org/en/Documentation_team" hreflang="en"><?php _e('Documentation')?></a></li>
-            <li><a href="https://wiki.mageia.org/en/Packagers_Team" hreflang="en"><?php _e('Packaging')?></a></li>
-            <li><a href="https://wiki.mageia.org/en/QA_Team" hreflang="en"><?php _e('Testing &amp; <abbr title="Quality Assurance">QA</abbr>')?></a></li>
-            <li><a href="https://wiki.mageia.org/en/Internationalisation_Team_(i18n)" hreflang="en"><?php _e('Translation')?></a></li>
-            <li><a href="https://wiki.mageia.org/en/Sysadmin_Team" hreflang="en"><?php _e('Systems &amp; infrastructure administration')?></a></li>
-            <li><a href="https://wiki.mageia.org/en/Bugsquad" hreflang="en"><?php _e('Bugs triaging')?></a></li>
+            <li><a href="https://wiki.mageia.org/en/Atelier_team" hreflang="en"><?php _g('Atelier')?></a></li>
+            <li><a href="https://wiki.mageia.org/en/Documentation_team" hreflang="en"><?php _g('Documentation')?></a></li>
+            <li><a href="https://wiki.mageia.org/en/Packagers_Team" hreflang="en"><?php _g('Packaging')?></a></li>
+            <li><a href="https://wiki.mageia.org/en/QA_Team" hreflang="en"><?php _g('Testing &amp; <abbr title="Quality Assurance">QA</abbr>')?></a></li>
+            <li><a href="https://wiki.mageia.org/en/Internationalisation_Team_(i18n)" hreflang="en"><?php _g('Translation')?></a></li>
+            <li><a href="https://wiki.mageia.org/en/Sysadmin_Team" hreflang="en"><?php _g('Systems &amp; infrastructure administration')?></a></li>
+            <li><a href="https://wiki.mageia.org/en/Bugsquad" hreflang="en"><?php _g('Bugs triaging')?></a></li>
         </ul>
         
         <hr>
@@ -120,20 +120,20 @@ include '../../lib/news.php';
         -->
     </div>
     <div class="para">
-        <h2><?php _e('Mageia')?></h2>
+        <h2><?php _g('Mageia')?></h2>
         <ul class="hl">
-            <li><a href="../about/"><?php _e('More about Mageia')?></a></li>
-            <li><?php _e('Our <a href="../about/code-of-conduct/">code of conduct</a> and <a href="../about/values/">values</a>')?></li>
-            <li><a href="https://wiki.mageia.org/en/Org"><?php _e('Our governance model</a> and structure:')?>
+            <li><a href="../about/"><?php _g('More about Mageia')?></a></li>
+            <li><?php _g('Our <a href="../about/code-of-conduct/">code of conduct</a> and <a href="../about/values/">values</a>')?></li>
+            <li><a href="https://wiki.mageia.org/en/Org"><?php _g('Our governance model</a> and structure:')?>
                 <ul>
-                    <li><a href="https://wiki.mageia.org/en/Special:Search?search=teams"><?php _e('Teams')?></a></li>
-                    <li><a href="https://wiki.mageia.org/en/Org_Council"><?php _e('the Council')?></a></li>
-                    <li><a href="https://wiki.mageia.org/en/Org_Board"><?php _e('the Board')?></a></li>
+                    <li><a href="https://wiki.mageia.org/en/Special:Search?search=teams"><?php _g('Teams')?></a></li>
+                    <li><a href="https://wiki.mageia.org/en/Org_Council"><?php _g('the Council')?></a></li>
+                    <li><a href="https://wiki.mageia.org/en/Org_Board"><?php _g('the Board')?></a></li>
                 </ul></li>
-            <li><?php _e('<a href="../donate/">Donations</a> &amp; <a href="../about/reports/">reports</a>.')?></li>
+            <li><?php _g('<a href="../donate/">Donations</a> &amp; <a href="../about/reports/">reports</a>.')?></li>
         </ul>
     </div>
     
-    <p style="clear: both; text-align: right;"><mark><?php _e('This page needs you! <a href="https://wiki.mageia.org/en/Web_team">Join the Web team</a>!')?></mark></p>
+    <p style="clear: both; text-align: right;"><mark><?php _g('This page needs you! <a href="https://wiki.mageia.org/en/Web_team">Join the Web team</a>!')?></mark></p>
 </body>
 </html>
author	Filip Komar <filip@mageia.org>	2014-03-13 21:28:06 +0000
committer	Filip Komar <filip@mageia.org>	2014-03-13 21:28:06 +0000
commit	981aa2995e5c7f2d271a4a680568ff22a396fd2d (patch)
tree	9fe5196548ed178949b8c1f193b86bf5c5a047be /en
parent	709b49c6c3d017c47765a5304b4aa59d49a50698 (diff)
download	www-981aa2995e5c7f2d271a4a680568ff22a396fd2d.tar www-981aa2995e5c7f2d271a4a680568ff22a396fd2d.tar.gz www-981aa2995e5c7f2d271a4a680568ff22a396fd2d.tar.bz2 www-981aa2995e5c7f2d271a4a680568ff22a396fd2d.tar.xz www-981aa2995e5c7f2d271a4a680568ff22a396fd2d.zip