Review Request 125462: Completely fix broken translations in keyboard KCM advanced page

[Wolfgang Bauer]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/125462/
-----------------------------------------------------------

(Updated Sept. 30, 2015, noon)


Status
------

This change has been marked as submitted.


Review request for Plasma and David Edmundson.


Changes
-------

Submitted with commit 6d192f58efc1f4fc34e4ee1d6d072ba11a6a29a1 by Wolfgang Bauer to branch Plasma/5.4.


Bugs: 341527
    https://bugs.kde.org/show_bug.cgi?id=341527


Repository: plasma-desktop


Description
-------

The xkeyboard-config translation files contain the characters '<' and '>' in HTML-escaped form. Therefore we need to convert them before/after looking up the translation.

Note that QString::toHtmlEscaped() cannot be used here because it would also convert '"', which is contained verbatim in the translation files.


Diffs
-----

  kcms/keyboard/xkb_rules.cpp 27ff104 

Diff: https://git.reviewboard.kde.org/r/125462/diff/


Testing
-------

Ran "kcmshell5 keyboard" on a german system, all options are correctly translated now, see attached screenshots.


File Attachments
----------------

Before
  https://git.reviewboard.kde.org/media/uploaded/files/2015/09/30/c3c67172-12fd-4cee-ad78-1a873edb62f2__before.png
After
  https://git.reviewboard.kde.org/media/uploaded/files/2015/09/30/08a4ab30-b7ec-4db2-ae34-dce0bbc9e62e__after.png


Thanks,

Wolfgang Bauer

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20150930/e6e06ba8/attachment.html>