From b3518210504dde96ad8b287424ed8614e3e909a5 Mon Sep 17 00:00:00 2001 From: Samuel Vanhove Date: Tue, 28 Apr 2015 19:46:09 -0400 Subject: [PATCH] CRM-16355 - communication language choices order + help text fixes --- CRM/Admin/Form/ScheduleReminders.php | 3 ++- templates/CRM/Admin/Page/ScheduleReminders.hlp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CRM/Admin/Form/ScheduleReminders.php b/CRM/Admin/Form/ScheduleReminders.php index c34eb74435..0bc20b4d4a 100644 --- a/CRM/Admin/Form/ScheduleReminders.php +++ b/CRM/Admin/Form/ScheduleReminders.php @@ -265,10 +265,11 @@ class CRM_Admin_Form_ScheduleReminders extends CRM_Admin_Form { $element = $this->add('select', 'filter_contact_language', ts('Recipients language'), $languageFilter, FALSE, array('multiple' => TRUE, 'class' => 'crm-select2', 'placeholder' => TRUE)); - $communicationLanguage = $languages + array( + $communicationLanguage = array( '' => ts('System default language'), CRM_Core_I18n::AUTO => ts('Follow recipient preferred language') ); + $communicationLanguage = $communicationLanguage + $languages; $this->add('select', 'communication_language', ts('Communication language'), $communicationLanguage); } diff --git a/templates/CRM/Admin/Page/ScheduleReminders.hlp b/templates/CRM/Admin/Page/ScheduleReminders.hlp index a13f7b749b..01f342f61b 100644 --- a/templates/CRM/Admin/Page/ScheduleReminders.hlp +++ b/templates/CRM/Admin/Page/ScheduleReminders.hlp @@ -43,10 +43,10 @@ {/htxt} {htxt id="filter_contact_language"} - {ts}You can limt the recipient of the reminder to contact with the specified preferred language. You can also choose to add contacts that have no preferred language defined.{/ts} + {ts}You can limit the recipient of the reminder to contacts with the specified preferred language. You can also choose to add contacts that have no preferred language defined.{/ts} {/htxt} {htxt id="communication_language"} - {ts}This is the language of the communication. If there are template translation or tokens, it will follow this preferrence. By default, it follows the system default language.{/ts} + {ts}This is the communication language. If there are template translation or tokens, they will be localized accordingly. By default, the system default language will be used.{/ts} {/htxt} -- 2.25.1