From 6d140a3f48dd7fb550d5caea4a874aa9c7f38afe Mon Sep 17 00:00:00 2001 From: Henrique Harman Date: Fri, 11 Aug 2017 16:52:18 -0400 Subject: [PATCH 1/4] Pass in key, not t object --- app/controllers/discover.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/discover.js b/app/controllers/discover.js index 7383f5845..59c53532f 100644 --- a/app/controllers/discover.js +++ b/app/controllers/discover.js @@ -65,8 +65,8 @@ export default Ember.Controller.extend(Analytics, { provider: '', // Provider query param. Must be passed to component, so can be reflected in URL q: '', // q query param. Must be passed to component, so can be reflected in URL queryParams: ['page', 'q', 'sources', 'tags', 'type', 'start', 'end', 'subject', 'provider'], // Pass in the list of queryParams for this component - searchPlaceholder: Ember.computed('i18n', 'additionalProviders', function() { // Search bar placeholder - return this.get('additionalProviders') ? this.get('i18n').t('discover.search.repository_placeholder'): this.get('i18n').t('discover.search.placeholder'); + searchPlaceholder: Ember.computed('additionalProviders', function() { // Search bar placeholder + return this.get('additionalProviders') ? 'discover.search.repository_placeholder': 'discover.search.placeholder'; }), showActiveFilters: Ember.computed('additionalProviders', function() { // Whether Active Filters should be displayed. // additionalProviders are using SHARE facets which do not work with Active Filters at this time From 3b351ca79001713ee3f6145c1910782a785341bb Mon Sep 17 00:00:00 2001 From: Henrique Harman Date: Mon, 14 Aug 2017 11:42:37 -0400 Subject: [PATCH 2/4] Pass in key instead of t --- app/controllers/discover.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/discover.js b/app/controllers/discover.js index 59c53532f..6ca209dcb 100644 --- a/app/controllers/discover.js +++ b/app/controllers/discover.js @@ -24,9 +24,9 @@ export default Ember.Controller.extend(Analytics, { }), consumingService: 'preprints', // Consuming service - preprints here detailRoute: 'content', // Name of detail route for this application - discoverHeader: Ember.computed('i18n', 'additionalProviders', function() { // Header for preprints discover page + discoverHeader: Ember.computed('additionalProviders', function() { // Header for preprints discover page // If additionalProviders, use more generic Repository Search page title - return this.get('additionalProviders') ? this.get('i18n').t('discover.search.heading_repository_search') : this.get('i18n').t('discover.search.heading'); + return this.get('additionalProviders') ? 'discover.search.heading_repository_search' : 'discover.search.heading'; }), end: '', // End query param. Must be passed to component, so can be reflected in the URL externalProviders: Ember.computed('model', function() { From 43788f5c8f843202229f476ec6efed22a8b6d503 Mon Sep 17 00:00:00 2001 From: "James C. Davis" Date: Mon, 14 Aug 2017 14:53:24 -0400 Subject: [PATCH 3/4] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ac52375e6..63eaab807 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "preprint-service", - "version": "0.111.13", + "version": "0.111.14", "description": "Center for Open Science Preprint Service", "private": true, "directories": { From 2906a2486773e055d56b2258869fd2ff3fe65136 Mon Sep 17 00:00:00 2001 From: "James C. Davis" Date: Mon, 14 Aug 2017 14:54:42 -0400 Subject: [PATCH 4/4] Upgrade to ember-osf@0.8.5 --- package.json | 2 +- yarn.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 63eaab807..c5adf2170 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "author": "", "license": "Apache-2.0", "devDependencies": { - "@centerforopenscience/ember-osf": "0.8.4", + "@centerforopenscience/ember-osf": "0.8.5", "autoprefixer": "6.3.7", "broccoli-asset-rev": "2.4.2", "coveralls": "2.11.16", diff --git a/yarn.lock b/yarn.lock index 9d4deabeb..63c05fc47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,9 +2,9 @@ # yarn lockfile v1 -"@centerforopenscience/ember-osf@0.8.4": - version "0.8.4" - resolved "https://registry.yarnpkg.com/@centerforopenscience/ember-osf/-/ember-osf-0.8.4.tgz#52c27a20bcf56e015e5d5f8da03a3b0bcbbdee7d" +"@centerforopenscience/ember-osf@0.8.5": + version "0.8.5" + resolved "https://registry.yarnpkg.com/@centerforopenscience/ember-osf/-/ember-osf-0.8.5.tgz#c18485b0b87e3f1f3e959bc8b7697038fb9e2596" dependencies: broccoli-funnel "1.2.0" broccoli-merge-trees "2.0.0"