GNOME Bugzilla – Bug 786917
[Patch] Migrate from intltool to gettext
Last modified: 2017-09-27 12:27:08 UTC
Created attachment 358595 [details] [review] Patch - remove intltool Intltool is deprecated and should no longer be used. There is also [1] to encourage dropping it in GNOME tooling, in favor of GNU gettext. Attached is a patch to perform the migration. [1] https://wiki.gnome.org/Initiatives/GnomeGoals/GettextMigration
Review of attachment 358595 [details] [review]: ::: git.mk @@ +86,3 @@ compile \ config.guess \ + config.rpath \ I would prefer git.mk to be updated from upstream (https://github.com/behdad/git.mk) in a separate commit. ::: po/Makevars @@ +19,3 @@ +# the public domain; in this case the translators are expected to disclaim +# their copyright. +COPYRIGHT_HOLDER = Free Software Foundation, Inc. That’s not right. The FSF is not the copyright holder for folks. This should be `$(PACKAGE_STRING) authors`. (I suggest you go back over all the patches you’ve presumably submitted to other modules to port from intltool → gettext and fix this everywhere, or everyone’s copyright information is going to be wrong.) @@ +26,3 @@ +# detect it automatically by scanning the files in $(top_srcdir) for +# "GNU packagename" string. +PACKAGE_GNU = This should be `no`. @@ +42,3 @@ +# can write to without being subscribed, or the URL of a web page through +# which the translators can contact you. +MSGID_BUGS_ADDRESS = This should be `$(PACKAGE_BUGREPORT)`. @@ +70,3 @@ +# the POT file is checked in the repository and the version control +# program ignores timestamps. +PO_DEPENDS_ON_POT = yes I think this should be `no` to avoid the .po files being regenerated on every build? Similarly for `DIST_DEPENDS_ON_UPDATE_PO` below.
Created attachment 360520 [details] [review] [Patch] Migrate from intltool to gettext Corrected po/Makevars
Created attachment 360521 [details] [review] Update git.mk to latest upstream Update git.mk to latest version upstream.
Thanks for the review btw. You were right in that my patch was a bit careless.
Review of attachment 360521 [details] [review]: ++
Review of attachment 360520 [details] [review]: ++
Landed as commit b86afaae2f30144753dfa9835f9bd241a37b8245 and commit 6ae65717a8ca5849a092527741d0ae9744a23882 on master. Thanks for the reviews!