After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 786950 - Migrate from intltool
Migrate from intltool
Status: RESOLVED FIXED
Product: lightsoff
Classification: Applications
Component: general
git master
Other All
: Normal normal
: ---
Assigned To: lightsoff-maint
lightsoff-maint
Depends on:
Blocks:
 
 
Reported: 2017-08-28 22:23 UTC by Robert Roth
Modified: 2017-09-16 21:57 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Migrate from intltool (9.05 KB, patch)
2017-08-28 22:23 UTC, Robert Roth
accepted-commit_now Details | Review

Description Robert Roth 2017-08-28 22:23:41 UTC
Use gettext instead of intltool.
Comment 1 Robert Roth 2017-08-28 22:23:45 UTC
Created attachment 358641 [details] [review]
Migrate from intltool
Comment 2 Michael Catanzaro 2017-08-29 00:26:07 UTC
Review of attachment 358641 [details] [review]:

Cool. Remember to branch gnome-3-26 before pushing, since this is obviously going to affect translations.

::: Makefile.am
@@ +10,3 @@
 -include $(top_srcdir)/git.mk
+
+EXTRA_DIST = config.rpath

What, why? What is this? It shouldn't be needed.

It's nicer to keep the -include at the bottom IMO.

::: data/lightsoff.desktop.in
@@ +5,1 @@
 Icon=lightsoff

I like to add a comment warning translators not to translate the icon name, since it's going to appear in the .po files now unfortunately.

::: git.mk
@@ -205,3 @@
 				po/Rules-quot \
 				po/stamp-it \
-				po/.intltool-merge-cache \

I wouldn't touch git.mk since we're not upstream.
Comment 3 Robert Roth 2017-09-16 21:57:01 UTC
Pushed to master, with all suggestions implemented:
* gnome-3-26 branched before the commit
* removed git.mk changes
* added translator comment to desktop file Icon field
* removed EXTRA_DIST = config.rpath, I'm not sure why it turned up there.

For details see commit at https://git.gnome.org/browse/lightsoff/commit/?id=f7d3515d943d76965af22db7455a19780a6b3945

This problem has been fixed in the unstable development version. The fix will be available in the next major software release. You may need to upgrade your Linux distribution to obtain that newer version.