diff options
| author | Andras Timar <andras.timar@collabora.com> | 2024-06-24 01:23:22 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2024-06-24 19:20:09 +0200 |
| commit | 1cb6f498ab74812e8415f40f250b2f32e57ba930 (patch) | |
| tree | 18961cb1f8c76c548bad4ac17d252accb86143e2 | |
| parent | d065d61ce7735337cca0450d7b37fab6fde72de3 (diff) | |
LOK: fix UI language fallback, e.g. zh-HK -> zh-TW
cp-23.05.14-1
The original author wanted to handle de-CH as special case, but
he wrote a general condition.
- comphelper::LibreOfficeKit::isActive() is redundant, because we
call SfxViewShell::SetLOKLanguageTag() from LOK.
- AFAIK there are no other, similar cases. We know about only de-CH,
so let's make it explicit in the condition.
- This fixes UI language setting when the integration asks for zh-HK.
Previously it falsely fell back to en-US here, instead of zh-TW.
Change-Id: Ie42e09b8e202b654b109ab8d777ab36a5ef56dca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169363
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 800c3654cc25..39c5065612fc 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -3339,8 +3339,8 @@ void SfxViewShell::SetLOKLanguageTag(const OUString& rBcp47LanguageTag) LanguageTag aFallbackTag = LanguageTag(getInstalledLocaleForSystemUILanguage(inst, /* bRequestInstallIfMissing */ false, rBcp47LanguageTag), true).makeFallback(); // If we want de-CH, and the de localisation is available, we don't want to use de-DE as then - // the magic in Translate::get() won't turn ess-zet into double s. Possibly other similar cases? - if (comphelper::LibreOfficeKit::isActive() && aTag.getLanguage() == aFallbackTag.getLanguage()) + // the magic in Translate::get() won't turn ess-zet into double s. + if (rBcp47LanguageTag == "de-CH") maLOKLanguageTag = aTag; else maLOKLanguageTag = aFallbackTag; |