diff --git a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs index 6d934e9ad0d..9446d48d48a 100644 --- a/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs +++ b/app/assets/javascripts/discourse/app/templates/discovery/topics.hbs @@ -42,10 +42,10 @@ {{/if}} {{else if this.top}} - {{i18n "topic.browse_all_categories"}}, {{i18n "topic.view_latest_topics"}} {{i18n "or"}} {{i18n "filters.top.other_periods"}} + {{html-safe (i18n "topic.browse_all_categories_latest_or_top" basePath=(base-path))}} {{else}} - {{i18n "topic.browse_all_categories"}} {{i18n "or"}} {{i18n "topic.view_latest_topics"}} + {{html-safe (i18n "topic.browse_all_categories_latest" basePath=(base-path))}} {{/if}} {{/if}} diff --git a/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs index 1e6cf38bccf..25168732553 100644 --- a/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs +++ b/app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs @@ -46,10 +46,10 @@ {{/if}} {{else if this.top}} - {{i18n "topic.browse_all_categories"}}, {{i18n "topic.view_latest_topics"}} {{i18n "or"}} {{i18n "filters.top.other_periods"}} + {{html-safe (i18n "topic.browse_all_categories_latest_or_top" basePath=(base-path))}} {{else}} - {{i18n "topic.browse_all_categories"}} {{i18n "or"}} {{i18n "topic.view_latest_topics"}} + {{html-safe (i18n "topic.browse_all_categories_latest" basePath=(base-path))}} {{/if}} {{/if}} diff --git a/app/assets/javascripts/discourse/app/templates/tag/show.hbs b/app/assets/javascripts/discourse/app/templates/tag/show.hbs index 8df5024ab19..7f4c4bc69b9 100644 --- a/app/assets/javascripts/discourse/app/templates/tag/show.hbs +++ b/app/assets/javascripts/discourse/app/templates/tag/show.hbs @@ -57,7 +57,7 @@ {{#unless this.list.canLoadMore}} - {{i18n "topic.browse_all_tags"}} {{i18n "or"}} {{i18n "topic.view_latest_topics"}}. + {{html-safe (i18n "topic.browse_all_tags_or_latest" basePath=(base-path))}} {{/unless}} diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 0b74d42eb62..67a54b2b515 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -278,7 +278,6 @@ en: conduct: "Code of Conduct" mobile_view: "Mobile View" desktop_view: "Desktop View" - or: "or" now: "just now" read_more: "read more" more: "More" @@ -2908,10 +2907,10 @@ en: # This string uses the ICU Message Format. See https://meta.discourse.org/t/7035 for translation guidelines. bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}" - browse_all_categories: Browse all categories - browse_all_tags: Browse all tags + browse_all_categories_latest: "Browse all categories or view latest topics." + browse_all_categories_latest_or_top: "Browse all categories, view latest topics or see top:" + browse_all_tags_or_latest: "Browse all tags or view latest topics." - view_latest_topics: view latest topics suggest_create_topic: Ready to start a new conversation? jump_reply_up: jump to earlier reply jump_reply_down: jump to later reply @@ -3910,7 +3909,6 @@ en: this_month: "Month" this_week: "Week" today: "Today" - other_periods: "see top:" browser_update: 'Unfortunately, your browser is unsupported. Please switch to a supported browser to view rich content, log in and reply.'