mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-30 05:00:56 +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

13
js/forum/src/components/ForgotPasswordModal.js
View File

@@ -34,7 +34,7 @@ export default class ForgotPasswordModal extends Modal {
}
title() {
return app.trans('core.forgot_password');
return app.trans('core.forgot_password_title');
}
content() {
@@ -44,10 +44,11 @@ export default class ForgotPasswordModal extends Modal {
return (
<div className="Modal-body">
<div className="Form Form--centered">
<p className="helpText">{app.trans('core.password_reset_email_sent')}</p>
<p className="helpText">{app.trans('core.forgot_password_email_sent_message')}</p>
<div className="Form-group">
// Core Key Reorganization: This needs to be changed to a dismiss button!
<a href={'http://' + emailProviderName} className="Button Button--primary Button--block">
{app.trans('core.go_to', {location: emailProviderName})}
{app.trans('core.forgot_password_dismiss_button', {location: emailProviderName})}
</a>
</div>
</div>
@@ -58,9 +59,9 @@ export default class ForgotPasswordModal extends Modal {
return (
<div className="Modal-body">
<div className="Form Form--centered">
<p className="helpText">{app.trans('core.forgot_password_help')}</p>
<p className="helpText">{app.trans('core.forgot_password_text')}</p>
<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.forgot_password_email_placeholder')}
value={this.email()}
onchange={m.withAttr('value', this.email)}
disabled={this.loading} />
@@ -70,7 +71,7 @@ export default class ForgotPasswordModal extends Modal {
className: 'Button Button--primary Button--block',
type: 'submit',
loading: this.loading,
children: app.trans('core.recover_password')
children: app.trans('core.forgot_password_submit_button')
})}
</div>
</div>