CRM-16352 missing ts + placeholder

diff --git a/CRM/Mailing/Form/Search.php b/CRM/Mailing/Form/Search.php
index b91a85891d286c29d88fe275d7bc7c74bcb5e02b..00c2e24807282b6a5eeda78a51abae39e2e6be02 100644 (file)
--- a/CRM/Mailing/Form/Search.php
+++ b/CRM/Mailing/Form/Search.php
@@ -64,7 +64,7 @@ class CRM_Mailing_Form_Search extends CRM_Core_Form {
     $enabledLanguages = CRM_Core_I18n::languages(TRUE);
 
     if (count($enabledLanguages) > 1) {
-      $this->addElement('select', 'language', ts('Language'), array('' => ' - all languages - ') + $enabledLanguages, array('class' => 'crm-select2'));
+      $this->addElement('select', 'language', ts('Language'), array('' => ts('- all languages -')) + $enabledLanguages, array('class' => 'crm-select2'));
     }
 
     if ($parent->_sms) {

diff --git a/ang/crmMailing/BlockMailing.html b/ang/crmMailing/BlockMailing.html
index 9836e48a5cc90713de1c18e28a40e7349a6e0067..abf890a4070059bc63ee14fb7c0b8f86d9789878 100644 (file)
--- a/ang/crmMailing/BlockMailing.html
+++ b/ang/crmMailing/BlockMailing.html
@@ -83,7 +83,7 @@ It could perhaps be thinned by 30-60% by making more directives.
       <div crm-ui-field="{name: 'subform.language', title: ts('Language')}">
         <select
           crm-ui-id="subform.language"
-          crm-ui-select="{dropdownAutoWidth : true, allowClear: false}"
+          crm-ui-select="{dropdownAutoWidth : true, allowClear: false, placeholder: ts('- choose language -')}"
           name="language"
           ng-model="mailing.language"
           required