Remove needless string translation CRM-12339

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index a86cfab4679ac3ab3cd270c012af86261217032f..c6a1096d69dedd89d4301fa7bf2a4349c134746a 100644 (file)
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -425,7 +425,9 @@ class CRM_Core_Resources {
       $jsWeight = -9999;
       foreach ($files as $file => $type) {
         if ($type == 'js') {
-          $this->addScriptFile('civicrm', $file, $jsWeight++, $region, FALSE);
+          // Don't bother  looking for ts() calls in packages, there aren't any
+          $translate = (substr($file, 0, 9) != 'packages/');
+          $this->addScriptFile('civicrm', $file, $jsWeight++, $region, $translate);
         }
         elseif ($type == 'css') {
           $this->addStyleFile('civicrm', $file, -100, $region);

diff --git a/templates/CRM/common/scripts.tpl b/templates/CRM/common/scripts.tpl
index 625d13c65021ec516e8b88ffc18c2f678cca75e9..26ba526b1da09c857e718f0805eb28a18eb4e85b 100644 (file)
--- a/templates/CRM/common/scripts.tpl
+++ b/templates/CRM/common/scripts.tpl
@@ -42,16 +42,7 @@
   {literal}
   var CRM = CRM || {};
   CRM = cj.extend(true, {
-    strings: {{/literal}
-      '- select -': '{ts escape="js"}- select -{/ts}',
-      Ok: '{ts escape="js"}Ok{/ts}',
-      Cancel: '{ts escape="js"}Cancel{/ts}',
-      Yes: '{ts escape="js"}Yes{/ts}',
-      No: '{ts escape="js"}No{/ts}',
-      Saved: '{ts escape="js"}Saved{/ts}',
-      Error: '{ts escape="js"}Error{/ts}',
-      Removed: '{ts escape="js"}Removed{/ts}'
-    {literal}},
+    strings: {},
     config: {{/literal}
       urlIsPublic: {if $urlIsPublic}true{else}false{/if},
       userFramework: '{$config->userFramework}',