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
Conversation
"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.", |
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.
Guessing here.
Thanks @comradekingu for this PR. As there are some high impact changes here we will just discuss internally before merging this one. |
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.
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.
"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", |
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.
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)
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.
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
"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.", |
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.
"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.", |
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 website isn't high, whereas the traffic on it is.
plugins/Installation/lang/en.json
Outdated
"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.", |
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.
"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.", |
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.
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", |
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.
Suggest reverting
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.
It isn't a faster report that is loading.
Co-authored-by: Justin Velluppillai <justinvelluppillai@gmail.com>
Co-authored-by: Stefan Giehl <stefan@matomo.org>
This issue is in "needs review" but there has been no activity for 7 days. ping @matomo-org/core-reviewers |
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 If you reopen it I can fix it. |
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. |
@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. |
@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. |
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
Co-authored-by: Allan Nordhøy <epost@anotheragency.no>
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.
Thanks for the updates and the contribution.
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