From 2ffc95bfab4d76b93edf9f3d3472e60b7d230aed Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 16 Sep 2021 20:51:46 -0700
Subject: [PATCH] msgtplui - (REF) "Add Translations" - Combine
 "mainLangs"/"altLangs"

---
 ext/msgtplui/ang/msgtplui/AddTranslation.html | 14 +++++++-------
 ext/msgtplui/ang/msgtplui/ListCtrl.js         | 18 ++++++++++--------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/ext/msgtplui/ang/msgtplui/AddTranslation.html b/ext/msgtplui/ang/msgtplui/AddTranslation.html
index d1dd5abcd5..329020936c 100644
--- a/ext/msgtplui/ang/msgtplui/AddTranslation.html
+++ b/ext/msgtplui/ang/msgtplui/AddTranslation.html
@@ -8,17 +8,17 @@
 
     <label>{{:: ts('Locale')}} <span class="crm-marker">*</span></label>
 
-    <div class="radio" ng-repeat="lang in model.mainLangs | orderBy:['label']">
-      <label ng-class="{disabled: !lang.is_active}">
-        <input type="radio" ng-model="model.selected" ng-value="lang.name" name="lang" ng-disabled="!lang.is_active"/>
+    <div class="radio" ng-repeat="lang in model.langs | orderBy:['label']">
+      <label ng-if="lang.is_encouraged" ng-class="{disabled: !lang.is_allowed}">
+        <input type="radio" ng-model="model.selected" ng-value="lang.name" name="lang" ng-disabled="!lang.is_allowed"/>
         {{:: lang.label}}
-        <span ng-if="!lang.is_active"><em>({{:: ts('existing')}})</em></span>
+        <span ng-if="!lang.is_allowed"><em>({{:: ts('existing')}})</em></span>
       </label>
     </div>
 
-    <div class="radio" ng-if="!!model.altLangs">
+    <div class="radio" ng-if="!!model.langs">
       <label>
-        <input type="radio" ng-model="model.selected" value="other" name="lang" ng-disabled="!model.altLangs"/>
+        <input type="radio" ng-model="model.selected" value="other" name="lang" ng-disabled="!model.langs"/>
         {{:: ts('Other')}}
 
         <select
@@ -28,7 +28,7 @@
           ng-model="model.selectedOther"
           ng-change="model.selected='other'">
           <option value=""></option>
-          <option ng-repeat="item in model.altLangs | orderBy:'label'" value="{{item.name}}">{{item.label}}</option>
+          <option ng-repeat="item in model.langs | orderBy:'label'" value="{{item.name}}" ng-disabled="!item.is_allowed">{{item.label}}</option>
         </select>
 
       </label>
diff --git a/ext/msgtplui/ang/msgtplui/ListCtrl.js b/ext/msgtplui/ang/msgtplui/ListCtrl.js
index c09b55d675..e5e7b6a6d4 100644
--- a/ext/msgtplui/ang/msgtplui/ListCtrl.js
+++ b/ext/msgtplui/ang/msgtplui/ListCtrl.js
@@ -80,18 +80,20 @@
 
     $ctrl.addTranslation = function(record) {
       var existing = findTranslations(record), activeLangs = findActiveLangs();
-      var mainLangs = [], altLangs = [{label: ts('- select -'), name: ''}];
-      angular.forEach(CRM.msgtplui.allLanguages, function(label, value){
-        var lang = {label: label, name: value, is_active: !existing[value]};
-        if (activeLangs[value] || CRM.msgtplui.uiLanguages[value]) mainLangs.push(lang);
-        if (!existing[value]) altLangs.push(lang);
+      var langs = [];
+      angular.forEach(CRM.msgtplui.allLanguages, function (label, value) {
+        langs.push({
+          name: value,
+          label: label,
+          is_allowed: !existing[value],
+          is_encouraged: !!(activeLangs[value] || CRM.msgtplui.uiLanguages[value])
+        });
       });
       var model = {
         msgtpl: record,
-        selected: (_.head(_.filter(mainLangs, {'is_active': true}))||{}).name,
+        selected: (_.head(_.filter(langs, {is_allowed: true, is_encouraged: true}))||{}).name,
         selectedOther: '',
-        mainLangs: mainLangs,
-        altLangs: altLangs
+        langs: langs
       };
       var options = CRM.utils.adjustDialogDefaults({
         autoOpen: false,
-- 
2.25.1