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

[Aleix Pol Gonzalez]

> On June 12, 2014, 12:54 p.m., Aleix Pol Gonzalez wrote:
> > src/core/kconfigini.cpp, line 79
> > <https://git.reviewboard.kde.org/r/118692/diff/1/?file=280469#file280469line79>
> >
> >     Is it really like that?
> >     
> >     I think the catalan locale is es_CA, and the short representation we use is "ca".

My bad, it's ca_ES. Never mind my comment.


- Aleix


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


On June 12, 2014, 9:41 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 12, 2014, 9:41 a.m.)
> 
> 
> Review request for KDE Frameworks, David Faure and John Layt.
> 
> 
> 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 cfa6c2071a21a642833291c9de41060a7431b765 
>   src/core/kconfigini.cpp df834f57fc44bbf9f4f28f1bc4eb5717e2ff1cee 
> 
> 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/20140612/3cd6ed11/attachment.html>