diff options
| author | Ondrej Holy <oholy@redhat.com> | 2018-06-14 15:22:15 +0200 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2018-06-14 16:04:18 +0200 |
| commit | 80f7e1c144103d52a877f2d42db6a427867591f6 (patch) | |
| tree | 91777233c680c3c1c8d4c2744c378b393022ab4e | |
| parent | 5848e8d544dd975454d4ef671c5b8b7ef91ccc83 (diff) | |
| download | baobab-wip/oholy/build-fixes.tar.gz | |
build: Fix gschema translationswip/oholy/build-fixes
After meson port, translations are merged in gschema file, which doesn't
work:
$ LANG=en_US gsettings describe org.gnome.baobab.preferences excluded-uris
Una lista d'URI t'as particiones que cal excluir de l'anal�s.
Translations should not be merged in gschema files and also I don't see any
other gschema file with merged translations in /usr/share/glib-2.0/schemas/.
Let's install gschema file as is. After this change, translations works as
expected.
| -rw-r--r-- | data/meson.build | 7 | ||||
| -rw-r--r-- | data/org.gnome.baobab.gschema.xml (renamed from data/org.gnome.baobab.gschema.xml.in) | 0 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/data/meson.build b/data/meson.build index 5b1ef00..98d1d69 100644 --- a/data/meson.build +++ b/data/meson.build @@ -22,11 +22,8 @@ appdata_file = i18n.merge_file( install_dir: join_paths(get_option('datadir'), 'metainfo'), ) -gschema_file = i18n.merge_file( - input: 'org.gnome.baobab.gschema.xml.in', - output: 'org.gnome.baobab.gschema.xml', - po_dir: '../po', - install: true, +install_data ( + 'org.gnome.baobab.gschema.xml', install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas') ) diff --git a/data/org.gnome.baobab.gschema.xml.in b/data/org.gnome.baobab.gschema.xml index 41c100f..41c100f 100644 --- a/data/org.gnome.baobab.gschema.xml.in +++ b/data/org.gnome.baobab.gschema.xml diff --git a/po/POTFILES.in b/po/POTFILES.in index 0c9452a..f3d6521 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2,7 +2,7 @@ # Please keep this file sorted alphabetically. data/org.gnome.baobab.appdata.xml.in data/org.gnome.baobab.desktop.in -data/org.gnome.baobab.gschema.xml.in +data/org.gnome.baobab.gschema.xml src/baobab-application.vala src/baobab-cellrenderers.vala src/baobab-location-list.ui |