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

updates for PR #6638 - typos and grammar #6673

Merged
merged 7 commits into from
Sep 8, 2024

Conversation

henrivdr
Copy link
Contributor

@henrivdr henrivdr commented Sep 7, 2024

Including a marathon of resolving merge conflicts due to PRs today.
We should abolish multi-line msgids :-)

Description

This looks like a huge PR, but it is only fixes for typos and grammar.
On the previous PR #6638 I mistakenly used _en.po as the reference instead of the .pot.
It caused missed strings in the source and other .po files.
This around I triple checked again to make sure the msgids are in sync with the L"" strings in the code.

Comments, variable names and non-English translation strings were excluded.

I learnt that typos were "fixed" before by using translations. After this PR, those translations are no longer relevant and can be cleaned up.
Hopefully this sets a new baseline which will last us a while. :-)

Screenshots/Recordings/Graphs

Tests

The code compiled and ran successfully.
The translation files were verified with ./run_gettext.sh

I did not se any issues when running ./run_gettext.sh --full
Please confirm it again, before the merge.

@henrivdr henrivdr marked this pull request as ready for review September 8, 2024 00:51
@henrivdr henrivdr mentioned this pull request Sep 8, 2024
@SoftFever
Copy link
Owner

Thank you!
There is one last string missed, we need to add a , and space there:
image

Rests look all good.

For the multi-line message, don't worry about the link break positions. It won't cause problem as gettext handles it

@henrivdr
Copy link
Contributor Author

henrivdr commented Sep 8, 2024

How do you detect those missed ones?

The "gripe" I have with the (inconsistent) line breaks is that it makes it tricky to search across files for the substring/phrase of words which contains the typo word.
If I search for the affected word only it finds them in comments as well, which I chose to exclude from the first phase.
It's just makes it tedious and risky.

@SoftFever
Copy link
Owner

SoftFever commented Sep 8, 2024

How do you detect those missed ones?

The "gripe" I have with the (inconsistent) line breaks is that it makes it tricky to search across files for the substring/phrase of words which contains the typo word. If I search for the affected word only it finds them in comments as well, which I chose to exclude from the first phase. It's just makes it tedious and risky.

I can't figure out how to make gettext to generate consistent line breaks on different machines.
So my trick is:

  1. Before make any editing, run "run_gettext.bat --full" once
  2. Git stage the changes, this will be your new baseline
  3. Correct strings
  4. Run "run_gettext.bat --full" again
  5. Diff the changes against staged file, this will only show changes caused by your modifications.
  6. repeat step 3-5 until everything is corrected.

Copy link
Owner

@SoftFever SoftFever left a comment

Choose a reason for hiding this comment

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

LGTM
Thanks

@SoftFever SoftFever merged commit 7364b38 into SoftFever:main Sep 8, 2024
16 checks passed
@henrivdr
Copy link
Contributor Author

henrivdr commented Sep 8, 2024

I was actually still busy keeping gettexty happy. It moved a bunch of translations to the comment section.
The last commit , just now , fixes that. @SoftFever

e.g. from your last translations commit:
image

Do I have to make a seperate PR for that?

I've been running it al along with '-full', one '-'. 😫
Seems like I'll be doing some gettext docs reading. 🤓

@henrivdr henrivdr mentioned this pull request Sep 8, 2024
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.

2 participants