From 03e7a16fe2802160b8344058f225a57bdb9c59f5 Mon Sep 17 00:00:00 2001
From: Eike Rathke <erack@redhat.com>
Date: Thu, 19 Dec 2013 12:24:31 +0100
Subject: 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
---
 desktop/source/app/langselect.cxx | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'desktop/source/app/langselect.cxx')

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();
 }
 
-- 
cgit