Merge pull request #11928 from seamuslee001/case_pre_process_task

[civicrm-core.git] / ang / crmMailing / BlockReview.html

diff --git a/ang/crmMailing/BlockReview.html b/ang/crmMailing/BlockReview.html
index 6a2e2aad3dfb3bd9b111121438a75dbc129c3108..5a0021e40ab6449f566db6941318b680fb3e66a0 100644 (file)
--- a/ang/crmMailing/BlockReview.html
+++ b/ang/crmMailing/BlockReview.html
@@ -1,6 +1,6 @@
 <!--
 Controller: EditMailingCtrl
-Required vars: mailing
+Required vars: mailing, attachments
 -->
 <div>
   <div class="crm-block" ng-form="reviewForm" crm-ui-id-scope>
@@ -11,7 +11,7 @@ Required vars: mailing
       <div crm-ui-field="{title: ts('Recipients')}">
         <div ng-controller="ViewRecipCtrl">
           <div ng-controller="EditRecipCtrl">
-            <div><a crm-icon="fa-users" class="crm-hover-button action-item" ng-click="previewRecipients()">{{getRecipientsEstimate()}}</a></div>
+            <div><a crm-icon="fa-users" class="crm-hover-button action-item" ng-click="previewRecipients()">{{getRecipientCount()}}</a></div>
             <div ng-show="getIncludesAsString(mailing)">
               (<strong>{{ts('Include:')}}</strong> {{getIncludesAsString(mailing)}})
             </div>
@@ -24,15 +24,18 @@ Required vars: mailing
       <div crm-ui-field="{title: ts('Content')}">
         <span ng-show="mailing.body_html"><a crm-icon="fa-television" class="crm-hover-button action-item" ng-click="previewMailing(mailing, 'html')">{{ts('HTML')}}</a></span>
         <span ng-show="mailing.body_html || mailing.body_text"><a crm-icon="fa-file-text-o" class="crm-hover-button action-item" ng-click="previewMailing(mailing, 'text')">{{ts('Plain Text')}}</a></span>
-        <!-- TODO: attachments -->
       </div>
-      <div crm-ui-field="{title: ts('Attachments')}" ng-show="attachments.files.length > 0 || attachments.uploader.queue.length > 0">
+      <div crm-ui-field="{title: ts('Attachments')}">
         <div ng-repeat="file in attachments.files">
           <a ng-href="{{file.url}}" target="_blank">{{file.name}}</a>
         </div>
         <div ng-repeat="item in attachments.uploader.queue">
           {{item.file.name}}
         </div>
+        <div ng-show="!attachments.files.length && !attachments.uploader.queue.length"><em>{{ts('None')}}</em></div>
+      </div>
+      <div ng-if="crmMailingConst.isMultiLingual" crm-ui-field="{title: ts('Language')}">
+        {{crmMailingConst.enabledLanguages[mailing.language]}}
       </div>
       <div crm-ui-field="{title: ts('Tracking')}">
         <span crm-mailing-review-bool crm-on="mailing.url_tracking=='1'" crm-title="ts('Click-Throughs')"></span>