Review Request 118692: Fix reading of entries for language/country combinations

[Matthew Dawson]

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

Ship it!


LGTM.  Just a couple of minor issues, and a couple more test cases and it looks good to go in.  Feel free to push after the implementing the changes.


autotests/kdesktopfiletest.cpp
<https://git.reviewboard.kde.org/r/118692/#comment42054>

    Please add a test for both:
     - when both the country/language match and a modifier is included.
     - When the language is omitted, the country matches, and a modifier is included.



src/core/kconfig.cpp
<https://git.reviewboard.kde.org/r/118692/#comment42055>

    Please move these changes to a separate commit, so they don't get caught up in these changes.  I'm otherwise fine with the replacements.



src/core/kconfigdata.h
<https://git.reviewboard.kde.org/r/118692/#comment42056>

    Another Q_NULLPTR



src/core/kconfigini.cpp
<https://git.reviewboard.kde.org/r/118692/#comment42057>

    Another Q_NULLPTR.


- Matthew Dawson


On June 16, 2014, 4:26 a.m., Martin Gräßlin wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/118692/
> -----------------------------------------------------------
> 
> (Updated June 16, 2014, 4:26 a.m.)
> 
> 
> Review request for KDE Frameworks, David Faure, John Layt, and Oswald Buddenhagen.
> 
> 
> Repository: kconfig
> 
> 
> Description
> -------
> 
> Fix reading of entries for language/country combinations
> 
> This fixes a regression introduced in
> 988f09bb051dca0437ecec431ee44ed5b4a560d8.
> 
> The mentioned commit ensures that if the locale is e.g. "de_DE" the
> entry "de" will be used. But this breaks if there is a translation
> for another country. E.g. for "de_CH" it would also pick the "de"
> entry.
> 
> This change now operates on both just the language code and the locale.
> If an entry with the language code is present it will be picked. If
> another entry with the exact locale is found it will be overwritten.
> 
> 
> Diffs
> -----
> 
>   autotests/kdesktopfiletest.cpp 6c3af4c2cd55b9140c0cd48526947431ceb7e798 
>   src/core/kconfig.cpp a2598f8e8fce91a8de3f34b272e15a6c280a50db 
>   src/core/kconfigdata.h fdec85dc90467560bd312b72266ef0b3f243d076 
>   src/core/kconfigdata.cpp 109063d65e97bcb7ba08cf6e5a6f3acb885fe845 
>   src/core/kconfigini.cpp a882ee31150658f3e5cfb036362ff0583f71cbd9 
> 
> Diff: https://git.reviewboard.kde.org/r/118692/diff/
> 
> 
> Testing
> -------
> 
> unit tests still pass, but my knowledge about KConfig and locales is not sufficient to be sure that this is now 100 % correct.
> 
> 
> Thanks,
> 
> Martin Gräßlin
> 
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20140617/0e9416a8/attachment.html>