Resources: set a cacheCode that is language-specific, fixes AngularJS…

… translation with multilingual
civicrm · Dec 10, 2021 · 98e2d42 · 98e2d42
1 parent c46601a
commit 98e2d42
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
@@ -336,7 +336,9 @@ public function glob($ext, $patterns, $flags = NULL) {
    * @return string
    */
   public function getCacheCode() {
-    return $this->cacheCode;
+    // Ex: AngularJS json partials are language-specific because they ship with the strings
+    // for the current language.
+    return $this->cacheCode . CRM_Core_I18n::getLocale();
   }
 
   /**
@@ -563,7 +565,7 @@ public function addCacheCode($url) {
     $hasQuery = strpos($url, '?') !== FALSE;
     $operator = $hasQuery ? '&' : '?';
 
-    return $url . $operator . 'r=' . $this->cacheCode;
+    return $url . $operator . 'r=' . $this->getCacheCode();
   }
 
   /**