mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-12 07:24:27 +02:00
Code Issues Releases Wiki Activity

Add third tier to key namespacing

Browse Source 
- Changes all `app.trans` calls to `app.translator.trans` calls.
- Changes existing keys to [three-tier namespace structure](https://github.com/flarum/english/pull/12).
- Extracts additional strings for `lib:` namespace.
- Extracts two previously missed strings for EditGroupModal.js.
This commit is contained in:
dcsjapan
2015-10-20 13:04:43 +09:00
parent a9eb62880e
commit 49d59089e4
54 changed files with 216 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
js/forum/src/components/SignUpModal.js
View File

@@ -53,7 +53,7 @@ export default class SignUpModal extends Modal {
}
title() {
return app.trans('core.forum.sign_up_title');
return app.translator.trans('core.forum.sign_up.title');
}
content() {
@@ -73,14 +73,14 @@ export default class SignUpModal extends Modal {
<div className="Form Form--centered">
<div className="Form-group">
<input className="FormControl" name="username" placeholder={extractText(app.trans('core.forum.sign_up_username_placeholder'))}
<input className="FormControl" name="username" placeholder={extractText(app.translator.trans('core.forum.sign_up.username_placeholder'))}
value={this.username()}
onchange={m.withAttr('value', this.username)}
disabled={this.loading} />
</div>
<div className="Form-group">
<input className="FormControl" name="email" type="email" placeholder={extractText(app.trans('core.forum.sign_up_email_placeholder'))}
<input className="FormControl" name="email" type="email" placeholder={extractText(app.translator.trans('core.forum.sign_up.email_placeholder'))}
value={this.email()}
onchange={m.withAttr('value', this.email)}
disabled={this.loading || (this.props.token && this.props.email)} />
@@ -88,7 +88,7 @@ export default class SignUpModal extends Modal {
{this.props.token ? '' : (
<div className="Form-group">
<input className="FormControl" name="password" type="password" placeholder={extractText(app.trans('core.forum.sign_up_password_placeholder'))}
<input className="FormControl" name="password" type="password" placeholder={extractText(app.translator.trans('core.forum.sign_up.password_placeholder'))}
value={this.password()}
onchange={m.withAttr('value', this.password)}
disabled={this.loading} />
@@ -100,7 +100,7 @@ export default class SignUpModal extends Modal {
className="Button Button--primary Button--block"
type="submit"
loading={this.loading}>
{app.trans('core.forum.sign_up_submit_button')}
{app.translator.trans('core.forum.sign_up.submit_button')}
</Button>
</div>
</div>
@@ -119,13 +119,13 @@ export default class SignUpModal extends Modal {
<div className="darkenBackground">
<div className="container">
{avatar(user)}
<h3>{app.trans('core.forum.sign_up_welcome_text', {user})}</h3>
<h3>{app.translator.trans('core.forum.sign_up.welcome_text', {user})}</h3>
<p>{app.trans('core.forum.sign_up_confirmation_message', {email: <strong>{user.email()}</strong>})}</p>
<p>{app.translator.trans('core.forum.sign_up.confirmation_message', {email: <strong>{user.email()}</strong>})}</p>
<p>
<Button className="Button Button--primary" onclick={this.hide.bind(this)}>
{app.trans('core.forum.sign_up_dismiss_button')}
{app.translator.trans('core.forum.sign_up.dismiss_button')}
</Button>
</p>
</div>
@@ -140,7 +140,7 @@ export default class SignUpModal extends Modal {
footer() {
return [
<p className="SignUpModal-logIn">
{app.trans('core.forum.sign_up_log_in_text', {a: <a onclick={this.logIn.bind(this)}/>})}
{app.translator.trans('core.forum.sign_up.log_in_text', {a: <a onclick={this.logIn.bind(this)}/>})}
</p>
];
}