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

[prev in list] [next in list] [prev in thread] [next in thread] 

List: kde-panel-devel
Subject: Re: Review Request 125462: Completely fix broken translations in keyboard KCM advanced page
From: "Wolfgang Bauer" <wbauer () tmo ! at>
Date: 2015-09-30 11:38:42
Message-ID: 20150930113842.16344.4429 () mimi ! kde ! org
[Download RAW message or body]

--===============5934139453382355585==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit

> On Sept. 30, 2015, 1:13 nachm., Martin Gräßlin wrote:
> > Nice spot! Do you know why it's html escaped in the translation file?

No, sorry.
Probably because the original strings are also escaped, as they are contained in XML \
files (/usr/share/X11/xkb/rules/evdev.xml)...

- Wolfgang

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

On Sept. 30, 2015, 1:07 nachm., Wolfgang Bauer wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/125462/
> -----------------------------------------------------------
> 
> (Updated Sept. 30, 2015, 1:07 nachm.)
> 
> 
> Review request for Plasma and David Edmundson.
> 
> 
> 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
> 
> 

--===============5934139453382355585==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 8bit

<html>
 <body>
  <div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
   <table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 \
solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;">  \
<tr>  <td>
      This is an automatically generated e-mail. To reply, visit:
      <a href="https://git.reviewboard.kde.org/r/125462/">https://git.reviewboard.kde.org/r/125462/</a>
  </td>
    </tr>
   </table>
   <br />

<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: \
10px;"> On September 30th, 2015, 1:13 nachm. CEST, \
Martin Gräßlin wrote: <blockquote style="margin-left: 1em; border-left: \
2px solid #d0d0d0; padding-left: 10px;"> <pre style="white-space: pre-wrap; \
white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; \
word-wrap: break-word;">Nice spot! Do you know why it's html \
escaped in the translation file?</pre> </blockquote>

</blockquote>

<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: \
0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">No, \
sorry. Probably because the original strings are also escaped, as they are contained \
in XML files (/usr/share/X11/xkb/rules/evdev.xml)...</p></pre> <br />

<p>- Wolfgang</p>

<br />
<p>On September 30th, 2015, 1:07 nachm. CEST, Wolfgang Bauer wrote:</p>

<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: \
1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; \
-webkit-border-radius: 6px;">  <tr>
  <td>

<div>Review request for Plasma and David Edmundson.</div>
<div>By Wolfgang Bauer.</div>

<p style="color: grey;"><i>Updated Sept. 30, 2015, 1:07 nachm.</i></p>

<div style="margin-top: 1.5em;">
 <b style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Bugs: </b>

 <a href="https://bugs.kde.org/show_bug.cgi?id=341527">341527</a>

</div>

<div style="margin-top: 1.5em;">
 <b style="color: #575012; font-size: 10pt;">Repository: </b>
plasma-desktop
</div>

<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
 <table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" \
style="border: 1px solid #b8b5a0">  <tr>
  <td>
   <pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">The xkeyboard-config translation files contain the \
characters '&lt;' and '&gt;' in HTML-escaped form. Therefore we need to convert them \
before/after looking up the translation.</p> <p style="padding: 0;text-rendering: \
inherit;margin: 0;line-height: inherit;white-space: inherit;">Note that \
QString::toHtmlEscaped() cannot be used here because it would also convert '"', which \
is contained verbatim in the translation files.</p></pre>  </td>
 </tr>
</table>

<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: \
1px solid #b8b5a0">  <tr>
  <td>
   <pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: \
-moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: \
break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">Ran "kcmshell5 keyboard" on a german system, all \
options are correctly translated now, see attached screenshots.</p></pre>  </td>
 </tr>
</table>

<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">

 <li>kcms/keyboard/xkb_rules.cpp <span style="color: grey">(27ff104)</span></li>

</ul>

<p><a href="https://git.reviewboard.kde.org/r/125462/diff/" style="margin-left: \
3em;">View Diff</a></p>

<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">File Attachments \
</h1>

 <li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2015/09/30/c3c67172-12fd-4cee-ad78-1a873edb62f2__before.png">Before</a></li>

 <li><a href="https://git.reviewboard.kde.org/media/uploaded/files/2015/09/30/08a4ab30-b7ec-4db2-ae34-dce0bbc9e62e__after.png">After</a></li>

</ul>

  </td>
 </tr>
</table>

  </div>
 </body>
</html>

--===============5934139453382355585==--

[Attachment #3 (text/plain)]

_______________________________________________
Plasma-devel mailing list
Plasma-devel@kde.org
https://mail.kde.org/mailman/listinfo/plasma-devel

[prev in list] [next in list] [prev in thread] [next in thread] 