<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/115047/">https://git.reviewboard.kde.org/r/115047/</a>
</td>
</tr>
</table>
<br />
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">The patterns worked as-is in kdelibs4, because there the order of substitution of tag text and attribute values was not consistent. For some tags it was text as %1, for other the attribute value. With the new system this is consistent (text always %1, then the attribute values in the listed order), but I forgot to reverse the order in the affected patterns as well.</pre>
<br />
<div>
<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/115047/diff/2/?file=234180#file234180line201" style="color: black; font-weight: bold; text-decoration: underline;">autotests/klocalizedstringtest.cpp</a>
<span style="font-weight: normal;">
(Diff revision 2)
</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; ">void KLocalizedStringTest::correctSubs()</pre></td>
</tr>
</tbody>
<tbody>
<tr>
<th bgcolor="#e9eaa8" style="border-right: 1px solid #C0C0C0;" align="right"><font size="2">196</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="n">QCOMPARE</span><span class="p">(</span><span class="n">xi18n</span><span class="p">(</span><span class="s">"E = mc^2"</span><span class="p">),</span></pre></td>
<th bgcolor="#e9eaa8" style="border-left: 1px solid #C0C0C0; border-right: 1px solid #C0C0C0;" align="right"><font size="2">201</font></th>
<td bgcolor="#fdfebc" width="50%"><pre style="font-size: 8pt; line-height: 140%; margin: 0; "> <span class="c1">// <application/></span></pre></td>
</tr>
</tbody>
</table>
<pre style="margin-left: 2em; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Can the tag testing be extracted into a separate method? The tests above with <emphasis> are just to test markup resolution in various contexts, not to test the <emphasis> tag itself.</pre>
</div>
<br />
<p>- Chusslove Illich</p>
<br />
<p>On January 16th, 2014, 10:37 p.m. CET, Friedrich W. H. Kossebau wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('https://git.reviewboard.kde.org/static/rb/images/review_request_box_top_bg.ab6f3b1072c9.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
<tr>
<td>
<div>Review request for KDE Frameworks and Chusslove Illich.</div>
<div>By Friedrich W. H. Kossebau.</div>
<p style="color: grey;"><i>Updated Jan. 16, 2014, 10:37 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
ki18n
</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;">After fixing the DrKonqi dialog texts to use xi18n calls where needed I found that for <link> elements the url and the description text are used in swapped order when the <link> element is substituted. Looking into kuitmarkup.cpp I found that...
a) indeed for some elements the value of the attribute was expected to be the first argument (%1) on substitution, while for others it was expected to be the second (%2) (<note>, <warning>, <link>)
b) for some elements also the attribute name used in the comment was not matching the actual attribute name (<link>, <email>
Comparing to the old kuitsemantics.cpp that seems a 1:1 porting. Strange that it worked with kdelibs4. Did the translations possibly have the order fixed where needed? Or had the old SET_PATTERN macro a different handling (did not investigate that, only the new)?
In any case, the attached patch fixes the order of attributes where it seemed needed (to fix a)) and aligned the comments with the actual attribute names where needed (to fix b)).
The result should then match the current tutorial at http://techbase.kde.org/Development/Tutorials/Localization/i18n_Semantics</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;">DrKonqi dialogs get proper links with the patch used.
And all existing and new autotests pass as expected.</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>autotests/klocalizedstringtest.cpp <span style="color: grey">(30f5bc1)</span></li>
<li>src/kuitmarkup.cpp <span style="color: grey">(fa76e5f)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/115047/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>