1
0
mirror of https://github.com/flarum/core.git synced 2025-07-29 12:40:40 +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

@@ -29,7 +29,7 @@ export default class ChangeEmailModal extends Modal {
}
title() {
return app.trans('core.change_email');
return app.trans('core.change_email_title');
}
content() {
@@ -39,10 +39,11 @@ export default class ChangeEmailModal extends Modal {
return (
<div className="Modal-body">
<div className="Form Form--centered">
<p className="helpText">{app.trans('core.confirmation_email_sent', {email: <strong>{this.email()}</strong>})}</p>
<p className="helpText">{app.trans('core.change_email_confirmation_message', {email: <strong>{this.email()}</strong>})}</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.change_email_dismiss_button', {location: emailProviderName})}
</a>
</div>
</div>
@@ -65,7 +66,7 @@ export default class ChangeEmailModal extends Modal {
className: 'Button Button--primary Button--block',
type: 'submit',
loading: this.loading,
children: app.trans('core.save_changes')
children: app.trans('core.change_email_submit_button')
})}
</div>
</div>