CRM-14949 - CRM_Core_Resources::addLocalizationJs

Cleanly separate file-IO and file-content

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 40b6bd20c252747f07f8e5874d65a5233c585345..217b4254aa4a50d4b50ddb00e5b0e4ca3b3c4b03 100644 (file)
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -548,21 +548,25 @@ class CRM_Core_Resources {
 
   /**
    * Add dynamic l10n js
+   *
+   * @return string URL of JS file
    */
   private function addLocalizationJs() {
     $config = CRM_Core_Config::singleton();
     $fileName = 'l10n-' . $config->lcMessages . '.js';
     if (!is_file(CRM_Utils_File::dynamicResourcePath($fileName))) {
-      $this->createLocalizationJs($fileName);
+      CRM_Utils_File::addDynamicResource($fileName, $this->createLocalizationJs());
     }
     // Dynamic localization script
     return CRM_Utils_File::dynamicResourceUrl($fileName);
   }
 
   /**
-   * Create dymanic script for localizing js widgets
+   * Create dynamic script for localizing js widgets
+   *
+   * @return string javascript content
    */
-  private function createLocalizationJs($fileName) {
+  private function createLocalizationJs() {
     $config = CRM_Core_Config::singleton();
     $vars = array(
       'moneyFormat' => json_encode(CRM_Utils_Money::format(1234.56)),
@@ -570,7 +574,7 @@ class CRM_Core_Resources {
       'otherSearch' => json_encode(ts('Enter search term...')),
       'contactCreate' => CRM_Core_BAO_UFGroup::getCreateLinks(),
     );
-    CRM_Utils_File::addDynamicResource($fileName, CRM_Core_Smarty::singleton()->fetchWith('CRM/common/localization.js.tpl', $vars));
+    return CRM_Core_Smarty::singleton()->fetchWith('CRM/common/localization.js.tpl', $vars);
   }
 
   /**