[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sfx2/source

[Franklin Weng]

 sfx2/source/appl/appserv.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5fefbde340ed3bb7591f2301282e986c1caf2ee9
Author: Franklin Weng <franklin at goodhorse.idv.tw>
Date:   Wed Feb 28 18:12:07 2018 +0800

    tdf#115795 Solve wrong redirect behavior of "Get Online Help"
    
    When under locale zh-TW, Help > Get Online Help would use only "zh"
    as the parameter of LOLang and sent it to hub.libreoffice.org, which
    would redirect to Simplified Chinese forum instead of zh_TW
    ask.libreoffice.org forum.  After discussing with Guilhem he
    refactored the behavior of the Hub, use LOlocale instead of LOLang,
    and keep LOLang for backward compatibility.  The LibreOffice sent
    LOlocale instead to avoid this problem happening again.
    
    Change-Id: Ia9348cff88723210f693e65260bb987826a3f3ea
    Reviewed-on: https://gerrit.libreoffice.org/50503
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    (cherry picked from commit 7c1f11985c0b42981cf8600840fb87521ce5ad33)
    Reviewed-on: https://gerrit.libreoffice.org/50511

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 1e2a2ec4984c..7ed64646e37f 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -499,8 +499,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
         {
             // Askbot has URL's normalized to languages, not locales
             // Get language from locale: ll or lll or ll-CC or lll-CC
-            OUString aLang = LanguageTag(utl::ConfigManager::getLocale()).getLanguage();
-            OUString sURL("https://hub.libreoffice.org/forum/?LOlang=" + aLang);
+
+            OUString sURL("https://hub.libreoffice.org/forum/?LOlocale=" + utl::ConfigManager::getLocale());
             sfx2::openUriExternally(sURL, false);
             break;
         }