<div>Oops. You are right. My mistake. Sorry. I will update the patch ASAP.</div><div><br><div class="gmail_quote"><div>On Mon, 13 Mar 2017 at 4:43 PM Albert Astals Cid <<a href="mailto:aacid@kde.org">aacid@kde.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="gmail_msg"><div style="font-family:Verdana,Arial,Helvetica,Sans-Serif" class="gmail_msg">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border:1px #c9c399 solid;border-radius:6px" class="gmail_msg">
<tbody><tr class="gmail_msg">
<td class="gmail_msg">
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/129992/" class="gmail_msg" target="_blank">https://git.reviewboard.kde.org/r/129992/</a>
</td>
</tr>
</tbody></table>
<br class="gmail_msg">
</div></div><div class="gmail_msg"><div style="font-family:Verdana,Arial,Helvetica,Sans-Serif" class="gmail_msg"><div class="gmail_msg">
<table width="100%" border="0" bgcolor="white" class="gmail_msg">
<thead class="gmail_msg">
<tr class="gmail_msg">
<th colspan="4" bgcolor="#F0F0F0" style="border-bottom:1px solid #c0c0c0;font-size:9pt;padding:4px 8px;text-align:left" class="gmail_msg">
<a href="https://git.reviewboard.kde.org/r/129992/diff/2/?file=492311#file492311line537" style="color:black;font-weight:bold;text-decoration:underline" class="gmail_msg" target="_blank">keduvocdocument/keduvockvtml2writer.cpp</a>
<span style="font-weight:normal" class="gmail_msg">
(Diff revision 2)
</span>
</th>
</tr>
</thead>
<tbody class="gmail_msg">
<tr class="gmail_msg">
<th bgcolor="#b1ebb0" style="border-right:1px solid #c0c0c0" align="right" class="gmail_msg"><font size="2" class="gmail_msg"></font></th>
<td bgcolor="#c5ffc4" width="50%" class="gmail_msg"><pre style="font-size:8pt;line-height:140%;margin:0" class="gmail_msg"></pre></td>
<th bgcolor="#b1ebb0" style="border-left:1px solid #c0c0c0;border-right:1px solid #c0c0c0" align="right" class="gmail_msg"><font size="2" class="gmail_msg">537</font></th>
<td bgcolor="#c5ffc4" width="50%" class="gmail_msg"><pre style="font-size:8pt;line-height:140%;margin:0" class="gmail_msg"> <span class="m_8110751483478044901k gmail_msg">if</span> <span class="m_8110751483478044901p gmail_msg">(</span> <span class="m_8110751483478044901n gmail_msg">KIO</span><span class="m_8110751483478044901o gmail_msg">::</span><span class="m_8110751483478044901n gmail_msg">upUrl</span><span class="m_8110751483478044901p gmail_msg">(</span><span class="m_8110751483478044901n gmail_msg">docDirUrl</span><span class="m_8110751483478044901p gmail_msg">).</span><span class="m_8110751483478044901n gmail_msg">isParentOf</span><span class="m_8110751483478044901p gmail_msg">(</span> <span class="m_8110751483478044901n gmail_msg">translation</span><span class="m_8110751483478044901o gmail_msg">-></span><span class="m_8110751483478044901n gmail_msg">imageUrl</span><span class="m_8110751483478044901p gmail_msg">())</span> <span class="m_8110751483478044901p gmail_msg">)</span> <span class="m_8110751483478044901p gmail_msg">{</span></pre></td>
</tr>
</tbody>
</table>
<div style="margin-left:2em" class="gmail_msg">
<pre style="white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word" class="gmail_msg"><p style="padding:0;margin:0;line-height:inherit;white-space:inherit" class="gmail_msg">i don't think using docDirUrl and upUrl is what we want, since you're going two levels up in the url now, no?</p></pre>
</div>
</div>
<br class="gmail_msg">
<p class="gmail_msg">- Albert Astals Cid</p></div></div><div class="gmail_msg"><div style="font-family:Verdana,Arial,Helvetica,Sans-Serif" class="gmail_msg">
<br class="gmail_msg">
<p class="gmail_msg">On March 6th, 2017, 11:24 p.m. UTC, Xin Huang wrote:</p>
</div></div><div class="gmail_msg"><div style="font-family:Verdana,Arial,Helvetica,Sans-Serif" class="gmail_msg"><table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border:1px #888a85 solid;border-radius:6px" class="gmail_msg"><tbody><tr class="gmail_msg"><td class="gmail_msg">
<div class="gmail_msg">Review request for KDE Edu.</div>
<div class="gmail_msg">By Xin Huang.</div>
</td></tr></tbody></table></div></div><div class="gmail_msg"><div style="font-family:Verdana,Arial,Helvetica,Sans-Serif" class="gmail_msg"><table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border:1px #888a85 solid;border-radius:6px" class="gmail_msg"><tbody><tr class="gmail_msg"><td class="gmail_msg"><p style="color:grey" class="gmail_msg"><i class="gmail_msg">Updated March 6, 2017, 11:24 p.m.</i></p></td></tr></tbody></table></div></div><div class="gmail_msg"><div style="font-family:Verdana,Arial,Helvetica,Sans-Serif" class="gmail_msg"><table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border:1px #888a85 solid;border-radius:6px" class="gmail_msg"><tbody><tr class="gmail_msg"><td class="gmail_msg">
<div style="margin-top:1.5em" class="gmail_msg">
<b style="color:#575012;font-size:10pt" class="gmail_msg">Repository: </b>
libkeduvocdocument
</div>
<h1 style="color:#575012;font-size:10pt;margin-top:1.5em" class="gmail_msg">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border:1px solid #b8b5a0" class="gmail_msg">
<tbody><tr class="gmail_msg">
<td class="gmail_msg">
<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" class="gmail_msg"><p style="padding:0;margin:0;line-height:inherit;white-space:inherit" class="gmail_msg"></p><div class="m_8110751483478044901codehilite gmail_msg" style="background:#f8f8f8"><pre style="line-height:125%" class="gmail_msg"><span class="gmail_msg"></span><span style="color:#008000;font-weight:bold" class="gmail_msg">bool</span> <span style="color:#008000;font-weight:bold" class="gmail_msg">KEduVocKvtml2Writer</span><span style="color:#666666" class="gmail_msg">:</span><span style="color:#aa22ff" class="gmail_msg">:writeTranslation</span><span style="color:#666666" class="gmail_msg">(</span> <span style="color:#008000;font-weight:bold" class="gmail_msg">QDomElement</span> <span style="color:#666666" class="gmail_msg">&</span><span style="color:#008000;font-weight:bold" class="gmail_msg">translationElement</span><span style="color:#666666" class="gmail_msg">,</span> <span style="color:#008000;font-weight:bold" class="gmail_msg">KEduVocTranslation</span><span style="color:#666666" class="gmail_msg">*</span> <span style="color:#008000;font-weight:bold" class="gmail_msg">
translation</span> <span style="color:#666666" class="gmail_msg">)</span>
{
<span style="color:#666666" class="gmail_msg">//</span> <span style="color:#666666" class="gmail_msg">...</span>
<span style="color:#666666" class="gmail_msg">//</span> sound
if ( <span style="color:#666666" class="gmail_msg">!</span>translation<span style="color:#666666" class="gmail_msg">-></span>soundUrl()<span style="color:#666666" class="gmail_msg">.</span>isEmpty() ) <span style="border:1px solid #ff0000" class="gmail_msg">{</span>
QString urlString;
qDebug() <span style="color:#666666" class="gmail_msg"><<</span> <span style="color:#ba2121" class="gmail_msg">"soundUrl"</span> <span style="color:#666666" class="gmail_msg"><<</span> translation<span style="color:#666666" class="gmail_msg">-></span>soundUrl();
if ( KIO<span style="color:#666666" class="gmail_msg">::</span>upUrl(m_doc<span style="color:#666666" class="gmail_msg">-></span><span style="color:#008000" class="gmail_msg">url()</span><span style="color:#666666" class="gmail_msg">.</span>adjusted(QUrl<span style="color:#666666" class="gmail_msg">::</span>RemoveFilename))<span style="color:#666666" class="gmail_msg">.</span>isParentOf( translation<span style="color:#666666" class="gmail_msg">-></span>soundUrl()) ) <span style="border:1px solid #ff0000" class="gmail_msg">{</span>
<span style="color:#666666" class="gmail_msg">//</span> try to save as <span style="color:#008000" class="gmail_msg">relative</span> <span style="color:#008000" class="gmail_msg">url</span>
urlString <span style="color:#666666" class="gmail_msg">=</span> m_doc<span style="color:#666666" class="gmail_msg">-></span><span style="color:#008000" class="gmail_msg">url()</span><span style="color:#666666" class="gmail_msg">.</span>toString(QUrl<span style="color:#666666" class="gmail_msg">::</span>RemoveFilename) <span style="color:#666666" class="gmail_msg">+</span> <span style="color:#ba2121" class="gmail_msg">'/'</span> <span style="color:#666666" class="gmail_msg">+</span> translation<span style="color:#666666" class="gmail_msg">-></span>soundUrl()<span style="color:#666666" class="gmail_msg">.</span>toString(); <span style="color:#666666" class="gmail_msg">//</span> <span style="color:#666666" class="gmail_msg"><------------</span> HERE
} <span style="color:#008000;font-weight:bold" class="gmail_msg">else</span> {
urlString <span style="color:#666666" class="gmail_msg">=</span> translation<span style="color:#666666" class="gmail_msg">-></span>soundUrl()<span style="color:#666666" class="gmail_msg">.</span><span style="color:#008000" class="gmail_msg">url()</span>;
}
<span style="color:#008000;font-weight:bold" class="gmail_msg">qDebug</span><span style="color:#666666" class="gmail_msg">()</span> <span style="color:#666666" class="gmail_msg"><<</span> <span style="color:#ba2121" class="gmail_msg">"urlString"</span> <span style="color:#666666" class="gmail_msg"><<</span> <span style="color:#008000;font-weight:bold" class="gmail_msg">urlString</span><span style="color:#666666" class="gmail_msg">;</span>
<span style="color:#008000;font-weight:bold" class="gmail_msg">translationElement</span><span style="color:#0000ff;font-weight:bold" class="gmail_msg">.appendChild</span><span style="color:#666666" class="gmail_msg">(</span> <span style="color:#008000;font-weight:bold" class="gmail_msg">newTextElement</span><span style="color:#666666" class="gmail_msg">(</span> <span style="color:#008000;font-weight:bold" class="gmail_msg">KVTML_SOUND</span><span style="color:#666666" class="gmail_msg">,</span> <span style="color:#008000;font-weight:bold" class="gmail_msg">urlString</span> <span style="color:#666666" class="gmail_msg">)</span> <span style="color:#666666" class="gmail_msg">);</span>
<span style="border:1px solid #ff0000" class="gmail_msg">}</span>
</pre></div>
<p></p>
<p style="padding:0;margin:0;line-height:inherit;white-space:inherit" class="gmail_msg">Notice the line marked: The soundUrl of a translation parley passed in is "file:///path/to/kvtml/kvtmlfilename_files/File:En-us-Word.ogg", and the <code style="color:#4444cc;padding:0;white-space:normal;margin:0;line-height:inherit" class="gmail_msg">m_doc->url()</code> is "file:///path/to/kvtml/kvtmlfilename.kvtml". By the old logic saving as relative url, the result will be "file:///path/to/kvtml/file:///path/to/kvtml/kvtmlfilename_files/Files:En-us-word.ogg".</p></pre>
</td>
</tr>
</tbody></table>
<h1 style="color:#575012;font-size:10pt;margin-top:1.5em" class="gmail_msg">Diffs </h1>
<ul style="margin-left:3em;padding-left:0" class="gmail_msg">
<li class="gmail_msg">keduvocdocument/keduvockvtml2writer.cpp <span style="color:grey" class="gmail_msg">(ff9c292)</span></li>
</ul>
<p class="gmail_msg"><a href="https://git.reviewboard.kde.org/r/129992/diff/" style="margin-left:3em" class="gmail_msg" target="_blank">View Diff</a></p>
</td></tr></tbody></table></div></div></blockquote></div></div>