From: Johan Cwiklinski Date: Tue, 5 Nov 2019 23:11:00 +0000 (+0100) Subject: Rework lang selector; drop flags X-Git-Tag: 0.9.3~53 X-Git-Url: https://git.agnieray.net/?a=commitdiff_plain;h=b671c0480fa407cb28a588ec10496b146a987a76;p=galette.git Rework lang selector; drop flags --- diff --git a/galette/includes/main.inc.php b/galette/includes/main.inc.php index ff0f6d5f5..cd45e0610 100644 --- a/galette/includes/main.inc.php +++ b/galette/includes/main.inc.php @@ -443,13 +443,13 @@ $app->add(function ($request, $response, $next) { $app->add(function ($request, $response, $next) use ($i18n) { $get = $request->getQueryParams(); - if (isset($get['pref_lang'])) { + if (isset($get['ui_pref_lang'])) { $route = $request->getAttribute('route'); $route_name = $route->getName(); $arguments = $route->getArguments(); - $this->i18n->changeLanguage($get['pref_lang']); + $this->i18n->changeLanguage($get['ui_pref_lang']); $this->session->i18n = $this->i18n; return $response->withRedirect( diff --git a/galette/includes/routes/members.routes.php b/galette/includes/routes/members.routes.php index 294ff3f1e..ea2bf824b 100644 --- a/galette/includes/routes/members.routes.php +++ b/galette/includes/routes/members.routes.php @@ -613,7 +613,6 @@ $app->get( 'page_title' => _T("Member Profile"), 'require_dialog' => true, 'member' => $member, - 'pref_lang_img' => $this->i18n->getFlagFromId($member->language), 'pref_lang' => ucfirst($this->i18n->getNameFromId($member->language)), 'pref_card_self' => $this->preferences->pref_card_self, 'groups' => Groups::getSimpleList(), @@ -697,7 +696,6 @@ $app->get( 'page_title' => _T("Member Profile"), 'require_dialog' => true, 'member' => $member, - 'pref_lang_img' => $this->i18n->getFlagFromId($member->language), 'pref_lang' => ucfirst($this->i18n->getNameFromId($member->language)), 'pref_card_self' => $this->preferences->pref_card_self, 'groups' => Groups::getSimpleList(), diff --git a/galette/lib/Galette/Core/I18n.php b/galette/lib/Galette/Core/I18n.php index b20109956..fee072bb9 100644 --- a/galette/lib/Galette/Core/I18n.php +++ b/galette/lib/Galette/Core/I18n.php @@ -58,7 +58,6 @@ class I18n private $longid; private $name; private $abbrev; - private $flag; const DEFAULT_LANG = 'fr_FR'; @@ -154,7 +153,6 @@ class I18n $this->longid = $lang['long']; $this->name = $lang['longname']; $this->abbrev = $lang['shortname']; - $this->flag = $lang['flag']; } /** @@ -212,35 +210,6 @@ class I18n } } - /** - * Gets the language flag from its ID - * - * @param string $id the language identifier - * - * @return string path to flag for specified language identifier - */ - public function getFlagFromId($id) - { - $path = null; - if (!isset($this->langs[$id])) { - Analog::log( - str_replace( - '%lang', - $id, - _T('Unknown lang (%lang)') - ), - Analog::INFO - ); - } else { - if (defined('GALETTE_THEME_DIR')) { - $path = GALETTE_THEME_DIR . 'images/flags/' . $this->langs['id']['flag']; - } else { - $path = GALETTE_THEME . 'images/flags/' . $this->langs[$id]['flag']; - } - } - return $path; - } - /** * Get current id * @@ -281,20 +250,6 @@ class I18n return $this->abbrev; } - /** - * Get current flag - * - * @return string path to the current language flag image - */ - public function getFlag() - { - if (defined('GALETTE_THEME_DIR')) { - return GALETTE_THEME_DIR . 'images/flags/' . $this->flag; - } else { - return GALETTE_THEME . 'images/flags/' . $this->flag; - } - } - /** * Is a string seem to be UTF-8 one ? * @@ -318,16 +273,12 @@ class I18n public function guessLangs() { $dir = new \DirectoryIterator($this->path); - $flags_dir = GALETTE_ROOT . 'webroot/themes/default/images/flags/'; $langs = []; foreach ($dir as $fileinfo) { if ($fileinfo->isDir() && !$fileinfo->isDot()) { $lang = $fileinfo->getFilename(); $real_lang = str_replace('.utf8', '', $lang); $parsed_lang = \Locale::parseLocale($lang); - $flag = (file_exists($flags_dir . $real_lang . '.svg') ? - $real_lang . '.svg' : - 'default.svg'); $langs[$real_lang] = [ 'long' => $lang, @@ -335,8 +286,7 @@ class I18n 'longname' => \Locale::getDisplayLanguage( $lang, $lang - ), - 'flag' => $flag + ) ]; } } diff --git a/galette/templates/default/forms_types/lang.tpl b/galette/templates/default/forms_types/lang.tpl index 7fed01b66..fe7e4fa00 100644 --- a/galette/templates/default/forms_types/lang.tpl +++ b/galette/templates/default/forms_types/lang.tpl @@ -3,7 +3,7 @@ {block name="element"} {/block} diff --git a/galette/templates/default/gestion_textes.tpl b/galette/templates/default/gestion_textes.tpl index 0e3c7dffc..fcfeaf7e4 100644 --- a/galette/templates/default/gestion_textes.tpl +++ b/galette/templates/default/gestion_textes.tpl @@ -8,7 +8,7 @@ diff --git a/galette/templates/default/page.tpl b/galette/templates/default/page.tpl index 5dcd76338..44824129c 100644 --- a/galette/templates/default/page.tpl +++ b/galette/templates/default/page.tpl @@ -196,15 +196,16 @@ We have to use a template file, so Smarty will do its work (like replacing varia {* Include plugins menu entries *} {$plugins->getMenus($tpl)} -