From 4f1825872636d15d8197128164ed68d557031c0c Mon Sep 17 00:00:00 2001 From: Chuck Harmston Date: Fri, 14 Aug 2015 08:14:07 -0600 Subject: [PATCH] Reverts uses of gettext_lazy (bug 1194468). --- bower.json | 3 +-- src/media/js/compat_filter.js | 10 +++++++++- src/media/js/content_filter.js | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/bower.json b/bower.json index cd4337f872..18223ee42e 100644 --- a/bower.json +++ b/bower.json @@ -15,10 +15,9 @@ ], "dependencies": { "marketplace-constants": "0.12.0", - "marketplace-core-modules": "2.13.0", + "marketplace-core-modules": "2.11.0", "marketplace-elements": "0.7.1", "marketplace-jquery": "2.0.2", - "almond": "0.2.9", "requirejs": "2.1.4", "underscore": "1.4.4", diff --git a/src/media/js/compat_filter.js b/src/media/js/compat_filter.js index d262bc5ab4..c45571621d 100644 --- a/src/media/js/compat_filter.js +++ b/src/media/js/compat_filter.js @@ -25,7 +25,15 @@ define('compat_filter', storage, utils, views, z, _) { 'use strict'; var logger = log('compat_filter'); - var gettext = l10n.gettext_lazy; + + function gettext(str) { + return { + toString: function() { + return l10n.gettext(str); + }, + }; + } + var limit = 24; // Endpoints where feat. profile enabled if conditions met. See apiArgs(). diff --git a/src/media/js/content_filter.js b/src/media/js/content_filter.js index 518a53e328..3f7c7b4fb1 100644 --- a/src/media/js/content_filter.js +++ b/src/media/js/content_filter.js @@ -8,7 +8,7 @@ define('content_filter', storage, utils, views, z, _) { 'use strict'; var logger = log('content_filter'); - var gettext = l10n.gettext_lazy; + var gettext = l10n.gettext; // Use the caps.os for a more fine grained definition of "desktop". var isDesktop = caps.os.type === 'desktop';