Merge lp:~azzar1/unity/fix-980828 into lp:unity

Proposed by Andrea Azzarone
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: no longer in the source branch.
Merged at revision: 2283
Proposed branch: lp:~azzar1/unity/fix-980828
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
plugins/unityshell/src/ShortcutHint.cpp (+1/-1)
To merge this branch: bzr merge lp:~azzar1/unity/fix-980828
Reviewer Review Type Date Requested Status
Didier Roche-Tolomelli Approve
Review via email: mp+101917@code.launchpad.net

Commit message

The shortcut keys in workspace section of the shortcut overlay aren't translated.

Description of the change

== Problem ==
The shortcut keys in workspace section of the shortcut overlay aren't translated.

== Fix ==
We should use impl::GetTranslatableLabel.

http://ubuntuone.com/4EAicK39xGaHTRGcJKkJNI

UNBLOCK

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Looks good and tested, we want that in a SRU as well :)

(will unblock merging on monday/tuesday when we will have the precise branch)

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

No commit message specified.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/ShortcutHint.cpp'
2--- plugins/unityshell/src/ShortcutHint.cpp 2012-04-03 19:20:08 +0000
3+++ plugins/unityshell/src/ShortcutHint.cpp 2012-04-13 14:40:44 +0000
4@@ -132,7 +132,7 @@
5 if (opt.name() == arg2())
6 {
7 std::string temp(impl::GetMetaKey(opt.value().action().keyToString()));
8- temp = impl::FixShortcutFormat(temp);
9+ temp = impl::GetTranslatableLabel(temp);
10 temp = impl::ProperCase(temp);
11
12 if (value() != temp)