gtk3: show language name on the IME menu.

BUG=https://bugzilla.redhat.com/show_bug.cgi?id=803177
TEST=manual

Review URL: https://codereview.appspot.com/5819049

diff --git a/src/ibusutil.c b/src/ibusutil.c
index d0bbd52..1b1a833 100644 (file)
--- a/src/ibusutil.c
+++ b/src/ibusutil.c
@@ -147,7 +147,7 @@ ibus_get_language_name(const gchar *_locale) {
     }
     else {
 #ifdef ENABLE_NLS
-        return dgettext("iso_639", N_("Other"));
+        return dgettext(GETTEXT_PACKAGE, N_("Other"));
 #else
         return N_("Other");
 #endif

diff --git a/ui/gtk3/panel.vala b/ui/gtk3/panel.vala
index 79404cf..53789d2 100644 (file)
--- a/ui/gtk3/panel.vala
+++ b/ui/gtk3/panel.vala
@@ -330,8 +330,10 @@ class Panel : IBus.PanelService {
 
         // Append IMEs
         foreach (var engine in m_engines) {
+            var language = engine.get_language();
             var longname = engine.get_longname();
-            var item = new Gtk.ImageMenuItem.with_label(longname);
+            var item = new Gtk.ImageMenuItem.with_label(
+                "%s - %s".printf (IBus.get_language_name(language), longname));
             if (engine.get_icon() != "") {
                 var icon = new IconWidget(engine.get_icon(), width);
                  item.set_image(icon);