[geary/mjog/build-updates: 4/4] src/client/plugin: Rename plugin data files so they get translated

[Michael Gratton <mjog src gnome org>]

commit 016998359ba8ee112ae87e9cca61fd95fb4c4dda
Author: Michael Gratton <mike vee net>
Date:   Mon Mar 30 19:51:01 2020 +1100

    src/client/plugin: Rename plugin data files so they get translated
    
    Since xgettext doesn't recognise .plugin files as desktop files,
    rename them to `….plugin.desktop.in`. Add missing plugins to POFILES.in.

 po/POTFILES.in                                               | 12 ++++++++----
 ...ons.plugin.in => desktop-notifications.plugin.desktop.in} |  0
 src/client/plugin/desktop-notifications/meson.build          |  4 ++--
 ...ighlight.plugin.in => folder-highlight.plugin.desktop.in} |  0
 src/client/plugin/folder-highlight/meson.build               |  2 +-
 src/client/plugin/meson.build                                |  5 +++++
 src/client/plugin/messaging-menu/meson.build                 |  4 ++--
 ...aging-menu.plugin.in => messaging-menu.plugin.desktop.in} |  0
 src/client/plugin/notification-badge/meson.build             |  4 ++--
 ...-badge.plugin.in => notification-badge.plugin.desktop.in} |  0
 src/client/plugin/sent-sound/meson.build                     |  4 ++--
 .../{sent-sound.plugin.in => sent-sound.plugin.desktop.in}   |  0
 src/client/plugin/special-folders/meson.build                |  4 ++--
 ...l-folders.plugin.in => special-folders.plugin.desktop.in} |  0
 14 files changed, 24 insertions(+), 15 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d2494804..8c5306a7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -102,14 +102,18 @@ src/client/plugin/plugin-info-bar.vala
 src/client/plugin/plugin-notification-extension.vala
 src/client/plugin/plugin-plugin-base.vala
 src/client/plugin/plugin-trusted-extension.vala
-src/client/plugin/desktop-notifications/desktop-notifications.plugin.in
+src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in
 src/client/plugin/desktop-notifications/desktop-notifications.vala
-src/client/plugin/folder-highlight/folder-highlight.plugin.in
+src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in
 src/client/plugin/folder-highlight/folder-highlight.vala
-src/client/plugin/messaging-menu/messaging-menu.plugin.in
+src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in
 src/client/plugin/messaging-menu/messaging-menu.vala
-src/client/plugin/notification-badge/notification-badge.plugin.in
+src/client/plugin/notification-badge/notification-badge.plugin.desktop.in
 src/client/plugin/notification-badge/notification-badge.vala
+src/client/plugin/sent-sound/sent-sound.plugin.desktop.in
+src/client/plugin/sent-sound/sent-sound.vala
+src/client/plugin/special-folders/special-folders.plugin.desktop.in
+src/client/plugin/special-folders/special-folders.vala
 src/client/sidebar/sidebar-branch.vala
 src/client/sidebar/sidebar-common.vala
 src/client/sidebar/sidebar-count-cell-renderer.vala
diff --git a/src/client/plugin/desktop-notifications/desktop-notifications.plugin.in 
b/src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in
similarity index 100%
rename from src/client/plugin/desktop-notifications/desktop-notifications.plugin.in
rename to src/client/plugin/desktop-notifications/desktop-notifications.plugin.desktop.in
diff --git a/src/client/plugin/desktop-notifications/meson.build 
b/src/client/plugin/desktop-notifications/meson.build
index f32979b1..501d3042 100644
--- a/src/client/plugin/desktop-notifications/meson.build
+++ b/src/client/plugin/desktop-notifications/meson.build
@@ -2,7 +2,7 @@
 plugin_name = 'desktop-notifications'
 
 plugin_src = files(plugin_name + '.vala')
