Merge lp:~tintou/slingshot/translate-actions into lp:~elementary-pantheon/slingshot/trunk

[Corentin Noël]

Translate applications actions

=== modified file 'lib/synapse-core/desktop-file-service.vala'
--- lib/synapse-core/desktop-file-service.vala	2014-08-21 14:08:17 +0000
+++ lib/synapse-core/desktop-file-service.vala	2015-12-23 15:11:31 +0000
@@ -53,6 +53,7 @@
     public string generic_name { get; construct set; }
     public string comment { get; set; default = ""; }
     public string icon_name { get; construct set; default = ""; }
+    public string gettext_domain { get; construct set; }
 
     public bool needs_terminal { get; set; default = false; }
     public string filename { get; construct set; }
@@ -73,6 +74,7 @@
     
     public EnvironmentType show_in { get; set; default = EnvironmentType.ALL; }
 
+    private const string[] SUPPORTED_GETTEXT_DOMAINS_KEYS = {"X-Ubuntu-Gettext-Domain", "X-GNOME-Gettext-Domain"};
     private static const string GROUP = "Desktop Entry";
 
     public DesktopFileInfo.for_keyfile (string path, KeyFile keyfile,
@@ -125,6 +127,12 @@
             throw new DesktopFileError.UNINTERESTING_ENTRY ("Screensaver desktop entry");
           }
         }
+        foreach (var domain_key in SUPPORTED_GETTEXT_DOMAINS_KEYS) {
+          if (keyfile.has_key (GROUP, domain_key)) {
+            gettext_domain = keyfile.get_string (GROUP, domain_key);
+            break;
+          }
+        }
 
         DesktopAppInfo app_info;
         app_info = new DesktopAppInfo.from_keyfile (keyfile);
 
=== modified file 'lib/synapse-plugins/desktop-file-plugin.vala'
--- lib/synapse-plugins/desktop-file-plugin.vala	2015-09-20 17:50:48 +0000
+++ lib/synapse-plugins/desktop-file-plugin.vala	2015-12-23 15:11:31 +0000
@@ -48,12 +48,25 @@
       public AppInfo? app_info { get; set; default = null; }
       public bool needs_terminal { get; set; default = false; }
 
+      private const string[] SUPPORTED_GETTEXT_DOMAINS_KEYS = {"X-Ubuntu-Gettext-Domain", "X-GNOME-Gettext-Domain"};
       private string action_name;
 
       public ActionMatch (string desktop_id, string action_name)
       {
         var desktop_app_info = new DesktopAppInfo (desktop_id);
+        string? textdomain = null;
+        foreach (var domain_key in SUPPORTED_GETTEXT_DOMAINS_KEYS) {
+          textdomain = desktop_app_info.get_string (domain_key);
+          if (textdomain != null) {
+            break;
+          }
+        }
+
         this.title = desktop_app_info.get_action_name (action_name);
+        if (textdomain != null) {
+          this.title = GLib.dgettext (textdomain, this.title);
+        }
+
         this.icon_name = desktop_app_info.get_icon ().to_string ();
         this.description = "";
         this.app_info = desktop_app_info;
@@ -71,6 +84,7 @@
       // for Match interface
       public string title { get; construct set; }
       public string description { get; set; default = ""; }
+      public string? gettext_domain { get; construct set; default = null; }
       public string icon_name { get; construct set; default = ""; }
       public bool has_thumbnail { get; construct set; default = false; }
       public string thumbnail_path { get; construct set; }
@@ -114,6 +128,7 @@
         this.title_unaccented = Utils.remove_accents (this.title_folded);
         this.desktop_id = "application://" + info.desktop_id;
         this.generic_name = info.generic_name;
+        this.gettext_domain = info.gettext_domain;
       }
     }
 
@@ -197,6 +212,7 @@
         unowned string unaccented_title = dfm.title_unaccented;
         unowned string comment = dfm.description;
         unowned string generic_name = dfm.generic_name;
+        unowned string gettext_domain = dfm.gettext_domain;
 
         bool matched = false;
         // FIXME: we need to do much smarter relevancy computation in fuzzy re
@@ -229,7 +245,13 @@
         var desktop_app_info = new DesktopAppInfo (id);
         string[] actions = desktop_app_info.list_actions ();
         foreach (string action in actions) {
-          string title = desktop_app_info.get_action_name (action).down ();
+          string title = desktop_app_info.get_action_name (action);
+          if (gettext_domain != null) {
+            title = GLib.dgettext (gettext_domain, title).down ();
+          } else {
+            title = title.down ();
+          }
+
           foreach (var matcher in matchers)
           {
             MatchInfo action_info;