Various i18n fixes #25
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Properly use ngettext() to translate strings with singular/plural forms, instead of hardcoding a n==1 check for any language. Add an inline fallback ngettext() implementation for the "no i18n" case.
Remove messages.po, which is the default output file name of xgettext; there is already linux_logo.pot as template.
Use makefile functions to get the list of available translations, instead of hardcoding them. Build the list of languages, and expected mo files from that as well. Iterate on languages, as it is easier (no need to drop the suffix manually every time).
Pass -c/--check to msgfmt, so it checks the validity of the po files, rejecting invalid files. There are no invalid translations in the current sources, so this is a no-op change that will prevent mistakes in the future.
This way, the old msgid are preserved when a message is changed and becomes fuzzy; this helps translators as they can easily see how the msgid changed.
Followup of commit e0a39f7.
Every time xgettext is run, the generated template has its own POT-Creation-Date field with the runtime timestamp; because of this, the comparison between the existing template and the new one (using `cmp`) always results as "different". Hence, simply run xgettext with the wanted output file, as the result is the same; make use of the automatic make variables to avoid repeating variables in the command invocation.
While it can be useful to keep the translation catalog up-to-date, updating it every time a file is changed is a bit wasteful. Hence, do not ensure that the pot file is updated on 'all'. This will likely require some manual update from time to time to make sure that the translatable messages are still up-to-date, however they do not change that often in linuxlogo.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR does a number of changes & fixes related to i18n, mostly in the build system:
messages.pofilengettext()for theProcessor/Processorsplural form string-ctomsgfmtto ensure .po files are valid (no problems in the current files)--previoustomsgmergeto help translatorspo/Makefile:$(DESTDIR)when installing (follows the common practice, and the existing bits in the rest of linuxlogo)xgettextinvocationI did not include the update of
linux_logo.potin this PR, nor the update of the translations. I can do that in a followup PR.See the log message of each commit for longer explanations.