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.

Sign up for GitHub

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

Jump to bottom

PRO-2449 Fixes i18n processing of login throttle message #3635

Merged
merged 1 commit into from Jan 24, 2022
Merged

PRO-2449 Fixes i18n processing of login throttle message #3635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
@@ -1,11 +1,12 @@
# Changelog

## 2.220.8 (2022-01-20)
## Unreleased

## Fixes

* Fixes overflowing issue in the editor modals when adding multiple options to an area. This used to cause a scroll to appear and the user had to scroll to see all the options.
* In the editor modal if there was an area with multiple items added (enough to make the page scrollable) when the user wanted to add another item another scroll bar would appear besides the already existing one and the user had to scroll to see all the options.
* Fixes i18n processing of a login throttling error message.

## 2.220.7 (2021-10-13)

Expand Down
2 changes: 1 addition & 1 deletion lib/modules/apostrophe-login/index.js
View file
Open in desktop
Expand Up @@ -455,7 +455,7 @@ module.exports = {
}

self.getThrottleLoginErr = function (req, minutes) {
return req.__ns_n(
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're not really using __ns_n anywhere else. looked at the i18n docs for the related method and I don't know if our string here would work. We could change the arguments passed to the original method, though I wasn't clear on that using our wrapper method and there weren't relevant other usages to use as a guide. Ultimately using the simpler method gets this message the same place it woudl have got to before.

return req.__ns(
'apostrophe',
'Too many login attempts. You may try again in %s minute(s).',
minutes
Expand Down