GNOME.org
 

[tracker-miners/sam/kill-intltool] Don't translate our .desktop and .service files

commit e944876c5c58b168a59755e677c48edf46c6e9a9
Author: Sam Thursfield <sam afuera me uk>
Date:   Sat Apr 18 19:29:52 2020 +0200

    Don't translate our .desktop and .service files
    
    The motivation for dropping these translations is that we want to
    avoid depending on intltool.
    
    We tried to reimplement the translation functionality using `msgfmt`
    from Gettext, for details see:
    https://gitlab.gnome.org/GNOME/tracker-miners/-/merge_requests/29
    
    It proved impossible to translate the 'DisplayName' field without
    also having an unwanted translation of the 'Name' field. We could
    work around this by switching to a different format, but we decided
    these translations are of little importance as they don't appear in
    the GNOME user interface, only in the output of our CLI tool
    when `tracker daemon status` is run.
    
    Fixes https://gitlab.gnome.org/GNOME/tracker/-/issues/36

 meson.build                                        |  4 ++-
 po/.gitignore                                      |  1 -
 po/POTFILES.in                                     |  5 ----
 po/POTFILES.skip                                   |  6 ----
 po/meson.build                                     |  6 +++-
 src/miners/fs/meson.build                          | 32 ++++++++++------------
 ...rg.freedesktop.Tracker3.Miner.Files.service.in} |  4 +--
 ...s.desktop.in.in => tracker-miner-fs.desktop.in} |  5 ++--
 src/miners/rss/meson.build                         | 32 ++++++++++------------
 ... org.freedesktop.Tracker3.Miner.RSS.service.in} |  4 +--
 ....desktop.in.in => tracker-miner-rss.desktop.in} |  5 ++--
 src/tracker-extract/meson.build                    | 14 ++++------
 ....freedesktop.Tracker3.Miner.Extract.service.in} |  4 +--
 13 files changed, 52 insertions(+), 70 deletions(-)
---
diff --git a/meson.build b/meson.build
index 04b82d9f7..3b7b96e94 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('tracker-miners', 'c',
         version: '2.99.0',
-        meson_version: '>=0.50')
+        meson_version: '>=0.51')
 
 gnome = import('gnome')
 i18n = import('i18n')
@@ -391,6 +391,8 @@ tracker_uninstalled_writeback_modules_dir = join_paths(meson.current_build_dir()
 uninstalled_tracker_extract_path = join_paths(meson.current_build_dir(), 'src', 'tracker-extract', 
'tracker-extract-3')
 
 gsettings_schema_dir = join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas')
+po_dir = join_paths(meson.current_source_dir(), 'po')
+xdg_autostart_dir = join_paths(get_option('sysconfdir'), 'xdg', 'autostart')
 
 glib_compile_schemas = find_program('glib-compile-schemas')
 glib_mkenums = find_program('glib-mkenums')
diff --git a/po/.gitignore b/po/.gitignore
index 0b80cf88e..40a4430ab 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,7 +1,6 @@
 *.gmo
 *.header
 *.pot
-.intltool-merge-cache
 boldquot.sed
 insert-header.sin
 Makefile.in.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0d0a96528..15e70a108 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -8,15 +8,10 @@ src/libtracker-miners-common/tracker-dbus.c
 src/libtracker-miners-common/tracker-utils.c
 src/libtracker-miner/tracker-data-provider.c
 src/libtracker-miner/tracker-miner-proxy.c
-src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in.in
 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.Tracker3.Miner.RSS.service.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.Tracker3.Miner.Extract.service.in.in
 src/tracker-extract/tracker-extract.c
 src/tracker-extract/tracker-main.c
 src/tracker/tracker-config.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 28193b237..ba524eabc 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,9 +1,3 @@
 # List of source files that should NOT be translated.
 # Please keep this file sorted alphabetically.
-src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in
-src/miners/fs/tracker-miner-fs.desktop.in
-src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in
-src/miners/rss/tracker-miner-rss.desktop.in
-src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in
-src/tracker-extract/tracker-extract.desktop.in
 tests/
diff --git a/po/meson.build b/po/meson.build
index 6a81aafe4..2e0ac5a0f 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1 +1,5 @@
-i18n.gettext(tracker_versioned_name, preset: 'glib')
+i18n.gettext(
+  'tracker-miners',
+  preset: 'glib',
+  args: '--keyword=DisplayName',
+)
diff --git a/src/miners/fs/meson.build b/src/miners/fs/meson.build
index 86fed58da..df7168b3f 100644
--- a/src/miners/fs/meson.build
+++ b/src/miners/fs/meson.build
@@ -35,31 +35,27 @@ executable('tracker-miner-fs-@0@'.format(tracker_api_major),
     install_rpath: tracker_install_rpath,
 )
 
-dbus_service_file_untranslated = configure_file(
-    input: 'org.freedesktop.Tracker3.Miner.Files.service.in.in',
-    output: 'org.freedesktop.Tracker3.Miner.Files.service.in',
-    configuration: conf)
-
-dbus_service_file = custom_target('tracker-miner-files-dbus-service-file',
-    input: dbus_service_file_untranslated,
+# This file allows starting the service with D-Bus autoactivation.
+# It's also used by tracker-control to identify the miner.
+dbus_service_file = configure_file(
+    input: 'org.freedesktop.Tracker3.Miner.Files.service.in',
     output: 'org.freedesktop.Tracker3.Miner.Files.service',
-    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 
'po'), '@INPUT@', '@OUTPUT@'],
+    configuration: conf,
     install: true,
-    install_dir: dbus_services_dir)
-
-desktop_file_untranslated = configure_file(
-    input: 'tracker-miner-fs.desktop.in.in',
-    output: 'tracker-miner-fs.desktop.in',
-    configuration: conf)
+    install_dir: dbus_services_dir,
+)
 
