From 834c02da041dbe28b2e6ab4f407d1d78f2db565b Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 16 Sep 2021 20:29:33 -0700
Subject: [PATCH] msgtplui - "Add Translation" - Suggest languages based on
 active language list. Add option for any/all languages.

---
 ext/msgtplui/CRM/Msgtplui/Settings.php        |  9 +++++
 ext/msgtplui/ang/msgtplui/AddTranslation.html | 17 ++++++++--
 ext/msgtplui/ang/msgtplui/Edit.js             |  2 +-
 ext/msgtplui/ang/msgtplui/ListCtrl.js         | 33 ++++++++++++++-----
 4 files changed, 49 insertions(+), 12 deletions(-)

diff --git a/ext/msgtplui/CRM/Msgtplui/Settings.php b/ext/msgtplui/CRM/Msgtplui/Settings.php
index 7a2a9b903e..0af590dfc0 100644
--- a/ext/msgtplui/CRM/Msgtplui/Settings.php
+++ b/ext/msgtplui/CRM/Msgtplui/Settings.php
@@ -1,9 +1,18 @@
 <?php
 
 class CRM_Msgtplui_Settings {
+
   public static function getAll() {
+    $allLangs = \Civi\Api4\OptionValue::get()
+      ->addWhere('option_group_id:name', '=', 'languages')
+      ->addWhere('is_active', '=', TRUE)
+      ->addSelect('name', 'label')
+      ->addOrderBy('label')
+      ->execute();
     return [
+      'allLanguages' => array_combine($allLangs->column('name'), $allLangs->column('label')),
       'uiLanguages' => CRM_Core_I18n::uiLanguages(),
     ];
   }
+
 }
diff --git a/ext/msgtplui/ang/msgtplui/AddTranslation.html b/ext/msgtplui/ang/msgtplui/AddTranslation.html
index 7215debc75..0952e8abfd 100644
--- a/ext/msgtplui/ang/msgtplui/AddTranslation.html
+++ b/ext/msgtplui/ang/msgtplui/AddTranslation.html
@@ -8,13 +8,24 @@
 
     <label>{{:: ts('Locale')}} <span class="crm-marker">*</span></label>
 
-    <div class="radio" ng-repeat="lang in model.langs | orderBy:['label']">
-      <label>
-        <input type="radio" ng-model="model.selected" ng-value="lang.name" name="lang"/>
+    <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"/>
         {{:: lang.label}}
+        <span ng-if="!lang.is_active"><em>({{:: ts('existing')}})</em></span>
+      </label>
+    </div>
+
+    <div class="radio" ng-if="!!model.altLangs">
+      <label>
+        <input type="radio" ng-model="model.selected" value="other" name="lang" ng-disabled="!model.altLangs"/>
+        {{:: ts('Other')}}
+        <select class="form-control" ng-options="item.name as item.label for item in model.altLangs" ng-model="model.selectedOther" ng-change="model.selected='other'"></select>
       </label>
     </div>
 
+    <span ng-model="placeholder" crm-ui-validate="!(model.selected === 'other' && model.selectedOther === '')"></span>
+
     <crm-dialog-button text="ts('Add')" icons="{primary: 'fa-plus'}" on-click="addTranslationDlg.close()" disabled="!addTranslationForm.$valid" />
     <crm-dialog-button text="ts('Cancel')" icons="{primary: 'fa-times'}" on-click="addTranslationDlg.cancel()" />
   </form>
diff --git a/ext/msgtplui/ang/msgtplui/Edit.js b/ext/msgtplui/ang/msgtplui/Edit.js
index bbfd06a752..876d6f9251 100644
--- a/ext/msgtplui/ang/msgtplui/Edit.js
+++ b/ext/msgtplui/ang/msgtplui/Edit.js
@@ -157,7 +157,7 @@
     var $ctrl = this;
     var args = $location.search();
 
-    $ctrl.locales = CRM.msgtplui.uiLanguages;
+    $ctrl.locales = CRM.msgtplui.allLanguages;
     $ctrl.records = prefetch;
     $ctrl.tokenList = tokenList;
     if (args.lang) {
diff --git a/ext/msgtplui/ang/msgtplui/ListCtrl.js b/ext/msgtplui/ang/msgtplui/ListCtrl.js
index 8dc55c3f5a..a671dfe0b6 100644
--- a/ext/msgtplui/ang/msgtplui/ListCtrl.js
+++ b/ext/msgtplui/ang/msgtplui/ListCtrl.js
@@ -49,6 +49,15 @@
       }, {});
     }
 
+    function findActiveLangs() {
+      return _.reduce($ctrl.records, function(langs, rec){
+        if (rec._is_translation) {
+          langs[rec.tx_language] = true;
+        }
+        return langs;
+      }, {});
+    }
+
     /**
      *
      * @param record
@@ -70,15 +79,22 @@
     };
 
     $ctrl.addTranslation = function(record) {
-      var existing = findTranslations(record);
-      var available = _.reduce(CRM.msgtplui.uiLanguages, function(acc, label, name) {
-        if (!existing[name]) acc.push({label: label, name: name});
-        return acc;
-      }, []);
+      var existing = findTranslations(record), activeLangs = findActiveLangs();
+      var mainLangs = [], altLangs = [{label: ts('- select -'), name: ''}];
+      angular.forEach(CRM.msgtplui.allLanguages, function(label, value){
+        if (activeLangs[value] || CRM.msgtplui.uiLanguages[value]) {
+          mainLangs.push({label: label, name: value, is_active: !existing[value]});
+        }
+        else {
+          altLangs.push({label: label, name: value});
+        }
+      });
       var model = {
         msgtpl: record,
-        selected: (_.head(available)||{}).name,
-        langs: available
+        selected: (_.head(_.filter(mainLangs, {'is_active': true}))||{}).name,
+        selectedOther: '',
+        mainLangs: mainLangs,
+        altLangs: altLangs
       };
       var options = CRM.utils.adjustDialogDefaults({
         autoOpen: false,
@@ -88,7 +104,8 @@
       });
       return dialogService.open('addTranslationDlg', '~/msgtplui/AddTranslation.html', model, options)
         .then(function(){
-          window.location = $ctrl.editUrl({id: record.id, tx_language: model.selected});
+          var selection = (model.selected === 'other') ? model.selectedOther : model.selected;
+          window.location = $ctrl.editUrl({id: record.id, tx_language: selection});
         });
     };
 
-- 
2.25.1