Merge branch 'pu/cw/adbtitle' into '2024.11'

tweak(Addressbook) refine title template See merge request tine20/tine20!4882
tine-groupware · Feb 2, 2024 · 0a13e22 · 0a13e22
2 parents fd0a6e5 + bd3e651
commit 0a13e22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tine20/Addressbook/Preference.php b/tine20/Addressbook/Preference.php
@@ -156,8 +156,8 @@ public function getApplicationPreferenceDefaults($_preferenceName, $_accountId =
                             <label>'. $translate->_('Display Name - Company / Organisation') . '</label>
                         </option>
                         <option>
-                            <value>{% if salutation %}{{ keyField("Addressbook", "contactSalutation", salutation) }} {% endif %}{% if n_family %}{{ n_family }}{% else %}{{ n_fileas }}{% endif %}{% if org_name %} ({{ org_name }}){% endif %}</value>
-                            <label>'. $translate->_('Salutation Last Name (Company / Organisation)') . '</label>
+                            <value>{% if salutation %}{{ keyField("Addressbook", "contactSalutation", salutation) }} {% endif %}{% if n_prefix %}{{ n_prefix }} {% endif %}{% if n_family %}{{ n_family }}{% endif %}{% if org_name %} ({{ org_name }}){% endif %}</value>
+                            <label>'. $translate->_('Salutation Title Last Name (Company / Organisation)') . '</label>
                         </option>
                     </options>';
                 break;

diff --git a/tine20/Addressbook/translations/de.po b/tine20/Addressbook/translations/de.po
@@ -1364,5 +1364,5 @@ msgstr "Angezeigter Name (E-Mail)"
 msgid "Display Name - Company / Organisation"
 msgstr "Angezeigter Name - Firma / Organisation"
 
-msgid "Salutation Last Name (Company / Organisation)"
-msgstr "Anrede Nachname (Firma / Organisation)"
+msgid "Salutation Title Last Name (Company / Organisation)"
+msgstr "Anrede Titel Nachname (Firma / Organisation)"