-desktop_file = custom_target('tracker-miner-fs-desktop-file',
-    input: desktop_file_untranslated,
+# This file allows starting the service automatically using XDG autostart.
+# systemd user service activation is preferred if available.
+desktop_file = configure_file(
+    input: 'tracker-miner-fs.desktop.in',
     output: 'tracker-miner-fs-@0@.desktop'.format(tracker_api_major),
-    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 
'po'), '@INPUT@', '@OUTPUT@'],
+    configuration: conf,
     install: true,
-    install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+    install_dir: xdg_autostart_dir)
 
 if get_option('systemd_user_services')
+  # This file allows starting the service as a systemd user service.
   configure_file(
       input: 'tracker-miner-fs.service.in',
       output: 'tracker-miner-fs-@0@.service'.format(tracker_api_major),
diff --git a/src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in.in 
b/src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in
similarity index 81%
rename from src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in.in
rename to src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in
index a3d058dff..867c246dd 100644
--- a/src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in.in
+++ b/src/miners/fs/org.freedesktop.Tracker3.Miner.Files.service.in
@@ -6,5 +6,5 @@ SystemdService=tracker-miner-fs-3.service
 # Miner details needed for tracker-control
 Path=/org/freedesktop/Tracker3/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/fs/tracker-miner-fs.desktop.in.in b/src/miners/fs/tracker-miner-fs.desktop.in
similarity index 76%
rename from src/miners/fs/tracker-miner-fs.desktop.in.in
rename to src/miners/fs/tracker-miner-fs.desktop.in
index b9e62b49c..6a21f3e04 100644
--- a/src/miners/fs/tracker-miner-fs.desktop.in.in
+++ b/src/miners/fs/tracker-miner-fs.desktop.in
@@ -1,7 +1,6 @@
 [Desktop Entry]
-_Name=Tracker File System Miner
-_Comment=Crawls and processes files on the file system
-Icon=
+Name=Tracker File System Miner
+Comment=Crawls and processes files on the file system
 Exec=@libexecdir@/tracker-miner-fs-3
 Terminal=false
 Type=Application
diff --git a/src/miners/rss/meson.build b/src/miners/rss/meson.build
index bd84fae21..84eaa6bc0 100644
--- a/src/miners/rss/meson.build
+++ b/src/miners/rss/meson.build
@@ -12,31 +12,27 @@ executable('tracker-miner-rss-@0@'.format(tracker_api_major),
     install_rpath: tracker_install_rpath,
 )
 
-dbus_service_file_untranslated = configure_file(
-    input: 'org.freedesktop.Tracker3.Miner.RSS.service.in.in',
-    output: 'org.freedesktop.Tracker3.Miner.RSS.service.in',
-    configuration: conf)
-
-dbus_service_file = custom_target('tracker-miner-rss-dbus-service-file',
-    input: dbus_service_file_untranslated,
+# This file allows starting the service with D-Bus autoactivation.
+# It's also used by tracker-control to identify the miner.
+dbus_service_file = configure_file(
+    input: 'org.freedesktop.Tracker3.Miner.RSS.service.in',
     output: 'org.freedesktop.Tracker3.Miner.RSS.service',
-    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 
'po'), '@INPUT@', '@OUTPUT@'],
+    configuration: conf,
     install: true,
-    install_dir: dbus_services_dir)
-
-desktop_file_untranslated = configure_file(
-    input: 'tracker-miner-rss.desktop.in.in',
-    output: 'tracker-miner-rss.desktop.in',
-    configuration: conf)
+    install_dir: dbus_services_dir,
+)
 
