Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace APOSTROPHE with RIGHT SINGLE QUOTATION MARK in locale #1006

Merged
merged 1 commit into from
Mar 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions config/locales/clearance.en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 didnt 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 cant 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 cant be blank.
helpers:
label:
password:
Expand Down
6 changes: 3 additions & 3 deletions spec/controllers/passwords_controller_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
password: {},
}

expect(flash.now[:alert]).to match(/email can't be blank/i)
expect(flash.now[:alert]).to match(/email cant be blank/i)
expect(response).to render_template(:new)
end

Expand All @@ -74,7 +74,7 @@
},
}

expect(flash.now[:alert]).to match(/email can't be blank/i)
expect(flash.now[:alert]).to match(/email cant be blank/i)
expect(response).to render_template(:new)
end

Expand Down Expand Up @@ -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 cant be blank/i)
expect(response).to have_http_status(:unprocessable_entity)
expect(response).to render_template(:edit)
end
Expand Down
Loading