Merge lp:~attente/indicator-keyboard/fix-accessible-desc into lp:indicator-keyboard

[William Hua]

Append input source suffix to accessible-desc as described in design spec.

Append input source suffix to accessible-desc as described in design spec.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:111
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/20/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/20/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-keyboard-ci/20/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

I think that we probably need to use printf formatting incase a
translation doesn't allow for the name to be at the beginning of the
sentence in their language. So "%s input source" would be better to
translate.

[Matthieu Baerts (matttbe)]

Hello,

> I think that we probably need to use printf formatting incase a
> translation doesn't allow for the name to be at the beginning of the
> sentence in their language.

Yes, I confirm that in other language (e.g. French), the name should be after.

But is it really needed to add 'input source'? Ok, according to design spec, these words should be added but then, the description can be very long, e.g.: 'English (UK, Dvorak with UK punctuation) input source' => 53 chars (and the French translation is even longer :) )

[lp:~attente/indicator-keyboard/fix-accessible-desc]

112. By William Hua on 2013-08-29

Use printf-style format string instead.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:112
http://jenkins.qa.ubuntu.com/job/indicator-keyboard-ci/21/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-amd64-ci/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/21
        deb: http://jenkins.qa.ubuntu.com/job/indicator-keyboard-saucy-armhf-ci/21/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/indicator-keyboard-ci/21/rebuild

review: Approve (continuous-integration)

[Ted Gould (ted)]

review: Approve

=== modified file 'lib/main.vala'
--- lib/main.vala	2013-08-28 12:20:24 +0000
+++ lib/main.vala	2013-08-29 02:25:15 +0000
@@ -366,7 +366,8 @@
 		var builder = new VariantBuilder (new VariantType ("a{sv}"));
 		builder.add ("{sv}", "visible", new Variant.boolean (visible));
 		if (name != null) {
-			builder.add ("{sv}", "accessible-desc", new Variant.string ((!) name));
+			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 ());

=== modified file 'po/indicator-keyboard.pot'
--- po/indicator-keyboard.pot	2013-08-22 07:12:38 +0000
+++ po/indicator-keyboard.pot	2013-08-29 02:25:15 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-22 15:09+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 <[e-mail]>\n"
@@ -17,14 +17,19 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../lib/main.c:1449 ../lib/main.vala:342
+#: ../lib/main.c:1870 ../lib/main.vala:369
+#, c-format
+msgid "%s input source"
+msgstr ""
+
+#: ../lib/main.c:2220 ../lib/main.vala:467
 msgid "Character Map"
 msgstr ""
 
-#: ../lib/main.c:1451 ../lib/main.vala:343
+#: ../lib/main.c:2223 ../lib/main.vala:468
 msgid "Keyboard Layout Chart"
 msgstr ""
 
-#: ../lib/main.c:1453 ../lib/main.vala:344
+#: ../lib/main.c:2226 ../lib/main.vala:469
 msgid "Text Entry Settings..."
 msgstr ""