-plugin_data = plugin_name + '.plugin'
+plugin_data = plugin_name + plugin_data_suffix
 plugin_dest = plugins_dir / plugin_name
 
 shared_module(
@@ -17,7 +17,7 @@ shared_module(
 )
 
 i18n.merge_file(
-  input: files(plugin_data + '.in'),
+  input: files(plugin_data + plugin_data_src_suffix),
   output: plugin_data,
   type: 'desktop',
   po_dir: po_dir,
diff --git a/src/client/plugin/folder-highlight/folder-highlight.plugin.in 
b/src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in
similarity index 100%
rename from src/client/plugin/folder-highlight/folder-highlight.plugin.in
rename to src/client/plugin/folder-highlight/folder-highlight.plugin.desktop.in
diff --git a/src/client/plugin/folder-highlight/meson.build b/src/client/plugin/folder-highlight/meson.build
index 56b2318d..0a5fdeb1 100644
--- a/src/client/plugin/folder-highlight/meson.build
+++ b/src/client/plugin/folder-highlight/meson.build
@@ -17,7 +17,7 @@ shared_module(
 )
 
 i18n.merge_file(
-  input: files(plugin_data + '.in'),
+  input: files(plugin_data + '.desktop.in'),
   output: plugin_data,
   type: 'desktop',
   po_dir: po_dir,
diff --git a/src/client/plugin/meson.build b/src/client/plugin/meson.build
index 6500e30e..33c5ece4 100644
--- a/src/client/plugin/meson.build
+++ b/src/client/plugin/meson.build
@@ -22,6 +22,11 @@ plugin_dependencies = [
 
 plugin_c_args = geary_c_args
 
+# Use .desktop.in since xgettext doesn't recognise .plugin files as
+# desktop files when translating them at install time.
+plugin_data_src_suffix = '.desktop.in'
+plugin_data_suffix = '.plugin'
+
 subdir('desktop-notifications')
 subdir('folder-highlight')
 subdir('messaging-menu')
diff --git a/src/client/plugin/messaging-menu/meson.build b/src/client/plugin/messaging-menu/meson.build
index 980f98f4..8a14b7c6 100644
--- a/src/client/plugin/messaging-menu/meson.build
+++ b/src/client/plugin/messaging-menu/meson.build
@@ -19,7 +19,7 @@ if libmessagingmenu_dep.found()
   )
 
   plugin_src = files(plugin_name + '.vala')
-  plugin_data = plugin_name + '.plugin'
+  plugin_data = plugin_name + plugin_data_suffix
   plugin_dest = plugins_dir / plugin_name
 
   shared_module(
@@ -36,7 +36,7 @@ if libmessagingmenu_dep.found()
   )
 
   i18n.merge_file(
-    input: files(plugin_data + '.in'),
+    input: files(plugin_data + plugin_data_src_suffix),
     output: plugin_data,
     type: 'desktop',
     po_dir: po_dir,
diff --git a/src/client/plugin/messaging-menu/messaging-menu.plugin.in 
b/src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in
similarity index 100%
rename from src/client/plugin/messaging-menu/messaging-menu.plugin.in
rename to src/client/plugin/messaging-menu/messaging-menu.plugin.desktop.in
diff --git a/src/client/plugin/notification-badge/meson.build 
b/src/client/plugin/notification-badge/meson.build
index 63d99c7d..98dca2e8 100644
--- a/src/client/plugin/notification-badge/meson.build
+++ b/src/client/plugin/notification-badge/meson.build
@@ -5,7 +5,7 @@ plugin_src = files(
   plugin_name + '.vala',
   'unity-launcher-entry.vala'
 )
-plugin_data = plugin_name + '.plugin'
+plugin_data = plugin_name + plugin_data_suffix
 plugin_dest = plugins_dir / plugin_name
 
 shared_module(
@@ -20,7 +20,7 @@ shared_module(
 )
 
 i18n.merge_file(
-  input: files(plugin_data + '.in'),
+  input: files(plugin_data + plugin_data_src_suffix),
   output: plugin_data,
   type: 'desktop',
   po_dir: po_dir,
diff --git a/src/client/plugin/notification-badge/notification-badge.plugin.in 
b/src/client/plugin/notification-badge/notification-badge.plugin.desktop.in
similarity index 100%
rename from src/client/plugin/notification-badge/notification-badge.plugin.in
rename to src/client/plugin/notification-badge/notification-badge.plugin.desktop.in
diff --git a/src/client/plugin/sent-sound/meson.build b/src/client/plugin/sent-sound/meson.build
index 70a88117..ba627228 100644
--- a/src/client/plugin/sent-sound/meson.build
+++ b/src/client/plugin/sent-sound/meson.build
@@ -5,7 +5,7 @@ send_sound_dependencies = plugin_dependencies
 send_sound_dependencies += gsound
 
 plugin_src = files(plugin_name + '.vala')
-plugin_data = plugin_name + '.plugin'
+plugin_data = plugin_name + plugin_data_suffix
 plugin_dest = plugins_dir / plugin_name
 
 shared_module(
@@ -20,7 +20,7 @@ shared_module(
 )
 
 i18n.merge_file(
-  input: files(plugin_data + '.in'),
+  input: files(plugin_data + plugin_data_src_suffix),
   output: plugin_data,
   type: 'desktop',
   po_dir: po_dir,
diff --git a/src/client/plugin/sent-sound/sent-sound.plugin.in 
b/src/client/plugin/sent-sound/sent-sound.plugin.desktop.in
similarity index 100%
rename from src/client/plugin/sent-sound/sent-sound.plugin.in
rename to src/client/plugin/sent-sound/sent-sound.plugin.desktop.in
diff --git a/src/client/plugin/special-folders/meson.build b/src/client/plugin/special-folders/meson.build
index dec6ce60..f6d1d522 100644
--- a/src/client/plugin/special-folders/meson.build
+++ b/src/client/plugin/special-folders/meson.build
@@ -2,7 +2,7 @@
 plugin_name = 'special-folders'
 
 plugin_src = files(plugin_name + '.vala')
-plugin_data = plugin_name + '.plugin'
+plugin_data = plugin_name + plugin_data_suffix
 plugin_dest = plugins_dir / plugin_name
 
 shared_module(
@@ -17,7 +17,7 @@ shared_module(
 )
 
 i18n.merge_file(
-  input: files(plugin_data + '.in'),
+  input: files(plugin_data + plugin_data_src_suffix),
   output: plugin_data,
   type: 'desktop',
   po_dir: po_dir,
diff --git a/src/client/plugin/special-folders/special-folders.plugin.in 
b/src/client/plugin/special-folders/special-folders.plugin.desktop.in
similarity index 100%
rename from src/client/plugin/special-folders/special-folders.plugin.in
rename to src/client/plugin/special-folders/special-folders.plugin.desktop.in