From 46f491a92a5d26dbfa36478cbfe6f7310361584b Mon Sep 17 00:00:00 2001
From: Fil <fil@rezo.net>
Date: Tue, 24 Jun 2003 20:19:31 +0000
Subject: [PATCH] =?UTF-8?q?spip=20est=20un=20'module=20de=20langue'=20comm?=
=?UTF-8?q?e=20un=20autre=20(sinon=20c'est=20des=20casse-t=C3=AAte=20?=
=?UTF-8?q?=C3=A0=20moyen=20terme)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/inc_lang.php3 | 10 +++++-----
ecrire/lang/spip_ar.php3 | 2 +-
ecrire/lang/spip_cpf.php3 | 2 +-
ecrire/lang/spip_da.php3 | 2 +-
ecrire/lang/spip_de.php3 | 2 +-
ecrire/lang/spip_en.php3 | 2 +-
ecrire/lang/spip_eo.php3 | 2 +-
ecrire/lang/spip_es.php3 | 2 +-
ecrire/lang/spip_fr.php3 | 2 +-
ecrire/lang/spip_gl.php3 | 2 +-
ecrire/lang/spip_it.php3 | 2 +-
ecrire/lang/spip_vi.php3 | 2 +-
12 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ecrire/inc_lang.php3 b/ecrire/inc_lang.php3
index 5ae9a8e0d4..0fc4dda56a 100644
--- a/ecrire/inc_lang.php3
+++ b/ecrire/inc_lang.php3
@@ -20,7 +20,7 @@ function charger_langue($lang, $module='spip') {
// le francais, qui *par definition* doit exister, et on copie le
// tableau 'fr' dans la var liee a la langue
include_ecrire ("lang/${module}_fr.php3");
- $GLOBALS["i18n__".$module.'_'.$lang] = $GLOBALS["i18n__".$module.'_'.'fr'];
+ $GLOBALS["i18n_".$module.'_'.$lang] = $GLOBALS["i18n_".$module.'_'.'fr'];
}
// surcharge perso
@@ -85,12 +85,12 @@ function traduire_chaine($code, $args) {
if (ereg("^([a-z]+):(.*)$", $code, $regs)) {
$module = $regs[1];
$code = $regs[2];
- $var = "i18n__".$module."_".$spip_lang;
- } else {
+ } else
$module = 'spip';
- $var = "i18n_".$spip_lang;
- }
+
+ $var = "i18n_".$module."_".$spip_lang;
if (!$GLOBALS[$var]) charger_langue($spip_lang, $module);
+
$text = $GLOBALS[$var][$code];
if (!is_array($args)) return $text;
diff --git a/ecrire/lang/spip_ar.php3 b/ecrire/lang/spip_ar.php3
index 34228ad801..2f6415e47f 100644
--- a/ecrire/lang/spip_ar.php3
+++ b/ecrire/lang/spip_ar.php3
@@ -2,7 +2,7 @@
// This is a SPIP language file -- Ceci est un fichier langue de SPIP
-$GLOBALS['i18n_ar'] = array(
+$GLOBALS['i18n_spip_ar'] = array(
// 0
diff --git a/ecrire/lang/spip_cpf.php3 b/ecrire/lang/spip_cpf.php3
index 25b1f57bf6..6805dcc1ba 100644
--- a/ecrire/lang/spip_cpf.php3
+++ b/ecrire/lang/spip_cpf.php3
@@ -2,7 +2,7 @@
// This is a SPIP language file -- Ceci est un fichier langue de SPIP
-$GLOBALS['i18n_cpf'] = array(
+$GLOBALS['i18n_spip_cpf'] = array(
// 0
diff --git a/ecrire/lang/spip_da.php3 b/ecrire/lang/spip_da.php3
index 56d09d3786..5f7c49a259 100644
--- a/ecrire/lang/spip_da.php3
+++ b/ecrire/lang/spip_da.php3
@@ -2,7 +2,7 @@
// This is a SPIP language file -- Ceci est un fichier langue de SPIP
-$GLOBALS['i18n_da'] = array(
+$GLOBALS['i18n_spip_da'] = array(
// 0
diff --git a/ecrire/lang/spip_de.php3 b/ecrire/lang/spip_de.php3
index 38fa0910b4..3a36c8a948 100644
--- a/ecrire/lang/spip_de.php3
+++ b/ecrire/lang/spip_de.php3
@@ -2,7 +2,7 @@
// This is a SPIP language file -- Ceci est un fichier langue de SPIP
-$GLOBALS['i18n_de'] = array(
+$GLOBALS['i18n_spip_de'] = array(
// 0
diff --git a/ecrire/lang/spip_en.php3 b/ecrire/lang/spip_en.php3
index f52167228c..9ed5040ae4 100644
--- a/ecrire/lang/spip_en.php3
+++ b/ecrire/lang/spip_en.php3
@@ -2,7 +2,7 @@
// This is a SPIP language file -- Ceci est un fichier langue de SPIP
-$GLOBALS['i18n_en'] = array(
+$GLOBALS['i18n_spip_en'] = array(
// 0
diff --git a/ecrire/lang/spip_eo.php3 b/ecrire/lang/spip_eo.php3
index 3a7670bc46..433d0f99fc 100644
--- a/ecrire/lang/spip_eo.php3
+++ b/ecrire/lang/spip_eo.php3
@@ -2,7 +2,7 @@
// This is a SPIP language file -- Ceci est un fichier langue de SPIP
-$GLOBALS['i18n_eo'] = array(
+$GLOBALS['i18n_spip_eo'] = array(
// 0
diff --git a/ecrire/lang/spip_es.php3 b/ecrire/lang/spip_es.php3
index 9f705bcacc..f78e5ea850 100644
--- a/ecrire/lang/spip_es.php3
+++ b/ecrire/lang/spip_es.php3
@@ -2,7 +2,7 @@
// This is a SPIP language file -- Ceci est un fichier langue de SPIP
-$GLOBALS['i18n_es'] = array(
+$GLOBALS['i18n_spip_es'] = array(
// 0
diff --git a/ecrire/lang/spip_fr.php3 b/ecrire/lang/spip_fr.php3
index 735173c537..147ad544c6 100644
--- a/ecrire/lang/spip_fr.php3
+++ b/ecrire/lang/spip_fr.php3
@@ -2,7 +2,7 @@
// This is a SPIP language file -- Ceci est un fichier langue de SPIP
-$GLOBALS['i18n_fr'] = array(
+$GLOBALS['i18n_spip_fr'] = array(
// 0
diff --git a/ecrire/lang/spip_gl.php3 b/ecrire/lang/spip_gl.php3
index f1a996a7e7..cefccd6bf9 100644
--- a/ecrire/lang/spip_gl.php3
+++ b/ecrire/lang/spip_gl.php3
@@ -2,7 +2,7 @@
// This is a SPIP language file -- Ceci est un fichier langue de SPIP
-$GLOBALS['i18n_gl'] = array(
+$GLOBALS['i18n_spip_gl'] = array(
// 0
diff --git a/ecrire/lang/spip_it.php3 b/ecrire/lang/spip_it.php3
index e702c6a246..e1c9f0797f 100644
--- a/ecrire/lang/spip_it.php3
+++ b/ecrire/lang/spip_it.php3
@@ -2,7 +2,7 @@
// This is a SPIP language file -- Ceci est un fichier langue de SPIP
-$GLOBALS['i18n_it'] = array(
+$GLOBALS['i18n_spip_it'] = array(
// 0
diff --git a/ecrire/lang/spip_vi.php3 b/ecrire/lang/spip_vi.php3
index 419c146388..954f414ac0 100644
--- a/ecrire/lang/spip_vi.php3
+++ b/ecrire/lang/spip_vi.php3
@@ -2,7 +2,7 @@
// This is a SPIP language file -- Ceci est un fichier langue de SPIP
-$GLOBALS['i18n_vi'] = array(
+$GLOBALS['i18n_spip_vi'] = array(
// 0
--
GitLab