Skip to content

Commit

Permalink
Revert "Replace APOSTROPHE with RIGHT SINGLE QUOTATION MARK in locale (
Browse files Browse the repository at this point in the history
…#1006)" (#1007)

This reverts commit 1396e7e.
  • Loading branch information
Stefanni Brasil authored Mar 18, 2024
1 parent 1396e7e commit 59bc147
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
3 changes: 0 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ 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 didnt 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 cant 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 cant be blank.
failure_when_missing_email: Email can't 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 cant be blank/i)
expect(flash.now[:alert]).to match(/email can't be blank/i)
expect(response).to render_template(:new)
end

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

expect(flash.now[:alert]).to match(/email cant be blank/i)
expect(flash.now[:alert]).to match(/email can't 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 cant 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
Expand Down

0 comments on commit 59bc147

Please sign in to comment.