From 1fd50634f0798cf50c782c50510ac8221fc0e928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 6 Apr 2015 13:23:57 +0200 Subject: [PATCH] FIX: translation issues with top periods --- .../discourse/components/navigation-item.js.es6 | 16 ++++++++-------- .../controllers/navigation/default.js.es6 | 1 + .../discourse/helpers/period-title.js.es6 | 10 ++++++---- config/locales/client.en.yml | 12 +++++++----- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/app/assets/javascripts/discourse/components/navigation-item.js.es6 b/app/assets/javascripts/discourse/components/navigation-item.js.es6 index e66fdd276cd..56927d55bb1 100644 --- a/app/assets/javascripts/discourse/components/navigation-item.js.es6 +++ b/app/assets/javascripts/discourse/components/navigation-item.js.es6 @@ -10,14 +10,14 @@ export default Ember.Component.extend(StringBuffer, { title: function() { var categoryName = this.get('content.categoryName'), name = this.get('content.name'), - extra; + extra = {}; if (categoryName) { - extra = { categoryName: categoryName }; name = "category"; + extra.categoryName = categoryName; } - return I18n.t("filters." + name + ".help", extra); - }.property("content.name"), + return I18n.t("filters." + name.replace("/", ".") + ".help", extra); + }.property("content.{categoryName,name}"), active: function() { return this.get('content.filterMode') === this.get('filterMode') || @@ -33,11 +33,11 @@ export default Ember.Component.extend(StringBuffer, { name = 'category'; extra.categoryName = Discourse.Formatter.toTitleCase(categoryName); } - return I18n.t("filters." + name + ".title", extra); - }.property('content.count'), + return I18n.t("filters." + name.replace("/", ".") + ".title", extra); + }.property('content.{categoryName,name,count}'), - renderString: function(buffer) { - var content = this.get('content'); + renderString(buffer) { + const content = this.get('content'); buffer.push(""); if (content.get('hasIcon')) { buffer.push(""); diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 index b2b612a422a..65bf5731933 100644 --- a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 +++ b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 @@ -2,6 +2,7 @@ import DiscourseController from 'discourse/controllers/controller'; export default DiscourseController.extend({ needs: ['discovery', 'discovery/topics'], + categories: function() { return Discourse.Category.list(); }.property(), diff --git a/app/assets/javascripts/discourse/helpers/period-title.js.es6 b/app/assets/javascripts/discourse/helpers/period-title.js.es6 index c856439349f..36ca2a69205 100644 --- a/app/assets/javascripts/discourse/helpers/period-title.js.es6 +++ b/app/assets/javascripts/discourse/helpers/period-title.js.es6 @@ -1,9 +1,11 @@ import { iconHTML } from 'discourse/helpers/fa-icon'; -const TITLE_SUBS = { yearly: 'this_year', - monthly: 'this_month', - daily: 'today', - all: 'all' }; +const TITLE_SUBS = { + all: 'all_time', + yearly: 'this_year', + monthly: 'this_month', + daily: 'today', +}; export default Ember.Handlebars.makeBoundHelper(function (period) { const title = I18n.t('filters.top.' + (TITLE_SUBS[period] || 'this_week')); diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 042864382ec..76a0c9f4115 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1552,15 +1552,17 @@ en: top: title: "Top" help: "the most active topics in the last year, month, week or day" + all: + title: "All Time" yearly: - title: "Top Yearly" + title: "Yearly" monthly: - title: "Top Monthly" + title: "Monthly" weekly: - title: "Top Weekly" + title: "Weekly" daily: - title: "Top Daily" - all: "All Time" + title: "Daily" + all_time: "All Time" this_year: "This year" this_month: "This month" this_week: "This week"