|
 |
879696 |
From 80f7e1c144103d52a877f2d42db6a427867591f6 Mon Sep 17 00:00:00 2001
|
|
|
879696 |
From: Ondrej Holy <oholy@redhat.com>
|
|
|
879696 |
Date: Thu, 14 Jun 2018 15:22:15 +0200
|
|
|
879696 |
Subject: [PATCH 2/2] build: Fix gschema translations
|
|
|
879696 |
MIME-Version: 1.0
|
|
|
879696 |
Content-Type: text/plain; charset=UTF-8
|
|
|
879696 |
Content-Transfer-Encoding: 8bit
|
|
|
879696 |
|
|
|
879696 |
After meson port, translations are merged in gschema file, which doesn't
|
|
|
879696 |
work:
|
|
|
879696 |
|
|
|
879696 |
$ LANG=en_US gsettings describe org.gnome.baobab.preferences excluded-uris
|
|
|
879696 |
Una lista d'URI t'as particiones que cal excluir de l'anal�s.
|
|
|
879696 |
|
|
|
879696 |
Translations should not be merged in gschema files and also I don't see any
|
|
|
879696 |
other gschema file with merged translations in /usr/share/glib-2.0/schemas/.
|
|
|
879696 |
Let's install gschema file as is. After this change, translations works as
|
|
|
879696 |
expected.
|
|
|
879696 |
---
|
|
|
879696 |
data/meson.build | 7 ++-----
|
|
|
879696 |
....baobab.gschema.xml.in => org.gnome.baobab.gschema.xml} | 0
|
|
|
879696 |
po/POTFILES.in | 2 +-
|
|
|
879696 |
3 files changed, 3 insertions(+), 6 deletions(-)
|
|
|
879696 |
rename data/{org.gnome.baobab.gschema.xml.in => org.gnome.baobab.gschema.xml} (100%)
|
|
|
879696 |
|
|
|
879696 |
diff --git a/data/meson.build b/data/meson.build
|
|
|
879696 |
index 5b1ef00..98d1d69 100644
|
|
|
879696 |
--- a/data/meson.build
|
|
|
879696 |
+++ b/data/meson.build
|
|
|
879696 |
@@ -22,11 +22,8 @@ appdata_file = i18n.merge_file(
|
|
|
879696 |
install_dir: join_paths(get_option('datadir'), 'metainfo'),
|
|
|
879696 |
)
|
|
|
879696 |
|
|
|
879696 |
-gschema_file = i18n.merge_file(
|
|
|
879696 |
- input: 'org.gnome.baobab.gschema.xml.in',
|
|
|
879696 |
- output: 'org.gnome.baobab.gschema.xml',
|
|
|
879696 |
- po_dir: '../po',
|
|
|
879696 |
- install: true,
|
|
|
879696 |
+install_data (
|
|
|
879696 |
+ 'org.gnome.baobab.gschema.xml',
|
|
|
879696 |
install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas')
|
|
|
879696 |
)
|
|
|
879696 |
|
|
|
879696 |
diff --git a/data/org.gnome.baobab.gschema.xml.in b/data/org.gnome.baobab.gschema.xml
|
|
|
879696 |
similarity index 100%
|
|
|
879696 |
rename from data/org.gnome.baobab.gschema.xml.in
|
|
|
879696 |
rename to data/org.gnome.baobab.gschema.xml
|
|
|
879696 |
diff --git a/po/POTFILES.in b/po/POTFILES.in
|
|
|
879696 |
index 0c9452a..f3d6521 100644
|
|
|
879696 |
--- a/po/POTFILES.in
|
|
|
879696 |
+++ b/po/POTFILES.in
|
|
|
879696 |
@@ -2,7 +2,7 @@
|
|
|
879696 |
# Please keep this file sorted alphabetically.
|
|
|
879696 |
data/org.gnome.baobab.appdata.xml.in
|
|
|
879696 |
data/org.gnome.baobab.desktop.in
|
|
|
879696 |
-data/org.gnome.baobab.gschema.xml.in
|
|
|
879696 |
+data/org.gnome.baobab.gschema.xml
|
|
|
879696 |
src/baobab-application.vala
|
|
|
879696 |
src/baobab-cellrenderers.vala
|
|
|
879696 |
src/baobab-location-list.ui
|
|
|
879696 |
--
|
|
|
879696 |
2.17.1
|
|
|
879696 |
|