-desktop_file = custom_target('tracker-miner-rss-desktop-file',
-    input: desktop_file_untranslated,
+# This file allows starting the service automatically using XDG autostart.
+# systemd user service activation is preferred if available.
+desktop_file = configure_file(
+    input: 'tracker-miner-rss.desktop.in',
     output: 'tracker-miner-rss-@0@.desktop'.format(tracker_api_major),
-    command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 
'po'), '@INPUT@', '@OUTPUT@'],
+    configuration: conf,
     install: true,
-    install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'))
+    install_dir: xdg_autostart_dir)
 
 if get_option('systemd_user_services')
+  # This file allows starting the service as a systemd user service.
   configure_file(
       input: 'tracker-miner-rss.service.in',
       output: 'tracker-miner-rss-@0@.service'.format(tracker_api_major),
diff --git a/src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in.in 
b/src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in
similarity index 80%
rename from src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in.in
rename to src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in
index 4a27c78c5..359db6ecc 100644
--- a/src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in.in
+++ b/src/miners/rss/org.freedesktop.Tracker3.Miner.RSS.service.in
@@ -6,5 +6,5 @@ SystemdService=tracker-miner-rss-3.service
 # Miner details needed for tracker-control
 Path=/org/freedesktop/Tracker3/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/miners/rss/tracker-miner-rss.desktop.in.in b/src/miners/rss/tracker-miner-rss.desktop.in
similarity index 80%
rename from src/miners/rss/tracker-miner-rss.desktop.in.in
rename to src/miners/rss/tracker-miner-rss.desktop.in
index 11a8e9ea3..d4e4ca134 100644
--- a/src/miners/rss/tracker-miner-rss.desktop.in.in
+++ b/src/miners/rss/tracker-miner-rss.desktop.in
@@ -1,7 +1,6 @@
 [Desktop Entry]
-_Name=Tracker RSS/ATOM Feeds Miner
-_Comment=Fetch RSS/ATOM feeds
-Icon=
+Name=Tracker RSS/ATOM Feeds Miner
+Comment=Fetch RSS/ATOM feeds
 Exec=@libexecdir@/tracker-miner-rss-3
 Terminal=false
 Type=Application
diff --git a/src/tracker-extract/meson.build b/src/tracker-extract/meson.build
index d28799812..5343dd4da 100644
--- a/src/tracker-extract/meson.build
+++ b/src/tracker-extract/meson.build
@@ -169,19 +169,17 @@ executable('tracker-extract-@0@'.format(tracker_api_major),
   install_dir: join_paths(get_option('prefix'), get_option('libexecdir')),
   install_rpath: tracker_install_rpath)
 
-dbus_service_file_untranslated = configure_file(
-  input: 'org.freedesktop.Tracker3.Miner.Extract.service.in.in',
-  output: 'org.freedesktop.Tracker3.Miner.Extract.service.in',
-  configuration: conf)
-
-dbus_service_file = custom_target('tracker-extract-dbus-service-file',
-  input: dbus_service_file_untranslated,
+# This file allows starting the service with D-Bus autoactivation.
+# It's also used by tracker-control to identify the miner.
+dbus_service_file = configure_file(
+  input: 'org.freedesktop.Tracker3.Miner.Extract.service.in',
   output: 'org.freedesktop.Tracker3.Miner.Extract.service',
-  command: ['intltool-merge', '--quiet', '--desktop-style', '--utf8', join_paths(meson.source_root(), 'po'), 
'@INPUT@', '@OUTPUT@'],
+  configuration: conf,
   install: true,
   install_dir: dbus_services_dir)
 
 if get_option('systemd_user_services')
+  # This file allows starting the service as a systemd user service.
   configure_file(
     input: 'tracker-extract.service.in',
     output: 'tracker-extract-@0@.service'.format(tracker_api_major),
diff --git a/src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in.in 
b/src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in
similarity index 83%
rename from src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in.in
rename to src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in
index 4c1f86bea..6b88c8d67 100644
--- a/src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in.in
+++ b/src/tracker-extract/org.freedesktop.Tracker3.Miner.Extract.service.in
@@ -6,5 +6,5 @@ SystemdService=tracker-extract-3.service
 # Miner details needed for tracker-control
 Path=/org/freedesktop/Tracker3/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]