File gnome-screenshot-fix-translations.patch of Package gnome-screenshot

Overview Repositories Revisions Requests Users Attributes Meta

File gnome-screenshot-fix-translations.patch of Package gnome-screenshot (Revision 5dd16e646e5e6fa140a60da7a6c4f393)

Currently displaying revision 5dd16e646e5e6fa140a60da7a6c4f393 , Show latest

From cd3d146608b215266a527fcd4edaf460efaf5cd8 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Sun, 29 Mar 2015 14:52:53 +0200
Subject: build: Fix translations not being applied

DATADIRNAME is unset unless we call AM_GLIB_GNU_GETTEXT. It's supposed
to contain "share" on most systems. This caused translations to be
loaded from the wrong directory.

https://bugzilla.gnome.org/show_bug.cgi?id=746973

diff --git a/configure.ac b/configure.ac
index 43054c8..6012985 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,6 +18,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext d
 IT_PROG_INTLTOOL(0.40.0)
 PKG_PROG_PKG_CONFIG([0.22])
 
+AM_GLIB_GNU_GETTEXT
+
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_CXX
-- 
cgit v0.10.2

From 65473b2912bb696d7b7da9d0943aef6c6e26254f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 1 Apr 2015 19:50:18 -0400
Subject: Fix schema translations

There are two fixes here. First, we need to use the correct
gettext domain in the schema file and second, we must not
merge translations back into the xml file, since dconf-editor
can't deal with that.

http://bugzilla.gnome.org/show_bug.cgi?id=747125

diff --git a/src/Makefile.am b/src/Makefile.am
index 43731b0..f3b7fff 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,6 +66,9 @@ appdata_DATA = $(appdata_in_files:.xml.in=.xml)
 appdata_in_files = org.gnome.Screenshot.appdata.xml.in
 @INTLTOOL_XML_RULE@
 
+%.gschema.xml: %.gschema.xml.in
+	$(AM_V_GEN) $(INTLTOOL_MERGE) -x -u --no-translations $< $@
+
 dbusservicedir = $(datadir)/dbus-1/services
 dbusservice_DATA = org.gnome.Screenshot.service
 
diff --git a/src/org.gnome.gnome-screenshot.gschema.xml.in b/src/org.gnome.gnome-screenshot.gschema.xml.in
index ea8a09a..8d08edf 100644
--- a/src/org.gnome.gnome-screenshot.gschema.xml.in
+++ b/src/org.gnome.gnome-screenshot.gschema.xml.in
@@ -1,4 +1,4 @@
-<schemalist gettext-domain="gnome-utils-2.0">
+<schemalist gettext-domain="gnome-screenshot">
  <enum id="org.gnome.gnome-screenshot.file-types">
     <value nick="bmp" value="0"/>
     <value nick="jpg" value="1"/>
-- 
cgit v0.10.2

Places

File gnome-screenshot-fix-translations.patch of Package gnome-screenshot (Revision 5dd16e646e5e6fa140a60da7a6c4f393)

Places