Fix typo in variable name

diff --git a/galette/lib/Galette/Core/Preferences.php b/galette/lib/Galette/Core/Preferences.php
index 54287e25640d47ce834187ac553e30ffd000a9d4..c9cab5d21e925239f53c074c9629586eccee9f16 100644 (file)
--- a/galette/lib/Galette/Core/Preferences.php
+++ b/galette/lib/Galette/Core/Preferences.php
@@ -48,7 +48,7 @@ use Galette\Repository\Members;
  * @property string $pref_ville Association
  * @property string $pref_region Region
  * @property string $pref_pays Country
- * @property integer $pref_postal_adress Postal adress to use, one of self::POSTAL_ADDRESS*
+ * @property integer $pref_postal_address Postal address to use, one of self::POSTAL_ADDRESS*
  * @property integer $pref_postal_staff_member Staff member ID from which retrieve postal address
  * @property boolean $pref_disable_members_socials
  * @property string $pref_lang Default instance language
@@ -193,7 +193,7 @@ class Preferences
         'pref_ville'        =>    '',
         'pref_region'        =>    '',
         'pref_pays'        =>    '',
-        'pref_postal_adress'  => self::POSTAL_ADDRESS_FROM_PREFS,
+        'pref_postal_address'  => self::POSTAL_ADDRESS_FROM_PREFS,
         'pref_postal_staff_member' => '',
         'pref_disable_members_socials' => false,
         'pref_lang'        =>    I18n::DEFAULT_LANG,
@@ -601,8 +601,8 @@ class Preferences
         }
 
         //postal address
-        if (isset($insert_values['pref_postal_adress'])) {
-            $value = $insert_values['pref_postal_adress'];
+        if (isset($insert_values['pref_postal_address'])) {
+            $value = $insert_values['pref_postal_address'];
             if ($value == Preferences::POSTAL_ADDRESS_FROM_PREFS) {
                 if (isset($insert_values['pref_postal_staff_member'])) {
                     unset($insert_values['pref_postal_staff_member']);
@@ -859,7 +859,7 @@ class Preferences
 
         $replacements = null;
 
-        if ($this->prefs['pref_postal_adress'] == self::POSTAL_ADDRESS_FROM_PREFS) {
+        if ($this->prefs['pref_postal_address'] == self::POSTAL_ADDRESS_FROM_PREFS) {
             $_address = $this->prefs['pref_adresse'];
             if ($this->prefs['pref_adresse2'] && $this->prefs['pref_adresse2'] != '') {
                 $_address .= "\n" . $this->prefs['pref_adresse2'];

diff --git a/galette/templates/default/pages/preferences.html.twig b/galette/templates/default/pages/preferences.html.twig
index 630c68e9e48d2fd9302c2aa8f235965f5680bad9..909d72e13a5a029e18d70dbe00fc5a73208610bb 100644 (file)
--- a/galette/templates/default/pages/preferences.html.twig
+++ b/galette/templates/default/pages/preferences.html.twig
@@ -132,12 +132,12 @@
                         </label>
                         <div class="inline fields">
                             <div class="field">
-                                <label for="pref_postal_adress_0">{{ _T("from preferences") }}</label>
-                                <input type="radio" name="pref_postal_adress" id="pref_postal_adress_0" value="{{ constant('Galette\\Core\\Preferences::POSTAL_ADDRESS_FROM_PREFS') }}" {% if pref.pref_postal_adress == constant('Galette\\Core\\Preferences::POSTAL_ADDRESS_FROM_PREFS') %}checked="checked"{% endif %}/>
+                                <label for="pref_postal_address_0">{{ _T("from preferences") }}</label>
+                                <input type="radio" name="pref_postal_address" id="pref_postal_address_0" value="{{ constant('Galette\\Core\\Preferences::POSTAL_ADDRESS_FROM_PREFS') }}" {% if pref.pref_postal_address == constant('Galette\\Core\\Preferences::POSTAL_ADDRESS_FROM_PREFS') %}checked="checked"{% endif %}/>
                             </div>
                             <div class="field">
-                                <label for="pref_postal_adress_1">{{ _T("from a staff user") }}</label>
-                                <input type="radio" name="pref_postal_adress" id="pref_postal_adress_1" value="{{ constant('Galette\\Core\\Preferences::POSTAL_ADDRESS_FROM_STAFF') }}" {% if pref.pref_postal_adress == constant('Galette\\Core\\Preferences::POSTAL_ADDRESS_FROM_STAFF') %}checked="checked"{% endif %}/>
+                                <label for="pref_postal_address_1">{{ _T("from a staff user") }}</label>
+                                <input type="radio" name="pref_postal_address" id="pref_postal_address_1" value="{{ constant('Galette\\Core\\Preferences::POSTAL_ADDRESS_FROM_STAFF') }}" {% if pref.pref_postal_address == constant('Galette\\Core\\Preferences::POSTAL_ADDRESS_FROM_STAFF') %}checked="checked"{% endif %}/>
                             </div>
                         </div>
                         <label for="pref_postal_staff_member">{{ _T("Staff member") }}</label>