Merge branch 'refreshCompleteMsg' into 'master'

When the refresh is complete, show a better status message

See merge request !5

CRM/Uplang/Admin/Form/Setting/Localization.php

@@ -54,6 +54,8 @@ class CRM_Uplang_Admin_Form_Setting_Localization {
     CRM_Core_Region::instance($region)->add([
       'template' => 'CRM/Uplang/Form/Refresh.tpl',
     ]);
+
+    Civi::resources()->addScriptFile('uplang', 'js/uplang.js');
   }
 
 }

js/uplang.js

+(function($, _, ts) {
+
+  // Move the button to somewhere more visible
+  if ($('.crm-localization-form-block').size() > 0) {
+    // Localization Settings
+    $('#uplang').prependTo($('.crm-localization-form-block'));
+  }
+  else if ($('.crm-content-block').size() > 0) {
+    // Manage Extensions page
+    $('#uplang').prependTo($('.crm-content-block'));
+  }
+
+  $('.crm-uplang-refresh').click(function(event) {
+    event.stopPropagation();
+    CRM.alert(ts('This can take a minute or two.'), ts('Refreshing...'), 'crm-msg-loading', {expires: 0});
+    CRM.api('Uplang', 'fetch', {}, {
+      'callBack' : function(result){
+        if (result.is_error) {
+          CRM.alert(result.error_message, ts('Refresh Error'), 'error');
+        }
+        else {
+          CRM.closeAlertByChild($('.crm-msg-loading'));
+          CRM.alert(ts('Updated %1 resources', {1: result.count}), ts('Done'), 'success');
+        }
+      }
+    });
+    return false;
+  });
+
+})(CRM.$, CRM._, CRM.ts('uplang'));

templates/CRM/Uplang/Form/Refresh.tpl

@@ -6,32 +6,3 @@
     <div style="text-align: center;">{$uplangStatus}</div>
   </div>
 {/crmScope}
-{literal}
-  <script type="text/javascript">
-  CRM.$(function($) {
-    if ($('.crm-localization-form-block').size() > 0) {
-      // Localization Settings
-      $('#uplang').prependTo($('.crm-localization-form-block'));
-    }
-    else if ($('.crm-content-block').size() > 0) {
-      // Manage Extensions page
-      $('#uplang').prependTo($('.crm-content-block'));
-    }
-
-    $('.crm-uplang-refresh').click(function(event) {
-      event.stopPropagation();
-      CRM.alert('', '{/literal}{ts escape="js"}Refreshing...{/ts}{literal}', 'crm-msg-loading', {expires: 0});
-      CRM.api('Uplang', 'fetch', {}, {
-        'callBack' : function(result){
-          if (result.is_error) {
-            CRM.alert(result.error_message, '{/literal}{ts escape="js"}Refresh Error{/ts}{literal}', 'error');
-          } else {
-            window.location.reload();
-          }
-        }
-      });
-      return false;
-    });
-  });
-  </script>
-{/literal}