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

Primary key renaming

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -52,7 +52,7 @@ export default class SignUpModal extends Modal {
}
title() {
return app.trans('core.sign_up');
return app.trans('core.sign_up_title');
}
content() {
@@ -72,14 +72,14 @@ export default class SignUpModal extends Modal {
<div className="Form Form--centered">
<div className="Form-group">
<input className="FormControl" name="username" placeholder={app.trans('core.username')}
<input className="FormControl" name="username" placeholder={app.trans('core.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={app.trans('core.email')}
<input className="FormControl" name="email" type="email" placeholder={app.trans('core.sign_up_email_placeholder')}
value={this.email()}
onchange={m.withAttr('value', this.email)}
disabled={this.loading || (this.props.token && this.props.email)} />
@@ -87,7 +87,7 @@ export default class SignUpModal extends Modal {
{this.props.token ? '' : (
<div className="Form-group">
<input className="FormControl" name="password" type="password" placeholder={app.trans('core.password')}
<input className="FormControl" name="password" type="password" placeholder={app.trans('core.sign_up_password_placeholder')}
value={this.password()}
onchange={m.withAttr('value', this.password)}
disabled={this.loading} />
@@ -99,7 +99,7 @@ export default class SignUpModal extends Modal {
className="Button Button--primary Button--block"
type="submit"
loading={this.loading}>
{app.trans('core.sign_up')}
{app.trans('core.sign_up_submit_button')}
</Button>
</div>
</div>
@@ -119,13 +119,14 @@ export default class SignUpModal extends Modal {
<div className="darkenBackground">
<div className="container">
{avatar(user)}
<h3>{app.trans('core.welcome_user', {user})}</h3>
<h3>{app.trans('core.sign_up_welcome_text', {user})}</h3>
<p>{app.trans('core.confirmation_email_sent', {email: <strong>{user.email()}</strong>})}</p>
<p>{app.trans('core.sign_up_confirmation_message', {email: <strong>{user.email()}</strong>})}</p>
<p>
// Core Key Reorganization: This needs to be changed to a dismiss button!
<a href={`http://${emailProviderName}`} className="Button Button--primary" target="_blank">
{app.trans('core.go_to', {location: emailProviderName})}
{app.trans('core.sign_up_dismiss_button', {location: emailProviderName})}
</a>
</p>
</div>
@@ -140,8 +141,9 @@ export default class SignUpModal extends Modal {
footer() {
return [
<p className="SignUpModal-logIn">
{app.trans('core.before_log_in_link')}{' '}
<a onclick={this.logIn.bind(this)}>{app.trans('core.log_in')}</a>
// Core Key Reorganization: Moved hardcoded space into preceding string.
{app.trans('core.sign_up_already_have_account_text')}
<a onclick={this.logIn.bind(this)}>{app.trans('core.sign_up_log_in_link')}</a>
</p>
];
}