[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:40:12
Message-ID: 20150930114012.16344.92198 () mimi ! kde ! org
[Download RAW message or body]
--===============4620459840835146066==
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
> On Sept. 30, 2015, 1:15 nachm., David Edmundson wrote:
> > kcms/keyboard/xkb_rules.cpp, line 74
> > <https://git.reviewboard.kde.org/r/125462/diff/1/?file=408926#file408926line74>
> >
> > > Note that QString::toHtmlEscaped() cannot be used here because it would also \
> > > convert '"', which is contained verbatim in the translation files.
> >
> >
> > As a general guide if you need to explain something in a commit log, you should \
> > put that comment in the code too
Yeah, I didn't explicitly mention toHTMLEscaped() in the comment, but thought later I \
should in the review request. Will add that to the comment in the code when I submit.
- Wolfgang
-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/125462/#review86153
-----------------------------------------------------------
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
>
>
--===============4620459840835146066==
MIME-Version: 1.0
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: 7bit
<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;"> <p style="margin-top: 0;">On September 30th, 2015, 1:15 nachm. CEST, \
<b>David Edmundson</b> wrote:</p> <blockquote style="margin-left: 1em; border-left: \
2px solid #d0d0d0; padding-left: 10px;">
<table width="100%" border="0" bgcolor="white" style="border: 1px solid #C0C0C0; \
border-collapse: collapse; margin: 2px padding: 2px;"> <thead>
<tr>
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom: 1px solid #C0C0C0; \
font-size: 9pt; padding: 4px 8px; text-align: left;"> <a \
href="https://git.reviewboard.kde.org/r/125462/diff/1/?file=408926#file408926line74" \
style="color: black; font-weight: bold; text-decoration: \
underline;">kcms/keyboard/xkb_rules.cpp</a> <span style="font-weight: normal;">
(Diff revision 1)
</span>
</th>
</tr>
</thead>
<tbody style="background-color: #e4d9cb; padding: 4px 8px; text-align: center;">
<tr>
<td colspan="4"><pre style="font-size: 8pt; line-height: 140%; margin: 0; \
">private:</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#b1ebb0" style="border-right: 1px solid #C0C0C0;" \
align="right"><font size="2"></font></th> <td bgcolor="#c5ffc4" width="50%"><pre \
style="font-size: 8pt; line-height: 140%; margin: 0; "></pre></td> <th \
bgcolor="#b1ebb0" style="border-left: 1px solid #C0C0C0; border-right: 1px solid \
#C0C0C0;" align="right"><font size="2">74</font></th> <td bgcolor="#c5ffc4" \
width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span \
class="k">return</span> <span class="n">i18nd</span><span class="p">(</span><span \
class="s">"xkeyboard-config"</span><span class="p">,</span> <span \
class="n">msgid</span><span class="p">.</span><span class="n">replace</span><span \
class="p">(</span><span class="n">QLatin1Literal</span><span class="p">(</span><span \
class="s">"<"</span><span class="p">),</span> <span \
class="n">QLatin1Literal</span><span class="p">(</span><span \
class="s">"&lt;"</span><span class="p">)).</span><span \
class="n">replace</span><span class="p">(</span><span \
class="n">QLatin1Literal</span><span class="p">(</span><span \
class="s">">"</span><span class="p">),</span> <span \
class="n">QLatin1Literal</span><span class="p">(</span><span \
class="s">"&gt;"</span><span class="p">)).</span><span \
class="n">toUtf8</span><span class="p">()).</span><span clas \
s="n">replace</span><span class="p">(</span><span \
class="n">QLatin1Literal</span><span class="p">(</span><span \
class="s">"&lt;"</span><span class="p">),</span> <span \
class="n">QLatin1Literal</span><span class="p">(</span><span \
class="s">"<"</span><span class="p">)).</span><span \
class="n">replace</span><span class="p">(</span><span \
class="n">QLatin1Literal</span><span class="p">(</span><span \
class="s">"&gt;"</span><span class="p">),</span> <span \
class="n">QLatin1Literal</span><span class="p">(</span><span \
class="s">">"</span><span class="p">));</span></pre></td> </tr>
</tbody>
</table>
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: \
-pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><blockquote \
style="text-rendering: inherit;padding: 0 0 0 1em;border-left: 1px solid \
#bbb;white-space: normal;margin: 0 0 0 0.5em;line-height: inherit;"> <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> \
</blockquote> <p style="padding: 0;text-rendering: inherit;margin: 0;line-height: \
inherit;white-space: inherit;">As a general guide if you need to explain something in \
a commit log, you should put that comment in the code too</p></pre> </blockquote>
</blockquote>
<pre style="margin-left: 1em; 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;">Yeah, I didn't explicitly mention toHTMLEscaped() in the comment, but \
thought later I should in the review request. Will add that to the comment in the \
code when I submit.</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 '<' and '>' 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>
--===============4620459840835146066==--
[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]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic