From a53b05d270c942066b5662e07cf2c05f307d66d3 Mon Sep 17 00:00:00 2001
From: Boris Paing <boris.paing@laposte.net>
Date: Fri, 27 Mar 2020 18:45:44 +0100
Subject: [PATCH] FIX: amend locales handling
---
head.php | 2 --
index.php | 18 ++++++++----------
2 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/head.php b/head.php
index cb6635a..b2ee382 100644
--- a/head.php
+++ b/head.php
@@ -53,8 +53,6 @@ $bodyIds = !isset($bodyIds) ? '' : $bodyIds;
</head>
<body id="<?php echo $bodyIds; ?>">
<?php
- textdomain("menu");
-
$menu =
array(
[
diff --git a/index.php b/index.php
index ff3a924..ee2d674 100644
--- a/index.php
+++ b/index.php
@@ -6,8 +6,6 @@ defineLang();
putenv('LC_ALL='. LANG_FOLDER);
setlocale(LC_ALL, LOCALE_CODE);
-textdomain("menu");
-
if (!isset($_GET['page'])) {
$page = NULL;
@@ -25,37 +23,37 @@ $router =
array(
[
'permalink' => '/',
- 'i18nedPermalink' => _('/'),
+ 'i18nedPermalink' => dgettext('menu', '/'),
'tpl' => 'home.php'
],
[
'permalink' => '/fonctionnalites',
- 'i18nedPermalink' => _('/fonctionnalites'),
+ 'i18nedPermalink' => dgettext('menu', '/fonctionnalites'),
'tpl' => 'features.php'
],
[
'permalink' => '/telechargement',
- 'i18nedPermalink' => _('/telechargement'),
+ 'i18nedPermalink' => dgettext('menu', '/telechargement'),
'tpl' => 'download.php'
],
[
'permalink' => '/merci',
- 'i18nedPermalink' => _('/merci'),
+ 'i18nedPermalink' => dgettext('menu', '/merci'),
'tpl' => 'funding.php'
],
[
'permalink' => '/tutoriel-cesium',
- 'i18nedPermalink' => _('/tutoriel-cesium'),
+ 'i18nedPermalink' => dgettext('menu', '/tutoriel-cesium'),
'tpl' => 'tuto.php'
],
[
'permalink' => '/developpeurs',
- 'i18nedPermalink' => _('/developpeurs'),
+ 'i18nedPermalink' => dgettext('menu', '/developpeurs'),
'tpl' => 'jobs.php'
],
[
'permalink' => '/mentions-legales',
- 'i18nedPermalink' => _('/mentions-legales'),
+ 'i18nedPermalink' => dgettext('menu', '/mentions-legales'),
'tpl' => 'legal-notice.php'
]
);
@@ -69,7 +67,7 @@ foreach ($router as $route)
{
$found = true;
$pagePermalink = $route['permalink'];
- $pageIsHome = ($route['i18nedPermalink'] == _('/')) ? true : false;
+ $pageIsHome = ($route['i18nedPermalink'] == dgettext('menu', '/')) ? true : false;
include('tpl/' . $route['tpl']);
--
GitLab