github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-05-23 23:29:57 +08:00
Code Issues Actions Packages Projects 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

19
js/forum/src/components/LogInModal.js
View File

@ -37,7 +37,7 @@ export default class LogInModal extends Modal {
}
title() {
return app.trans('core.log_in');
return app.trans('core.log_in_title');
}
content() {
@ -47,14 +47,14 @@ export default class LogInModal extends Modal {
<div className="Form Form--centered">
<div className="Form-group">
<input className="FormControl" name="email" placeholder={app.trans('core.username_or_email')}
<input className="FormControl" name="email" placeholder={app.trans('core.log_in_username_or_email_placeholder')}
value={this.email()}
onchange={m.withAttr('value', this.email)}
disabled={this.loading} />
</div>
<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.log_in_password_placeholder')}
value={this.password()}
onchange={m.withAttr('value', this.password)}
disabled={this.loading} />
@ -65,20 +65,21 @@ export default class LogInModal extends Modal {
className: 'Button Button--primary Button--block',
type: 'submit',
loading: this.loading,
children: app.trans('core.log_in')
children: app.trans('core.log_in_submit_button')
})}
</div>
</div>
</div>,
<div className="Modal-footer">
<p className="LogInModal-forgotPassword">
<a onclick={this.forgotPassword.bind(this)}>{app.trans('core.forgot_password_link')}</a>
<a onclick={this.forgotPassword.bind(this)}>{app.trans('core.log_in_forgot_password_link')}</a>
</p>
{app.forum.attribute('allowSignUp') ? (
<p className="LogInModal-signUp">
{app.trans('core.before_sign_up_link')}{' '}
<a onclick={this.signUp.bind(this)}>{app.trans('core.sign_up')}</a>
// Core Key Reorganization: Moved hardcoded space into preceding string.
{app.trans('core.log_in_no_account_text')}
<a onclick={this.signUp.bind(this)}>{app.trans('core.log_in_sign_up_link')}</a>
</p>
) : ''}
</div>
@ -131,12 +132,12 @@ export default class LogInModal extends Modal {
if (response && response.code === 'confirm_email') {
this.alert = Alert.component({
children: app.trans('core.email_confirmation_required', {email: response.email})
children: app.trans('core.log_in_confirmation_required_message', {email: response.email})
});
} else {
this.alert = Alert.component({
type: 'error',
children: app.trans('core.invalid_login')
children: app.trans('core.log_in_invalid_login_message')
});
}