summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2013-12-19 12:24:31 +0100
committerEike Rathke <erack@redhat.com>2013-12-19 12:31:45 +0100
commit8b48c8d1ac7b2a4ef557b9e004a772fa0a6ade71 (patch)
tree8f2bfa113834f3765206762194a4822a603755f6
parent981ac4435369acb0c789c77b8ef5517f53fc2f3f (diff)
use proper LanguageTag fallback instead of dumb startsWith(), fdo#68714
A ca_ES@valencia (=> ca-ES-valencia) locale did not result in 'ca-valencia' UI being selected but 'ca' only instead. Change-Id: Ifa405add2ff7b45e030b02af4338de195b457cb2 (cherry picked from commit 03e7a16fe2802160b8344058f225a57bdb9c59f5)
-rw-r--r--desktop/source/app/langselect.cxx13
1 files changed, 4 insertions, 9 deletions
diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx
index 49d001a087dc..291e70822222 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -58,20 +58,15 @@ OUString getInstalledLocale(
return installed[i];
}
}
- // FIXME: It is not very clever to handle the zh-HK -> zh-TW fallback here,
- // but right now, there is no place that handles those fallbacks globally:
- if (locale == "zh-HK") {
+ ::std::vector<OUString> fallbacks( LanguageTag( locale).getFallbackStrings( false));
+ for (size_t f=0; f < fallbacks.size(); ++f) {
+ const OUString& rf = fallbacks[f];
for (sal_Int32 i = 0; i != installed.getLength(); ++i) {
- if (installed[i] == "zh-TW") {
+ if (installed[i] == rf) {
return installed[i];
}
}
}
- for (sal_Int32 i = 0; i != installed.getLength(); ++i) {
- if (locale.startsWith(installed[i])) {
- return installed[i];
- }
- }
return OUString();
}