From 578d3d13aff7086fbeef00b65c4ce41a852d1d54 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Fri, 16 Jan 2015 16:22:06 -0800 Subject: [PATCH] CRM-15832 - crmResource - Include the locale in the resource-bundle URL. --- js/angular-crmResource/all.js | 2 +- js/angular-crmResource/byModule.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/angular-crmResource/all.js b/js/angular-crmResource/all.js index 28ef6d6fec..ccab58ca13 100644 --- a/js/angular-crmResource/all.js +++ b/js/angular-crmResource/all.js @@ -32,7 +32,7 @@ }); }; - var moduleUrl = CRM.url('civicrm/ajax/angular-modules', {r: CRM.angular.cacheCode}); + var moduleUrl = CRM.url('civicrm/ajax/angular-modules', {l: CRM.config.lcMessages, r: CRM.angular.cacheCode}); $http.get(moduleUrl) .success(function httpSuccess(data) { templates = []; diff --git a/js/angular-crmResource/byModule.js b/js/angular-crmResource/byModule.js index 0050c195a5..9514b2ffdb 100644 --- a/js/angular-crmResource/byModule.js +++ b/js/angular-crmResource/byModule.js @@ -37,7 +37,7 @@ load: function load() { var module = this; this.status = 'loading'; - var moduleUrl = CRM.url('civicrm/ajax/angular-modules', {modules: module.name, r: CRM.angular.cacheCode}); + var moduleUrl = CRM.url('civicrm/ajax/angular-modules', {modules: module.name, l: CRM.config.lcMessages, r: CRM.angular.cacheCode}); $http.get(moduleUrl) .success(function httpSuccess(data) { if (data[module.name]) { -- 2.25.1