From: Samuel Vanhove <samuel@symbiotic.coop>
Date: Thu, 6 Oct 2016 14:36:50 +0000 (-0400)
Subject: CRM-16352 missing ts + placeholder
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=349218d7130fc01e9dd21a7bf65d85fc31d674dc;p=civicrm-core.git

CRM-16352 missing ts + placeholder
---

diff --git a/CRM/Mailing/Form/Search.php b/CRM/Mailing/Form/Search.php
index b91a85891d..00c2e24807 100644
--- 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 9836e48a5c..abf890a407 100644
--- 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