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 707946 - Utilize intltool 0.50 gsettings support
Utilize intltool 0.50 gsettings support
Status: RESOLVED FIXED
Product: gnome-documents
Classification: Core
Component: general
unspecified
Other All
: Normal normal
: ---
Assigned To: GNOME documents maintainer(s)
GNOME documents maintainer(s)
Depends on:
Blocks:
 
 
Reported: 2013-09-12 02:40 UTC by Michael Catanzaro
Modified: 2013-09-16 19:38 UTC
See Also:
GNOME target: ---
GNOME version: ---

Attachments
Utilize intltool 0.50 gsettings support (4.70 KB, patch)
2013-09-12 02:40 UTC, Michael Catanzaro 		committed Details | Review

Description Michael Catanzaro 2013-09-12 02:40:00 UTC 
I don't think the appdata is being translated properly due to use of @INTLTOOL_XML_NOMERGE_RULE@.  Bijiben seems to be making due with both @INTLTOOL_XML_RULE@ and @INTLTOOL_XML_NOMERGE_RULE@ in the same Makefile.am, but this does not seem right.  We can drop the nomerge rule by modernizing the gsettings build a bit.

I verified that this doesn't affect translators by running `intltool-update cs` (a random up-to-date language) from the po directory.
Comment 1 Michael Catanzaro 2013-09-12 02:40:01 UTC 
Created attachment 254752 [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 Cosimo Cecchi 2013-09-12 17:13:04 UTC 
Review of attachment 254752 [details] [review]:

::: data/org.gnome.documents.gschema.xml.in
@@ +19,3 @@
       <default>true</default>
+      <summary>Window maximized</summary>
+      <description>Window maximized state</description>

I don't understand how these get to be translated if the <_...> tag is removed...
Is @INTLTOOL_XML_RULE@ smart enough to look for <summary> and <description> automatically?
Comment 3 Michael Catanzaro 2013-09-12 18:26:44 UTC 
(In reply to comment #2)
> Is @INTLTOOL_XML_RULE@ smart enough to look for <summary> and <description>
> automatically?

intltool 0.50 (Dec. 2011) will handle .gschema.xml files automatically without need for any macro.  @INTLTOOL_XML_RULE@ is there to merge the appdata translations into the installed appdata file (which was the motivation for this change).
Comment 4 Cosimo Cecchi 2013-09-16 17:21:01 UTC 
Review of attachment 254752 [details] [review]:

Thanks for the clarification, Michael. Patch looks good to me.
Comment 5 Michael Catanzaro 2013-09-16 19:38:40 UTC 
Attachment 254752 [details] pushed as e921ba3 - Utilize intltool 0.50 gsettings support