From 7b4bc4ad7f6697e380153b92af20fa9b1a924e8f Mon Sep 17 00:00:00 2001 From: Olivier PEREZ Date: Mon, 13 Apr 2015 11:24:44 +0200 Subject: [PATCH] Replace $html_lang by $locale --- app/classes/Framadate/Utils.php | 6 +++--- app/inc/i18n.php | 2 +- bandeaux.php | 4 ++-- create_classic_poll.php | 2 +- tpl/page.tpl | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/classes/Framadate/Utils.php b/app/classes/Framadate/Utils.php index 6d5254d..fe13530 100644 --- a/app/classes/Framadate/Utils.php +++ b/app/classes/Framadate/Utils.php @@ -51,10 +51,10 @@ class Utils { * @deprecated */ public static function print_header($title = '') { - global $html_lang; + global $locale; echo ' - + '; @@ -73,7 +73,7 @@ class Utils { - + '; if (file_exists($_SERVER['DOCUMENT_ROOT'] . "/nav/nav.js")) { echo ''; diff --git a/app/inc/i18n.php b/app/inc/i18n.php index c3e7c1d..257ac18 100644 --- a/app/inc/i18n.php +++ b/app/inc/i18n.php @@ -27,7 +27,7 @@ if (isset($_POST['lang']) && is_string($_POST['lang']) && in_array($_POST['lang' $_SESSION['lang'] = $_POST['lang']; } -/* */ +/* */ $i18n->get('Something, just to load the dictionary'); $locale = $i18n->getLoadedLang(); diff --git a/bandeaux.php b/bandeaux.php index ce3a4d8..9f0e073 100644 --- a/bandeaux.php +++ b/bandeaux.php @@ -57,12 +57,12 @@ function bandeau_titre($titre) function liste_lang() { - global $ALLOWED_LANGUAGES; global $html_lang; + global $ALLOWED_LANGUAGES; global $locale; $str = ''; foreach ($ALLOWED_LANGUAGES as $k => $v ) { - if (substr($k,0,2)==$html_lang) { + if (substr($k,0,2)==$locale) { $str .= '' . "\n" ; } else { $str .= '' . "\n" ; diff --git a/create_classic_poll.php b/create_classic_poll.php index ef26cda..2c9d3ce 100644 --- a/create_classic_poll.php +++ b/create_classic_poll.php @@ -232,7 +232,7 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (

' . __('Step 2 classic', 'To make a generic poll you need to propose at least two choices between differents subjects.') . '

' . __('Step 2 classic', 'You can add or remove additional choices with the buttons') . ' ' . __('Generic', 'Remove') . ' ' . __('Generic', 'Add') . '

'; if ($config['user_can_add_img_or_link']) { - echo '

' . __('Step 2 classic', 'It\'s possible to propose links or images by using') . ' ' . __('Step 2 classic', 'the Markdown syntax') . '.

'; + echo '

' . __('Step 2 classic', 'It\'s possible to propose links or images by using') . ' ' . __('Step 2 classic', 'the Markdown syntax') . '.

'; } echo ' ' . "\n"; diff --git a/tpl/page.tpl b/tpl/page.tpl index 8312531..3bc2d29 100644 --- a/tpl/page.tpl +++ b/tpl/page.tpl @@ -17,7 +17,7 @@ - + {if !empty($nav_js)}