aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hua <william.hua@canonical.com>2013-08-29 10:22:25 +0800
committerWilliam Hua <william.hua@canonical.com>2013-08-29 10:22:25 +0800
commit807c6d8708d93d49c20ab14f13e343828d0bf3df (patch)
tree7854b72a54a7553bc4d1345be6d0396b22c13ddf
parentf1416ee304e6025e9b65270e6ab5810153632ad4 (diff)
downloadayatana-indicator-keyboard-807c6d8708d93d49c20ab14f13e343828d0bf3df.tar.gz
ayatana-indicator-keyboard-807c6d8708d93d49c20ab14f13e343828d0bf3df.tar.bz2
ayatana-indicator-keyboard-807c6d8708d93d49c20ab14f13e343828d0bf3df.zip
Use printf-style format string instead.
-rw-r--r--lib/main.vala4
-rw-r--r--po/indicator-keyboard.pot13
2 files changed, 9 insertions, 8 deletions
diff --git a/lib/main.vala b/lib/main.vala
index cf196650..7aac365c 100644
--- a/lib/main.vala
+++ b/lib/main.vala
@@ -366,8 +366,8 @@ public class Indicator.Keyboard.Service : Object {
var builder = new VariantBuilder (new VariantType ("a{sv}"));
builder.add ("{sv}", "visible", new Variant.boolean (visible));
if (name != null) {
- var suffix = _ ("input source");
- builder.add ("{sv}", "accessible-desc", new Variant.string (@"$((!) name) $suffix"));
+ var description = _ ("%s input source").printf ((!) name);
+ builder.add ("{sv}", "accessible-desc", new Variant.string (description));
}
if (icon != null) {
builder.add ("{sv}", "icon", ((!) icon).serialize ());
diff --git a/po/indicator-keyboard.pot b/po/indicator-keyboard.pot
index 47daa8d0..df7dd668 100644
--- a/po/indicator-keyboard.pot
+++ b/po/indicator-keyboard.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-28 23:07+0800\n"
+"POT-Creation-Date: 2013-08-29 10:20+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,18 +17,19 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../lib/main.c:1874 ../lib/main.vala:369
-msgid "input source"
+#: ../lib/main.c:1870 ../lib/main.vala:369
+#, c-format
+msgid "%s input source"
msgstr ""
-#: ../lib/main.c:2229 ../lib/main.vala:467
+#: ../lib/main.c:2220 ../lib/main.vala:467
msgid "Character Map"
msgstr ""
-#: ../lib/main.c:2232 ../lib/main.vala:468
+#: ../lib/main.c:2223 ../lib/main.vala:468
msgid "Keyboard Layout Chart"
msgstr ""
-#: ../lib/main.c:2235 ../lib/main.vala:469
+#: ../lib/main.c:2226 ../lib/main.vala:469
msgid "Text Entry Settings..."
msgstr ""