Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Replace concatenated strings to simplify translation

This commit is contained in:
Gerhard Schlager 2022-12-10 15:22:21 +01:00 committed by Gerhard Schlager
parent d059c64485
commit 03f0b4f54b
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/app/templates/discovery/topics.hbs
View File

@ -42,10 +42,10 @@
<DiscourseLinkedText @action={{route-action "createTopic"}} @text="topic.suggest_create_topic" /> <DiscourseLinkedText @action={{route-action "createTopic"}} @text="topic.suggest_create_topic" />
{{/if}} {{/if}}
{{else if this.top}} {{else if this.top}}
<LinkTo @route="discovery.categories">{{i18n "topic.browse_all_categories"}}</LinkTo>, <LinkTo @route="discovery.latest">{{i18n "topic.view_latest_topics"}}</LinkTo> {{i18n "or"}} {{i18n "filters.top.other_periods"}} {{html-safe (i18n "topic.browse_all_categories_latest_or_top" basePath=(base-path))}}
<TopPeriodButtons @period={{this.period}} @action={{action "changePeriod"}} /> <TopPeriodButtons @period={{this.period}} @action={{action "changePeriod"}} />
{{else}} {{else}}
<LinkTo @route="discovery.categories"> {{i18n "topic.browse_all_categories"}}</LinkTo> {{i18n "or"}} <LinkTo @route="discovery.latest">{{i18n "topic.view_latest_topics"}}</LinkTo> {{html-safe (i18n "topic.browse_all_categories_latest" basePath=(base-path))}}
{{/if}} {{/if}}
</FooterMessage> </FooterMessage>
{{/if}} {{/if}}

4
app/assets/javascripts/discourse/app/templates/mobile/discovery/topics.hbs
View File

@ -46,10 +46,10 @@
<DiscourseLinkedText @action={{route-action "createTopic"}} @text="topic.suggest_create_topic" /> <DiscourseLinkedText @action={{route-action "createTopic"}} @text="topic.suggest_create_topic" />
{{/if}} {{/if}}
{{else if this.top}} {{else if this.top}}
<LinkTo @route="discovery.categories">{{i18n "topic.browse_all_categories"}}</LinkTo>, <LinkTo @route="discovery.latest">{{i18n "topic.view_latest_topics"}}</LinkTo> {{i18n "or"}} {{i18n "filters.top.other_periods"}} {{html-safe (i18n "topic.browse_all_categories_latest_or_top" basePath=(base-path))}}
<TopPeriodButtons @period={{this.period}} @action={{action "changePeriod"}} /> <TopPeriodButtons @period={{this.period}} @action={{action "changePeriod"}} />
{{else}} {{else}}
<LinkTo @route="discovery.categories"> {{i18n "topic.browse_all_categories"}}</LinkTo> {{i18n "or"}} <LinkTo @route="discovery.latest">{{i18n "topic.view_latest_topics"}}</LinkTo> {{html-safe (i18n "topic.browse_all_categories_latest" basePath=(base-path))}}
{{/if}} {{/if}}
</FooterMessage> </FooterMessage>
{{/if}} {{/if}}

2
app/assets/javascripts/discourse/app/templates/tag/show.hbs
View File

@ -57,7 +57,7 @@
{{#unless this.list.canLoadMore}} {{#unless this.list.canLoadMore}}
<FooterMessage @education={{this.footerEducation}} @message={{this.footerMessage}}> <FooterMessage @education={{this.footerEducation}} @message={{this.footerMessage}}>
<LinkTo @route="tags"> {{i18n "topic.browse_all_tags"}}</LinkTo> {{i18n "or"}} <LinkTo @route="discovery.latest">{{i18n "topic.view_latest_topics"}}</LinkTo>. {{html-safe (i18n "topic.browse_all_tags_or_latest" basePath=(base-path))}}
</FooterMessage> </FooterMessage>
{{/unless}} {{/unless}}
</footer> </footer>

8
config/locales/client.en.yml
View File

@ -278,7 +278,6 @@ en:
conduct: "Code of Conduct" conduct: "Code of Conduct"
mobile_view: "Mobile View" mobile_view: "Mobile View"
desktop_view: "Desktop View" desktop_view: "Desktop View"
or: "or"
now: "just now" now: "just now"
read_more: "read more" read_more: "read more"
more: "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. # 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}" bumped_at_title_MF: "{FIRST_POST}: {CREATED_AT}\n{LAST_POST}: {BUMPED_AT}"
browse_all_categories: Browse all categories browse_all_categories_latest: "<a href='%{basePath}/categories'>Browse all categories</a> or <a href='%{basePath}/latest'>view latest topics</a>."
browse_all_tags: Browse all tags browse_all_categories_latest_or_top: "<a href='%{basePath}/categories'>Browse all categories</a>, <a href='%{basePath}/latest'>view latest topics</a> or see top:"
browse_all_tags_or_latest: "<a href='%{basePath}/tags'>Browse all tags</a> or <a href='%{basePath}/latest'>view latest topics</a>."
view_latest_topics: view latest topics
suggest_create_topic: Ready to <a href>start a new conversation?</a> suggest_create_topic: Ready to <a href>start a new conversation?</a>
jump_reply_up: jump to earlier reply jump_reply_up: jump to earlier reply
jump_reply_down: jump to later reply jump_reply_down: jump to later reply
@ -3910,7 +3909,6 @@ en:
this_month: "Month" this_month: "Month"
this_week: "Week" this_week: "Week"
today: "Today" today: "Today"
other_periods: "see top:"
browser_update: 'Unfortunately, <a href="https://www.discourse.org/faq/#browser">your browser is unsupported</a>. Please <a href="https://browsehappy.com">switch to a supported browser</a> to view rich content, log in and reply.' browser_update: 'Unfortunately, <a href="https://www.discourse.org/faq/#browser">your browser is unsupported</a>. Please <a href="https://browsehappy.com">switch to a supported browser</a> to view rich content, log in and reply.'