From: Johan Cwiklinski <jcwiklinski@teclib.com>
Date: Sat, 9 Nov 2019 09:03:25 +0000 (+0100)
Subject: Set languages case at registration, not display
X-Git-Tag: 0.9.3~41
X-Git-Url: https://git.agnieray.net/?a=commitdiff_plain;h=4808d5c1c5677abbe4e3c0207cc2829d55e42fe2;p=galette.git

Set languages case at registration, not display
---

diff --git a/galette/includes/routes/members.routes.php b/galette/includes/routes/members.routes.php
index ea2bf824b..1b829603e 100644
--- a/galette/includes/routes/members.routes.php
+++ b/galette/includes/routes/members.routes.php
@@ -613,7 +613,7 @@ $app->get(
                 'page_title'        => _T("Member Profile"),
                 'require_dialog'    => true,
                 'member'            => $member,
-                'pref_lang'         => ucfirst($this->i18n->getNameFromId($member->language)),
+                'pref_lang'         => $this->i18n->getNameFromId($member->language),
                 'pref_card_self'    => $this->preferences->pref_card_self,
                 'groups'            => Groups::getSimpleList(),
                 'time'              => time(),
@@ -696,7 +696,7 @@ $app->get(
                 'page_title'        => _T("Member Profile"),
                 'require_dialog'    => true,
                 'member'            => $member,
-                'pref_lang'         => ucfirst($this->i18n->getNameFromId($member->language)),
+                'pref_lang'         => $this->i18n->getNameFromId($member->language),
                 'pref_card_self'    => $this->preferences->pref_card_self,
                 'groups'            => Groups::getSimpleList(),
                 'time'              => time(),
diff --git a/galette/lib/Galette/Core/I18n.php b/galette/lib/Galette/Core/I18n.php
index b1331060e..6e89c9f56 100644
--- a/galette/lib/Galette/Core/I18n.php
+++ b/galette/lib/Galette/Core/I18n.php
@@ -185,7 +185,7 @@ class I18n
             //$firstChar = mb_substr($string, 0, 1, $encoding);
             //$then = mb_substr($string, 1, $strlen - 1, $encoding);
             //return mb_strtoupper($firstChar, $encoding) . $then;
-            $al[$l->getID()] = ucfirst($l->getName());
+            $al[$l->getID()] = $l->getName();
         }
         return $al;
     }
@@ -283,9 +283,11 @@ class I18n
                 $langs[$real_lang] = [
                     'long'      => $lang,
                     'shortname' => $parsed_lang['language'],
-                    'longname'  => \Locale::getDisplayLanguage(
-                        $lang,
-                        $real_lang
+                    'longname'  => ucfirst(
+                        \Locale::getDisplayLanguage(
+                            $lang,
+                            $real_lang
+                        )
                     )
                 ];
             }
diff --git a/galette/templates/default/forms_types/lang.tpl b/galette/templates/default/forms_types/lang.tpl
index fe7e4fa00..8be298203 100644
--- a/galette/templates/default/forms_types/lang.tpl
+++ b/galette/templates/default/forms_types/lang.tpl
@@ -3,7 +3,7 @@
 {block name="element"}
     <select name="pref_lang" id="pref_lang" class="lang"{if isset($disabled) and $disabled == true} disabled="disabled"{/if}{if isset($required.pref_lang) and $required.pref_lang eq 1} required="required"{/if}>
         {foreach item=langue from=$languages}
-            <option value="{$langue->getID()}"{if $member->language eq $langue->getID()} selected="selected"{/if}>{$langue->getName()|ucfirst}</option>
+            <option value="{$langue->getID()}"{if $member->language eq $langue->getID()} selected="selected"{/if}>{$langue->getName()}</option>
         {/foreach}
     </select>
 {/block}
diff --git a/galette/templates/default/gestion_textes.tpl b/galette/templates/default/gestion_textes.tpl
index fcfeaf7e4..2e2bf972a 100644
--- a/galette/templates/default/gestion_textes.tpl
+++ b/galette/templates/default/gestion_textes.tpl
@@ -8,7 +8,7 @@
                 <label for="sel_lang">{_T string="Language:"}</label>
                 <select name="sel_lang" id="sel_lang" class="lang">
                     {foreach item=langue from=$langlist}
-                        <option value="{$langue->getID()}" {if $cur_lang eq $langue->getID()}selected="selected"{/if}>{$langue->getName()|ucfirst}</option>
+                        <option value="{$langue->getID()}" {if $cur_lang eq $langue->getID()}selected="selected"{/if}>{$langue->getName()}</option>
                     {/foreach}
                 </select>
 
diff --git a/galette/templates/default/preferences.tpl b/galette/templates/default/preferences.tpl
index 524b9dcb9..72b825a71 100644
--- a/galette/templates/default/preferences.tpl
+++ b/galette/templates/default/preferences.tpl
@@ -133,7 +133,7 @@
                     <label for="pref_lang" class="bline">{_T string="Default language:"}</label>
                     <select name="pref_lang" id="pref_lang" class="lang">
 {foreach item=langue from=$languages}
-                        <option value="{$langue->getID()}" {if $pref.pref_lang eq $langue->getID()}selected="selected"{/if}>{$langue->getName()|ucfirst}</option>
+                        <option value="{$langue->getID()}" {if $pref.pref_lang eq $langue->getID()}selected="selected"{/if}>{$langue->getName()}</option>
 {/foreach}
                     </select>
                 </p>
diff --git a/galette/templates/default/public_page.tpl b/galette/templates/default/public_page.tpl
index ebd92bec3..95bd9fef3 100644
--- a/galette/templates/default/public_page.tpl
+++ b/galette/templates/default/public_page.tpl
@@ -73,7 +73,7 @@ We have to use a template file, so Smarty will do its work (like replacing varia
             <form action="" id="plang_selector">
                 <select id="lang_selector" name="ui_pref_lang">
 {foreach item=langue from=$languages}
-                    <option value="{$langue->getID()}" lang="{$langue->getAbbrev()}"{if $galette_lang eq $langue->getAbbrev()} selected="selected"{/if}>{$langue->getName()|ucfirst}</option>
+                    <option value="{$langue->getID()}" lang="{$langue->getAbbrev()}"{if $galette_lang eq $langue->getAbbrev()} selected="selected"{/if}>{$langue->getName()}</option>
 {/foreach}
                 </select>
                 <noscript>