[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - cui/source

[Ming Hua (via logerrit)]

 cui/source/dialogs/about.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit bbf7cf0da359dfdd0f6ee7516eb05a9adc8a2354
Author:     Ming Hua <plateauwolf at qq.com>
AuthorDate: Tue Dec 22 17:22:26 2020 +0800
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Sun Dec 27 07:20:37 2020 +0100

    tdf#127401 Fix release notes URL for simplified Chinese (zh-CN) UI
    
    Use getBcp47() instead of getLanguage() to construct release notes URL
    for About dialog, just like what commit
    787647b488d02be2acbbad4fa7873508dcb926c2 did for WhatsNew infobar.
    
    Should also affect other locales using ll-CC style wiki notation with
    both language and country codes, like pt-BR.
    
    Change-Id: Ic4698946f500b5901eb0c519f1fd4e3a4b8456cb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108147
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
    (cherry picked from commit ce614dcc6d099ce14acae22b48dacf299ef470fb)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108179
    Reviewed-by: Ming Hua <plateauwolf at qq.com>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index a4701019c938..021e9e4c8856 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -122,9 +122,10 @@ AboutDialog::AboutDialog(weld::Window *pParent)
   localizeWebserviceURI(sURL);
   m_pWebsiteButton->set_uri(sURL);
 
+  // See also SID_WHATSNEW in sfx2/source/appl/appserv.cxx
   sURL = officecfg::Office::Common::Menus::ReleaseNotesURL::get() +
          "?LOvers=" + utl::ConfigManager::getProductVersion() + "&LOlocale=" +
-         LanguageTag(utl::ConfigManager::getUILocale()).getLanguage();
+         LanguageTag(utl::ConfigManager::getUILocale()).getBcp47();
   m_pReleaseNotesButton->set_uri(sURL);
 
   // Handler