github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2024-12-05 09:03:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert to "go to email provider" button

Browse Source
This commit is contained in:
Toby Zerner 2015-09-24 14:22:14 +09:30
parent 0330c4088d
commit 15a3b46a1e
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
framework/core/js/forum/src/components/ChangeEmailModal.js
View File

@ -41,9 +41,8 @@ export default class ChangeEmailModal extends Modal {
<div className="Form Form--centered"> <div className="Form Form--centered">
<p className="helpText">{app.trans('core.change_email_confirmation_message', {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"> <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"> <a href={'http://' + emailProviderName} className="Button Button--primary Button--block">
{app.trans('core.change_email_dismiss_button', {location: emailProviderName})} {app.trans('core.change_email_go_to_button', {url: emailProviderName})}
</a> </a>
</div> </div>
</div> </div>

3
framework/core/js/forum/src/components/ForgotPasswordModal.js
View File

@ -46,9 +46,8 @@ export default class ForgotPasswordModal extends Modal {
<div className="Form Form--centered"> <div className="Form Form--centered">
<p className="helpText">{app.trans('core.forgot_password_email_sent_message')}</p> <p className="helpText">{app.trans('core.forgot_password_email_sent_message')}</p>
<div className="Form-group"> <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"> <a href={'http://' + emailProviderName} className="Button Button--primary Button--block">
{app.trans('core.forgot_password_dismiss_button', {location: emailProviderName})} {app.trans('core.forgot_password_go_to_button', {url: emailProviderName})}
</a> </a>
</div> </div>
</div> </div>

3
framework/core/js/forum/src/components/SignUpModal.js
View File

@ -124,9 +124,8 @@ export default class SignUpModal extends Modal {
<p>{app.trans('core.sign_up_confirmation_message', {email: <strong>{user.email()}</strong>})}</p> <p>{app.trans('core.sign_up_confirmation_message', {email: <strong>{user.email()}</strong>})}</p>
<p> <p>
// Core Key Reorganization: This needs to be changed to a dismiss button!
<a href={`http://${emailProviderName}`} className="Button Button--primary" target="_blank"> <a href={`http://${emailProviderName}`} className="Button Button--primary" target="_blank">
{app.trans('core.sign_up_dismiss_button', {location: emailProviderName})} {app.trans('core.sign_up_go_to_button', {url: emailProviderName})}
</a> </a>
</p> </p>
</div> </div>

8
framework/core/locale/en.yml
View File

@ -6,7 +6,7 @@ core:
# These strings are used in the Change Email modal dialog. # These strings are used in the Change Email modal dialog.
change_email_confirmation_message: => core.confirmation_email_sent change_email_confirmation_message: => core.confirmation_email_sent
change_email_dismiss_button: => core.okay change_email_go_to_button: => core.go_to_url
change_email_submit_button: => core.save_changes change_email_submit_button: => core.save_changes
change_email_title: => core.change_email change_email_title: => core.change_email
@ -64,7 +64,7 @@ core:
edit_user_username_label: => core.username edit_user_username_label: => core.username
# These strings are used in the Forgot Password modal dialog. # These strings are used in the Forgot Password modal dialog.
forgot_password_dismiss_button: => core.okay forgot_password_go_to_button: => core.go_to_url
forgot_password_email_placeholder: => core.email forgot_password_email_placeholder: => core.email
forgot_password_email_sent_message: We've sent you an email containing a link to reset your password. Check your spam folder if you don't receive it within the next minute or two. forgot_password_email_sent_message: We've sent you an email containing a link to reset your password. Check your spam folder if you don't receive it within the next minute or two.
forgot_password_submit_button: Recover Password forgot_password_submit_button: Recover Password
@ -158,7 +158,7 @@ core:
sign_up_already_have_account_text: "Already have an account? " # Final space is needed for string separation. sign_up_already_have_account_text: "Already have an account? " # Final space is needed for string separation.
sign_up_confirmation_message: => core.confirmation_email_sent sign_up_confirmation_message: => core.confirmation_email_sent
sign_up_email_placeholder: => core.email sign_up_email_placeholder: => core.email
sign_up_dismiss_button: => core.okay sign_up_go_to_button: => core.go_to_url
sign_up_log_in_link: => core.log_in sign_up_log_in_link: => core.log_in
sign_up_password_placeholder: => core.password sign_up_password_placeholder: => core.password
sign_up_submit_button: => core.sign_up sign_up_submit_button: => core.sign_up
@ -196,11 +196,11 @@ core:
discussions: Discussions discussions: Discussions
edit: Edit edit: Edit
email: Email email: Email
go_to_url: "Go to {url}"
load_more: Load More load_more: Load More
log_in: Log In log_in: Log In
mark_all_as_read: Mark All as Read mark_all_as_read: Mark All as Read
notifications: Notifications notifications: Notifications
okay: OK
password: Password password: Password
restore: Restore restore: Restore
save_changes: Save Changes save_changes: Save Changes