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 708054 - Utilize intltool 0.50 gsettings support
Utilize intltool 0.50 gsettings support
Status: RESOLVED FIXED
Product: gnome-photos
Classification: Applications
Component: general
unspecified
Other All
: Normal normal
: ---
Assigned To: GNOME photos maintainer(s)
GNOME photos maintainer(s)
Depends on:
Blocks:
 
 
Reported: 2013-09-13 23:56 UTC by Michael Catanzaro
Modified: 2013-09-17 14:37 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Utilize intltool 0.50 gsettings support (3.15 KB, patch)
2013-09-13 23:56 UTC, Michael Catanzaro
none Details | Review
Utilize intltool 0.50 gsettings support (3.64 KB, patch)
2013-09-14 01:44 UTC, Michael Catanzaro
committed Details | Review

Description Michael Catanzaro 2013-09-13 23:56:48 UTC
The appdata translations need to be merged into the installed appdata file, which requires INTLTOOL_XML_RULE, but currently the conflicting INTLTOOL_XML_NOMERGE_RULE is used for the gsettings translation. intltool doesn't require this anymore if we use a plain .gschema.xml instead of a .gschema.xml.in.

This is exactly the same as Documents Bug #707946.
Comment 1 Michael Catanzaro 2013-09-13 23:56:50 UTC
Created attachment 254896 [details] [review]
Utilize intltool 0.50 gsettings support

This lets us replace @INTLTOOL_XML_NOMERGE_RULE@ with
@INTLTOOL_XML_RULE@ so that we can merge the appdata translations into
the installed file
Comment 2 Michael Catanzaro 2013-09-14 01:44:50 UTC
Created attachment 254898 [details] [review]
Utilize intltool 0.50 gsettings support

This lets us replace @INTLTOOL_XML_NOMERGE_RULE@ with
@INTLTOOL_XML_RULE@ so that we can merge the appdata translations into
the installed file
Comment 3 Debarshi Ray 2013-09-17 14:37:03 UTC
Comment on attachment 254898 [details] [review]
Utilize intltool 0.50 gsettings support

Thanks for the patch!