[tracker-miners/wip/piotrdrag/kill-intltool: 3/3] Remove intltool also from the D-Bus service files
- From: Piotr Drąg <piotrdrag src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tracker-miners/wip/piotrdrag/kill-intltool: 3/3] Remove intltool also from the D-Bus service files
- Date: Sat, 29 Sep 2018 15:08:10 +0000 (UTC)
commit 9265e403b614fb3ebc29fa1194245e4b5c804adc
Author: Piotr Drąg <piotrdrag gmail com>
Date: Fri Sep 28 19:00:23 2018 +0200
Remove intltool also from the D-Bus service files
meson.build | 1 +
po/POTFILES.in | 8 ++++----
po/POTFILES.skip | 8 ++++----
po/meson.build | 6 +++++-
src/miners/apps/meson.build | 6 +++---
...freedesktop.Tracker1.Miner.Applications.service.desktop.in.in} | 4 ++--
src/miners/fs/meson.build | 6 +++---
...=> org.freedesktop.Tracker1.Miner.Files.service.desktop.in.in} | 4 ++--
src/miners/rss/meson.build | 6 +++---
...n => org.freedesktop.Tracker1.Miner.RSS.service.desktop.in.in} | 4 ++--
src/tracker-extract/meson.build | 6 +++---
... org.freedesktop.Tracker1.Miner.Extract.service.desktop.in.in} | 4 ++--
12 files changed, 34 insertions(+), 29 deletions(-)
---
diff --git a/meson.build b/meson.build
index ba857ca86..2834d5f77 100644
--- a/meson.build
+++ b/meson.build
@@ -393,6 +393,7 @@ vapi_dir = join_paths(get_option('prefix'), get_option('datadir'), 'vala', 'vapi
xdg_autostart_dir = join_paths(get_option('sysconfdir'), 'xdg', 'autostart')
glib_mkenums = find_program('glib-mkenums')
+msgfmt = find_program('msgfmt')
subdir('src')
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 279b537e5..a9ac5d6d1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,19 +2,19 @@
# Please keep this file sorted alphabetically.
src/libtracker-miners-common/tracker-dbus.c
src/libtracker-miners-common/tracker-utils.c
-src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in.in
+src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.desktop.in.in
src/miners/apps/tracker-main.c
src/miners/apps/tracker-miner-apps.desktop.in.in
-src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
+src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.desktop.in.in
src/miners/fs/org.freedesktop.Tracker.Miner.Files.gschema.xml
src/miners/fs/tracker-main.c
src/miners/fs/tracker-miner-files.c
src/miners/fs/tracker-miner-fs.desktop.in.in
-src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
+src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.desktop.in.in
src/miners/rss/tracker-main.c
src/miners/rss/tracker-miner-rss.c
src/miners/rss/tracker-miner-rss.desktop.in.in
-src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
+src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.desktop.in.in
src/tracker-extract/org.freedesktop.Tracker.Extract.gschema.xml
src/tracker-extract/tracker-extract.c
src/tracker-extract/tracker-main.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 9a65fdb28..612bee86c 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,9 +1,9 @@
# List of source files that should NOT be translated.
# Please keep this file sorted alphabetically.
-src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in
-src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in
+src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.desktop.in
+src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.desktop.in
src/miners/fs/tracker-miner-fs.desktop.in
-src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in
+src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.desktop.in
src/miners/rss/tracker-miner-rss.desktop.in
-src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in
+src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.desktop.in
src/tracker-extract/tracker-extract.desktop.in
diff --git a/po/meson.build b/po/meson.build
index 9fec2bcf0..2e0ac5a0f 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1 +1,5 @@
-i18n.gettext('tracker-miners', preset: 'glib')
+i18n.gettext(
+ 'tracker-miners',
+ preset: 'glib',
+ args: '--keyword=DisplayName',
+)
diff --git a/src/miners/apps/meson.build b/src/miners/apps/meson.build
index f90c3d7c0..9a56134f8 100644
--- a/src/miners/apps/meson.build
+++ b/src/miners/apps/meson.build
@@ -12,14 +12,14 @@ executable('tracker-miner-apps', sources,
)
dbus_service_file_untranslated = configure_file(
- input: 'org.freedesktop.Tracker1.Miner.Applications.service.in.in',
- output: 'org.freedesktop.Tracker1.Miner.Applications.service.in',
+ input: 'org.freedesktop.Tracker1.Miner.Applications.service.desktop.in.in',
+ output: 'org.freedesktop.Tracker1.Miner.Applications.service.desktop.in',
configuration: conf)
dbus_service_file = custom_target('tracker-miner-apps-dbus-service-file',
input: dbus_service_file_untranslated,
output: 'org.freedesktop.Tracker1.Miner.Applications.service',
- command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(),
'po'), '@INPUT@', '@OUTPUT@'],
+ command: [msgfmt, '--desktop', '--keyword=DisplayName', '--template', '@INPUT@', '-d', po_dir, '-o',
'@OUTPUT@'],
install: true,
install_dir: dbus_services_dir)
diff --git a/src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in.in
b/src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.desktop.in.in
similarity index 81%
rename from src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in.in
rename to src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.desktop.in.in
index 13e26c3e0..b798f0bab 100644
--- a/src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in.in
+++ b/src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.desktop.in.in
@@ -6,5 +6,5 @@ SystemdService=tracker-miner-apps.service
# Miner details needed for tracker-control
Path=/org/freedesktop/Tracker1/Miner/Applications
NameSuffix=Miner.Applications
-_DisplayName=Applications
-_Comment=Applications data miner
+DisplayName=Applications
+Comment=Applications data miner
diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
index 7b5dd7124..04c12fe99 100644
--- a/src/miners/fs/meson.build
+++ b/src/miners/fs/meson.build
@@ -35,14 +35,14 @@ executable('tracker-miner-fs', sources,
)
dbus_service_file_untranslated = configure_file(
- input: 'org.freedesktop.Tracker1.Miner.Files.service.in.in',
- output: 'org.freedesktop.Tracker1.Miner.Files.service.in',
+ input: 'org.freedesktop.Tracker1.Miner.Files.service.desktop.in.in',
+ output: 'org.freedesktop.Tracker1.Miner.Files.service.desktop.in',
configuration: conf)
dbus_service_file = custom_target('tracker-miner-files-dbus-service-file',
input: dbus_service_file_untranslated,
output: 'org.freedesktop.Tracker1.Miner.Files.service',
- command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(),
'po'), '@INPUT@', '@OUTPUT@'],
+ command: [msgfmt, '--desktop', '--keyword=DisplayName', '--template', '@INPUT@', '-d', po_dir, '-o',
'@OUTPUT@'],
install: true,
install_dir: dbus_services_dir)
diff --git a/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
b/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.desktop.in.in
similarity index 81%
rename from src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
rename to src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.desktop.in.in
index a61719947..b58c0b8b2 100644
--- a/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
+++ b/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.desktop.in.in
@@ -6,5 +6,5 @@ SystemdService=tracker-miner-fs.service
# Miner details needed for tracker-control
Path=/org/freedesktop/Tracker1/Miner/Files
NameSuffix=Miner.Files
-_DisplayName=File System
-_Comment=File system data miner
+DisplayName=File System
+Comment=File system data miner
diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build
index 037d74a9f..ac1e01ef6 100644
--- a/src/miners/rss/meson.build
+++ b/src/miners/rss/meson.build
@@ -12,14 +12,14 @@ executable('tracker-miner-rss', sources,
)
dbus_service_file_untranslated = configure_file(
- input: 'org.freedesktop.Tracker1.Miner.RSS.service.in.in',
- output: 'org.freedesktop.Tracker1.Miner.RSS.service.in',
+ input: 'org.freedesktop.Tracker1.Miner.RSS.service.desktop.in.in',
+ output: 'org.freedesktop.Tracker1.Miner.RSS.service.desktop.in',
configuration: conf)
dbus_service_file = custom_target('tracker-miner-rss-dbus-service-file',
input: dbus_service_file_untranslated,
output: 'org.freedesktop.Tracker1.Miner.RSS.service',
- command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(),
'po'), '@INPUT@', '@OUTPUT@'],
+ command: [msgfmt, '--desktop', '--keyword=DisplayName', '--template', '@INPUT@', '-d', po_dir, '-o',
'@OUTPUT@'],
install: true,
install_dir: dbus_services_dir)
diff --git a/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
b/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.desktop.in.in
similarity index 80%
rename from src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
rename to src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.desktop.in.in
index 372c21965..5da6d455e 100644
--- a/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
+++ b/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.desktop.in.in
@@ -6,5 +6,5 @@ SystemdService=tracker-miner-rss.service
# Miner details needed for tracker-control
Path=/org/freedesktop/Tracker1/Miner/RSS
NameSuffix=Miner.RSS
-_DisplayName=RSS/ATOM Feeds
-_Comment=Fetch RSS/ATOM Feeds
+DisplayName=RSS/ATOM Feeds
+Comment=Fetch RSS/ATOM Feeds
diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
index 78cae54e7..e1182a0f0 100644
--- a/src/tracker-extract/meson.build
+++ b/src/tracker-extract/meson.build
@@ -175,14 +175,14 @@ executable('tracker-extract',
install_rpath: tracker_internal_libs_dir)
dbus_service_file_untranslated = configure_file(
- input: 'org.freedesktop.Tracker1.Miner.Extract.service.in.in',
- output: 'org.freedesktop.Tracker1.Miner.Extract.service.in',
+ input: 'org.freedesktop.Tracker1.Miner.Extract.service.desktop.in.in',
+ output: 'org.freedesktop.Tracker1.Miner.Extract.service.desktop.in',
configuration: conf)
dbus_service_file = custom_target('tracker-extract-dbus-service-file',
input: dbus_service_file_untranslated,
output: 'org.freedesktop.Tracker1.Miner.Extract.service',
- command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'),
'@INPUT@', '@OUTPUT@'],
+ command: [msgfmt, '--desktop', '--keyword=DisplayName', '--template', '@INPUT@', '-d', po_dir, '-o',
'@OUTPUT@'],
install: true,
install_dir: dbus_services_dir)
diff --git a/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
b/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.desktop.in.in
similarity index 82%
rename from src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
rename to src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.desktop.in.in
index 32dd1dfd0..17b294bfc 100644
--- a/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
+++ b/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.desktop.in.in
@@ -6,5 +6,5 @@ SystemdService=tracker-extract.service
# Miner details needed for tracker-control
Path=/org/freedesktop/Tracker1/Miner/Extract
NameSuffix=Miner.Extract
-_DisplayName=Extractor
-_Comment=Metadata extractor
+DisplayName=Extractor
+Comment=Metadata extractor
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]