1
0
mirror of https://github.com/flarum/core.git synced 2025-08-02 14:37:49 +02:00

Primary key renaming

Improved consistency for existing core translation key names.

See flarum/core#265
- Completely overhauled core en.yml
- Replaced existing key names in all core JS files to match
- Extracted a hardcoded string in IndexPage.js
- Combined two app.trans calls in DiscussionControls.js
- Removed hardcoded spaces from LogInModal.js and SignUpModal.js
- Added two new keys from DiscussionControls.js (soft delete)
- Created two new “reused keys” to YML to accommodate same
This commit is contained in:
dcsjapan
2015-09-23 14:58:33 +09:00
parent ee9862004d
commit d5d7185794
40 changed files with 344 additions and 210 deletions

View File

@@ -71,7 +71,7 @@ export default class PostStreamScrubber extends Component {
const unreadCount = this.props.stream.discussion.unreadCount();
const unreadPercent = Math.min(this.count() - this.index, unreadCount) / this.count();
const viewing = app.trans('core.viewing_posts', {
const viewing = app.trans('core.post_scrubber_viewing_text', {
index: <span className="Scrubber-index">{retain || formatNumber(this.visibleIndex())}</span>,
count: <span className="Scrubber-count">{formatNumber(this.count())}</span>
});
@@ -101,7 +101,7 @@ export default class PostStreamScrubber extends Component {
<div className="Dropdown-menu dropdown-menu">
<div className="Scrubber">
<a className="Scrubber-first" onclick={this.goToFirst.bind(this)}>
{icon('angle-double-up')} {app.trans('core.original_post')}
{icon('angle-double-up')} {app.trans('core.post_scrubber_original_post_link')}
</a>
<div className="Scrubber-scrollbar">
@@ -116,12 +116,12 @@ export default class PostStreamScrubber extends Component {
<div className="Scrubber-after"/>
<div className="Scrubber-unread" config={styleUnread}>
{app.trans('core.unread_posts', {count: unreadCount})}
{app.trans('core.post_scrubber_unread_text', {count: unreadCount})}
</div>
</div>
<a className="Scrubber-last" onclick={this.goToLast.bind(this)}>
{icon('angle-double-down')} {app.trans('core.now')}
{icon('angle-double-down')} {app.trans('core.post_scrubber_now_link')}
</a>
</div>
</div>