diff --git a/CHANGELOG.md b/CHANGELOG.md index 0586b40fe..5962db8fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ complete changelog, see the git history for each version via the version links. ## [Unreleased] +- Replace APOSTROPHE (U+0027) with RIGHT SINGLE QUOTATION MARK (U+2019) in locale. +See https://github.com/rails/rails/pull/45463 + [Unreleased]: https://github.com/thoughtbot/clearance/compare/v2.6.2...main ## [2.6.2] January 15, 2024 diff --git a/config/locales/clearance.en.yml b/config/locales/clearance.en.yml index f302a64f7..078abb32d 100644 --- a/config/locales/clearance.en.yml +++ b/config/locales/clearance.en.yml @@ -6,18 +6,18 @@ en: change_password: Change your password clearance_mailer: change_password: - closing: If you didn't request this, ignore this email. Your password has + closing: If you didn’t request this, ignore this email. Your password has not been changed. link_text: Change my password opening: "Someone, hopefully you, requested we send you a link to change your password:" flashes: failure_after_create: Bad email or password. - failure_after_update: Password can't be blank. + failure_after_update: Password can’t be blank. failure_when_forbidden: Please double check the URL or try submitting the form again. failure_when_not_signed_in: Please sign in to continue. - failure_when_missing_email: Email can't be blank. + failure_when_missing_email: Email can’t be blank. helpers: label: password: diff --git a/spec/controllers/passwords_controller_spec.rb b/spec/controllers/passwords_controller_spec.rb index caaa8aa4c..d2e01b765 100644 --- a/spec/controllers/passwords_controller_spec.rb +++ b/spec/controllers/passwords_controller_spec.rb @@ -53,7 +53,7 @@ password: {}, } - expect(flash.now[:alert]).to match(/email can't be blank/i) + expect(flash.now[:alert]).to match(/email can’t be blank/i) expect(response).to render_template(:new) end @@ -74,7 +74,7 @@ }, } - expect(flash.now[:alert]).to match(/email can't be blank/i) + expect(flash.now[:alert]).to match(/email can’t be blank/i) expect(response).to render_template(:new) end @@ -278,7 +278,7 @@ new_password: "", ) - expect(flash.now[:alert]).to match(/password can't be blank/i) + expect(flash.now[:alert]).to match(/password can’t be blank/i) expect(response).to have_http_status(:unprocessable_entity) expect(response).to render_template(:edit) end