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

Fix translations so that %S et al are not offered for translation #8640

Merged
merged 1 commit into from
Nov 20, 2023

Conversation

jepler
Copy link
Member

@jepler jepler commented Nov 20, 2023

In #8639 Dan noticed that weblate was still offering "%S" as a string to translate. I don't understand why this occurs, because the string is no longer in circuitpython.pot; so weblate should move it to the "fuzzy" section of the .po files when it synchronizes them.

I also noticed that the "%02X" string should never be localized and moved it to synthetic.pot.

After making that change, I ran "make translate" followed by "make msgmerge"; normally we rely on weblate running this step, but for whatever reason this is not the case this time.

This change looks bigger than it really is because msgmerge totally re-ordered the "fuzzy messages" section of each po file.

After this, I will force reset weblate back to match our main branch again and re-open translations on weblate.

In adafruit#8639 Dan noticed that weblate was still offering "%S" as a string
to translate. I don't understand why this occurs, because the string
is no longer in circuitpython.pot; so weblate should move it to the
"fuzzy" section of the .po files when it synchronizes them.

I also noticed that the "%02X" string should never be localized and
moved it to synthetic.pot.

After making that change, I ran "make translate" followed by
"make msgmerge"; normally we rely on weblate running this step, but for
whatever reason this is not the case this time.

This change looks bigger than it really is because msgmerge totally
re-ordered the "fuzzy messages" section of each po file.

After this, I will force reset weblate back to match our main branch again
and re-open translations on weblate.
@jepler jepler requested a review from dhalbert November 20, 2023 14:56
@dhalbert
Copy link
Collaborator

Something unrelated is breaking some jobs in CI. I'll re-run these when it's done.

Run sudo apt-get update
Get:1 file:/etc/apt/apt-mirrors.txt Mirrorlist [142 B]
Get:6 https://packages.microsoft.com/ubuntu/22.04/prod jammy InRelease [3531 B]
Hit:2 http://azure.archive.ubuntu.com/ubuntu jammy InRelease
[...]
Reading package lists...
E: Repository 'https://packages.microsoft.com/ubuntu/22.04/prod jammy InRelease' changed its 'Origin' value from 'microsoft-ubuntu-jammy-prod jammy' to 'Pulp 3'
E: Repository 'https://packages.microsoft.com/ubuntu/22.04/prod jammy InRelease' changed its 'Label' value from 'microsoft-ubuntu-jammy-prod jammy' to ''
Error: Process completed with exit code 100.

Copy link
Collaborator

@dhalbert dhalbert 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 quick fix!

@dhalbert dhalbert merged commit 1e9b86d into adafruit:main Nov 20, 2023
471 checks passed
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

2 participants