Merge branch 'hotfix/0.111.14'

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() {
@@ -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

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": {
@@ -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",

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"