Review Request 115047: Fix substitution order for some KUIT elements with attributes

[Chusslove Illich]

> On Jan. 17, 2014, 12:13 a.m., Chusslove Illich wrote:
> > autotests/klocalizedstringtest.cpp, line 272
> > <https://git.reviewboard.kde.org/r/115047/diff/3/?file=234183#file234183line272>
> >
> >     It works for me, though I see where it should fail. Maybe I got it compiled with -DNDEBUG.
> >     
> >     If in kuitmarkup.cpp after this line:
> >     
> >     KLocalizedString aggText = patterns.value(attribKey).value(format);
> >     
> >     you add
> >     
> >     aggText = aggText.relaxedSubs();
> >     
> >     does the test pass then?

.relaxSubs(), sorry.


- Chusslove


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


On Jan. 16, 2014, 11:57 p.m., Friedrich W. H. Kossebau wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/115047/
> -----------------------------------------------------------
> 
> (Updated Jan. 16, 2014, 11:57 p.m.)
> 
> 
> Review request for KDE Frameworks and Chusslove Illich.
> 
> 
> Repository: ki18n
> 
> 
> Description
> -------
> 
> 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
> 
> 
> Diffs
> -----
> 
>   autotests/klocalizedstringtest.h 9b663f5 
>   autotests/klocalizedstringtest.cpp 30f5bc1 
>   src/kuitmarkup.cpp fa76e5f 
> 
> Diff: https://git.reviewboard.kde.org/r/115047/diff/
> 
> 
> Testing
> -------
> 
> DrKonqi dialogs get proper links with the patch used.
> And all existing and new autotests pass as expected.
> 
> 
> Thanks,
> 
> Friedrich W. H. Kossebau
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20140116/263d4788/attachment.html>