diff --git a/app/assets/javascripts/discourse/components/global-notice.js.es6 b/app/assets/javascripts/discourse/components/global-notice.js.es6 index 553b13699f9..8a213ae8a4b 100644 --- a/app/assets/javascripts/discourse/components/global-notice.js.es6 +++ b/app/assets/javascripts/discourse/components/global-notice.js.es6 @@ -4,7 +4,7 @@ export default Ember.Component.extend(StringBuffer, { rerenderTriggers: ['site.isReadOnly'], renderString: function(buffer) { - var notices = []; + let notices = []; if (this.site.get("isReadOnly")) { notices.push([I18n.t("read_only_mode.enabled"), 'alert-read-only']); @@ -14,8 +14,12 @@ export default Ember.Component.extend(StringBuffer, { notices.push([I18n.t("emails_are_disabled"), 'alert-emails-disabled']); } + if (this.siteSettings.enable_s3_uploads) { + notices.push([I18n.t("s3_deprecation_warning"), 'alert-s3-deprecation']); + } + if (Discourse.User.currentProp('admin') && this.siteSettings.show_create_topics_notice) { - var topic_count = 0, + let topic_count = 0, post_count = 0; _.each(this.site.get('categories'), function(c) { if (!c.get('read_restricted')) { @@ -24,7 +28,7 @@ export default Ember.Component.extend(StringBuffer, { } }); if (topic_count < 5 || post_count < this.siteSettings.tl1_requires_read_posts) { - notices.push([I18n.t("too_few_topics_notice", {posts: this.siteSettings.tl1_requires_read_posts}), 'alert-too-few-topics']); + notices.push([I18n.t("too_few_topics_notice", { posts: this.siteSettings.tl1_requires_read_posts }), 'alert-too-few-topics']); } } @@ -33,9 +37,7 @@ export default Ember.Component.extend(StringBuffer, { } if (notices.length > 0) { - buffer.push(_.map(notices, function(arr) { - return "