move php-mo.php for better compatibility with mognase + improved navigation in l10n report & co.

10 files changed, 8 insertions, 6 deletions

diff --git a/_nav/html/index.php b/_nav/html/index.php
index 0bde089bb..8c8ac690c 100644
--- a/_nav/html/index.php
+++ b/_nav/html/index.php
@@ -44,7 +44,6 @@ $wrap = isset($_GET['w']) ? true : false;
 
 require 'conf.php';
 include '../lib.php';
-require_once('../langs/php-mo.php');
 
 header('Access-Control-Allow-Origin: *');
 header('Access-Control-Allow-Methods: GET');
diff --git a/_nav/lib.php b/_nav/lib.php
index 55151034c..0cf33b47a 100644
--- a/_nav/lib.php
+++ b/_nav/lib.php
@@ -18,6 +18,8 @@
 */
 // definition
 
+require_once('php-mo.php');
+
 class NCache
 {
     function __construct() { }
diff --git a/_nav/langs/php-mo.php b/_nav/php-mo.php
index 470ce80e8..470ce80e8 100644
--- a/_nav/langs/php-mo.php
+++ b/_nav/php-mo.php
diff --git a/langs.inc.php b/langs.inc.php
index 2e2fa77d9..6607f7edc 100644
--- a/langs.inc.php
+++ b/langs.inc.php
@@ -52,7 +52,7 @@ $domains_lang = array(
     'mageia.ro' => 'ro',
 );
 
-require_once('_nav/langs/php-mo.php');
+require_once ('_nav/lib.php');
 
 /**
  * Redirect to a localized path, depending on incoming TLD.
diff --git a/langs.php b/langs.php
index ddf3bf1a3..e616782d8 100644
--- a/langs.php
+++ b/langs.php
@@ -77,7 +77,6 @@ $langsForm = <<<H
 </form>
 H;
 
-include ('_nav/lib.php');
 $hsnav = _mgnav_style() . _mgnav_html(true, $locale, $langsForm, $_SERVER['HTTP_HOST']);
 $hsfoot = '';
 
diff --git a/langs/diff.php b/langs/diff.php
index 70ff102c6..251cd87f0 100644
--- a/langs/diff.php
+++ b/langs/diff.php
@@ -3,7 +3,7 @@
  * Report the diff of 's' file
  * against matching file in language 'l', if it exists.
 */
-
+define('HLANG', true);
 include 'lib.php';
 
 $source_file = isset($_GET['s']) ? strip_tags(trim($_GET['s'])) : null;
diff --git a/langs/lib.php b/langs/lib.php
index 054a4743e..b238cdd4c 100644
--- a/langs/lib.php
+++ b/langs/lib.php
@@ -13,7 +13,7 @@ if (isset($_SERVER['APP_MODE']) && $_SERVER['APP_MODE'] !== 'prod') {
     ini_set('log_errors', FALSE);
 }
 
-include '../langs.inc.php';
+include '../langs.php';
 
 /**
  * Diff two .lang files, to get:
diff --git a/langs/missing.php b/langs/missing.php
index 952232704..db267864e 100644
--- a/langs/missing.php
+++ b/langs/missing.php
@@ -1,7 +1,7 @@
 <?php
 /**
 */
-
+define('HLANG', true);
 include 'lib.php';
 
 $s = isset($_GET['s']) ? strip_tags(trim($_GET['s'])) : null;
diff --git a/langs/report.php b/langs/report.php
index b04d6363f..a16d2ee1a 100644
--- a/langs/report.php
+++ b/langs/report.php
@@ -37,6 +37,7 @@
     <?php
     /**
     */
+    define('HLANG', true);
     include 'lib.php';
     $one_language = isset($_GET['l']) ? strip_tags(trim($_GET['l'])) : null;
     $one_resource = isset($_GET['r']) ? strip_tags(trim($_GET['r'])) : null;
diff --git a/langs/report_test.php b/langs/report_test.php
index 66ec7da4c..a24a78f20 100644
--- a/langs/report_test.php
+++ b/langs/report_test.php
@@ -37,6 +37,7 @@
     <?php
     /**
     */
+    define('HLANG', true);
     function time_debug($name) {
         static $start_of_microtime = NULL;
         if($start_of_microtime === NULL) {