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
Login plugin language reworked #19333
Conversation
"InvalidNonceToken": "The form security failed because of a token mismatch. Please reload the form and check that your cookies are on.", | ||
"InvalidNonceReferrer": "The form security failed because of an invalid referral header. If you are using a proxy server, you must %1$sconfigure Matomo to accept the proxy header%2$s that forwards the host header. Also, check that your referral header is sent correctly. If you previously connected using HTTPS, please ensure you are connecting over a secure (SSL/TLS) connection and try again.", | ||
"InvalidNonceUnexpectedReferrer" : "The form security failed because the referral header is different from the expected referral header. Check that your referral header is sent correctly.", | ||
"InvalidNonceOrigin": "The form security failed because of invalid origin. If you previously connected using HTTPS, please ensure you are connecting over a secure (SSL/TLS) connection and try again.", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The "invalid origin" part is a bit cryptic. What does that mean?
plugins/Login/lang/en.json
Outdated
"InvalidNonceSSLMisconfigured": "Also, you may %1$s force Matomo to use a secure connection%2$s: in your config file %3$s set %4$s below section %5$s", | ||
"InvalidOrExpiredToken": "Token is invalid or has expired.", | ||
"InvalidNonceToken": "The form security failed because of a token mismatch. Please reload the form and check that your cookies are on.", | ||
"InvalidNonceReferrer": "The form security failed because of an invalid referral header. If you are using a proxy server, you must %1$sconfigure Matomo to accept the proxy header%2$s that forwards the host header. Also, check that your referral header is sent correctly. If you previously connected using HTTPS, please ensure you are connecting over a secure (SSL/TLS) connection and try again.", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removed some whitespace before %2$s, and after %1$s. Not sure about that.
This should actually be "referer" https://en.wikipedia.org/wiki/HTTP_referer
but it looks off, and arguably worse in non-translation.
It could be quoted as such though. Something to consider.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Removing the whitespaces is fine. There are a
tags inserted.
I think writing "Referer"-Header
might be more accurate than using referral header
This issue is in "needs review" but there has been no activity for 7 days. ping @matomo-org/core-reviewers |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've suggested a few final changes, after which this can be approved and merged.
Thanks!
Co-authored-by: Justin Velluppillai <justinvelluppillai@gmail.com>
@justinvelluppillai Top stuff. |
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Description:
Generally shorter and to the point.
In line with other edits.
Review