aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFilip Komar <filip@mageia.org>2014-05-18 20:16:47 +0000
committerFilip Komar <filip@mageia.org>2014-05-18 20:16:47 +0000
commit86229ab1304d917d60170a4f5e9aaff0682eda2b (patch)
treeb3534aea7c7e477bb09b92b3dd4879f55c9ff398
parentea0e0637b9b4037c3906be8f26c47e615142dd37 (diff)
downloadwww-86229ab1304d917d60170a4f5e9aaff0682eda2b.tar
www-86229ab1304d917d60170a4f5e9aaff0682eda2b.tar.gz
www-86229ab1304d917d60170a4f5e9aaff0682eda2b.tar.bz2
www-86229ab1304d917d60170a4f5e9aaff0682eda2b.tar.xz
www-86229ab1304d917d60170a4f5e9aaff0682eda2b.zip
move php-mo.php for better compatibility with mognase + improved navigation in l10n report & co.
-rw-r--r--_nav/html/index.php1
-rw-r--r--_nav/lib.php2
-rw-r--r--_nav/php-mo.php (renamed from _nav/langs/php-mo.php)0
-rw-r--r--langs.inc.php2
-rw-r--r--langs.php1
-rw-r--r--langs/diff.php2
-rw-r--r--langs/lib.php2
-rw-r--r--langs/missing.php2
-rw-r--r--langs/report.php1
-rw-r--r--langs/report_test.php1
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) {