diff --git a/framework/core/js/forum/src/components/ChangeEmailModal.js b/framework/core/js/forum/src/components/ChangeEmailModal.js index 8e5e22b67..ba32e9fd0 100644 --- a/framework/core/js/forum/src/components/ChangeEmailModal.js +++ b/framework/core/js/forum/src/components/ChangeEmailModal.js @@ -41,9 +41,8 @@ export default class ChangeEmailModal extends Modal {

{app.trans('core.change_email_confirmation_message', {email: {this.email()}})}

- // Core Key Reorganization: This needs to be changed to a dismiss button! - {app.trans('core.change_email_dismiss_button', {location: emailProviderName})} + {app.trans('core.change_email_go_to_button', {url: emailProviderName})}
diff --git a/framework/core/js/forum/src/components/ForgotPasswordModal.js b/framework/core/js/forum/src/components/ForgotPasswordModal.js index ef1e93fef..3bc297507 100644 --- a/framework/core/js/forum/src/components/ForgotPasswordModal.js +++ b/framework/core/js/forum/src/components/ForgotPasswordModal.js @@ -46,9 +46,8 @@ export default class ForgotPasswordModal extends Modal {

{app.trans('core.forgot_password_email_sent_message')}

- // Core Key Reorganization: This needs to be changed to a dismiss button! - {app.trans('core.forgot_password_dismiss_button', {location: emailProviderName})} + {app.trans('core.forgot_password_go_to_button', {url: emailProviderName})}
diff --git a/framework/core/js/forum/src/components/SignUpModal.js b/framework/core/js/forum/src/components/SignUpModal.js index 89e84b390..cd72fcf38 100644 --- a/framework/core/js/forum/src/components/SignUpModal.js +++ b/framework/core/js/forum/src/components/SignUpModal.js @@ -124,9 +124,8 @@ export default class SignUpModal extends Modal {

{app.trans('core.sign_up_confirmation_message', {email: {user.email()}})}

- // Core Key Reorganization: This needs to be changed to a dismiss button! - {app.trans('core.sign_up_dismiss_button', {location: emailProviderName})} + {app.trans('core.sign_up_go_to_button', {url: emailProviderName})}

diff --git a/framework/core/locale/en.yml b/framework/core/locale/en.yml index d7bc7e0ca..546258374 100644 --- a/framework/core/locale/en.yml +++ b/framework/core/locale/en.yml @@ -6,7 +6,7 @@ core: # These strings are used in the Change Email modal dialog. 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_title: => core.change_email @@ -64,7 +64,7 @@ core: edit_user_username_label: => core.username # 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_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 @@ -158,7 +158,7 @@ core: 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_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_password_placeholder: => core.password sign_up_submit_button: => core.sign_up @@ -196,11 +196,11 @@ core: discussions: Discussions edit: Edit email: Email + go_to_url: "Go to {url}" load_more: Load More log_in: Log In mark_all_as_read: Mark All as Read notifications: Notifications - okay: OK password: Password restore: Restore save_changes: Save Changes