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

Login plugin language reworked #19333

Merged
merged 5 commits into from Jun 23, 2022

Conversation

comradekingu
Copy link
Contributor

Description:

Generally shorter and to the point.
In line with other edits.

Review

"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.",
Copy link
Contributor Author

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?

"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.",
Copy link
Contributor Author

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.

Copy link
Member

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

@justinvelluppillai justinvelluppillai added the Needs Review PRs that need a code review label Jun 10, 2022
@github-actions
Copy link
Contributor

This issue is in "needs review" but there has been no activity for 7 days. ping @matomo-org/core-reviewers

@github-actions github-actions bot added the Stale The label used by the Close Stale Issues action label Jun 18, 2022
Copy link
Contributor

@justinvelluppillai justinvelluppillai left a 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!

@justinvelluppillai justinvelluppillai removed the Needs Review PRs that need a code review label Jun 22, 2022
Co-authored-by: Justin Velluppillai <justinvelluppillai@gmail.com>
@comradekingu
Copy link
Contributor Author

@justinvelluppillai Top stuff.

@github-actions github-actions bot removed the Stale The label used by the Close Stale Issues action label Jun 23, 2022
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
@justinvelluppillai justinvelluppillai merged commit 57524bb into matomo-org:4.x-dev Jun 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants