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

Installation language reworked #18487

Merged
merged 8 commits into from Jan 21, 2022

Conversation

comradekingu
Copy link
Contributor

Description:

Please include a description of this change and which issue it fixes. If no issue exists yet please include context and what problem it solves.

Review

"SystemCheckError": "An error occured - must be fixed before you proceed",
"SystemCheckEvalHelp": "Required by HTML QuickForm and Smarty templating system.",
"SystemCheckError": "An error occured and must be fixed before proceeding",
"SystemCheckEvalHelp": "Required by HTML QuickForm and the Twig templating system.",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Guessing here.

@sgiehl sgiehl added c: i18n For issues around internationalisation and localisation. Needs Review PRs that need a code review labels Dec 13, 2021
@justinvelluppillai
Copy link
Contributor

Thanks @comradekingu for this PR. As there are some high impact changes here we will just discuss internally before merging this one.

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.

Thanks @comradekingu for your work. I have suggested a few changes and several things to revert and then we can merge many good fixes here.

plugins/Installation/lang/en.json Show resolved Hide resolved
plugins/Installation/lang/en.json Show resolved Hide resolved
"DatabaseErrorConnect": "Error while trying to connect to the database server",
"DatabaseServerVersion": "Database server version",
"DatabaseErrorConnect": "Could not connect to the database server",
"DatabaseServerVersion": "Database-server version",
Copy link
Contributor

Choose a reason for hiding this comment

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

These two are probably better to revert also. "Database-server" doesn't conform to existing language here, and "Error" is maybe more clear (little bit 50/50 on that one)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It isn't the server version for the database.
Triple noun needs the dash.
Is the connection made or not? This is what I want to know, not when the error happened.
"while trying" isn't specifying anything. There is no "while not trying".

plugins/Installation/lang/en.json Outdated Show resolved Hide resolved
plugins/Installation/lang/en.json Outdated Show resolved Hide resolved
"SystemCheckSummaryThereWereWarnings": "There are some issues with your system. Matomo will run, but you might experience some minor problems.",
"SystemCheckTimeLimitHelp": "On a high traffic website, executing the archiving process may require more time than currently allowed. If necessary, change the max_execution_time directive in your php.ini file.",
"SystemCheckSummaryThereWereWarnings": "There are some issues with your system. Matomo will run, but you might experience minor problems.",
"SystemCheckTimeLimitHelp": "On a high-traffic website, executing the archival process may take longer than currently allowed. If necessary, change the 'max_execution_time' directive in your php.ini file.",
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"SystemCheckTimeLimitHelp": "On a high-traffic website, executing the archival process may take longer than currently allowed. If necessary, change the 'max_execution_time' directive in your php.ini file.",
"SystemCheckTimeLimitHelp": "On a high traffic website, executing the archiving process may take longer than currently allowed. If necessary, change the 'max_execution_time' directive in your php.ini file.",

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 website isn't high, whereas the traffic on it is.

"SystemCheckWarnDomHelp": "You should enable the \"dom\" extension (e.g., install the \"php-dom\" and\/or \"php-xml\" package).",
"SystemCheckWarning": "Matomo will work normally but some features may be missing",
"SystemCheckWarnJsonHelp": "You should enable \"json\" extension (e.g., install the \"php-json\" package).",
"SystemCheckTrackerHelp": "Could not perform GET request to matomo.php. Try whitelisting this URL from HTTP authentication and disable 'mod_security' (you may have to ask your webhost). More info about the error can be found in the error log-file on your web server.",
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
"SystemCheckTrackerHelp": "Could not perform GET request to matomo.php. Try whitelisting this URL from HTTP authentication and disable 'mod_security' (you may have to ask your webhost). More info about the error can be found in the error log-file on your web server.",
"SystemCheckTrackerHelp": "Could not perform GET request to matomo.php. Try whitelisting this URL from HTTP authentication and disable 'mod_security' (you may have to ask your webhost). More info about the error can be found in the error log file on your server.",

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is good.

"FasterReportLoading": "faster report loading",
"SystemCheckZlibHelp": "Configure and rebuild PHP with the required \"zlib\" support, --with-zlib.",
"SystemCheckCronArchiveProcess": "Set up Cron",
"FasterReportLoading": "faster report-loading",
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggest reverting

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It isn't a faster report that is loading.

plugins/Installation/lang/en.json Outdated Show resolved Hide resolved
plugins/Installation/lang/en.json Outdated Show resolved Hide resolved
Co-authored-by: Justin Velluppillai <justinvelluppillai@gmail.com>
Co-authored-by: Stefan Giehl <stefan@matomo.org>
@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 Dec 22, 2021
@justinvelluppillai
Copy link
Contributor

Closing for now as this has gone stale but happy to merge with the suggested changes from review if you wish to reopen @comradekingu.

@justinvelluppillai justinvelluppillai removed the Needs Review PRs that need a code review label Jan 19, 2022
@comradekingu
Copy link
Contributor Author

comradekingu commented Jan 19, 2022

@justinvelluppillai If you reopen it I can fix it.
The suggested changes amount to one good change, and one omission.

@justinvelluppillai
Copy link
Contributor

Be all good to merge if you can action the changes mentioned. Nothing major there I agree, but good to keep them for consistency and other various reasons overall.

@comradekingu
Copy link
Contributor Author

@justinvelluppillai Why the concern for supposed consistency matters down to the most minute detail here, and now, I really don't know. From what I can tell it is spectacularly bad all around. That matters.

Other PRs it was just fine to do this, but here it has to be some other way.
If not for having this needless consideration in place, I could have some impact on the entire string-base by now. In turn it could be easy to translate Matomo, whereas now it is a struggle.

@comradekingu
Copy link
Contributor Author

@justinvelluppillai Back up with no breaking changes, and "make sure some extra code is added to each of your webpages" from https://hosted.weblate.org/translate/matomo/plugin-installation/en/?checksum=4b65498c162f5541 reinstated.

justinvelluppillai and others added 2 commits January 19, 2022 16:19
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
@github-actions github-actions bot removed the Stale The label used by the Close Stale Issues action label Jan 20, 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.

Thanks for the updates and the contribution.

@justinvelluppillai justinvelluppillai merged commit 748de2d into matomo-org:4.x-dev Jan 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c: i18n For issues around internationalisation and localisation.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants