sfx2/source/appl/appserv.cxx | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
New commits: commit 6256b86f10d9a2bc51e72088192f3bfcf9d00437 Author: Heiko Tietze <heiko.tie...@documentfoundation.org> AuthorDate: Thu Jun 4 15:48:10 2020 +0200 Commit: Heiko Tietze <heiko.tie...@documentfoundation.org> CommitDate: Thu Jun 4 16:32:58 2020 +0200 Revert "Resolves tdf#127401 - Chinese locale pointing to wrong hub forward address" This reverts commit 2788cc07e9d0d078b53a7280d524175c03c51e12. Reason for revert: <INSERT REASONING HERE> Change-Id: I47277e7344d5533cc09a3fd6637a0780b36fe739 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95427 Tested-by: Heiko Tietze <heiko.tie...@documentfoundation.org> Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org> diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index c61a8ab7a3a7..6dd813fdf7be 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -551,7 +551,6 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) { // Open donation page based on language + script (BCP47) with language as fall back. OUString aLang = LanguageTag(utl::ConfigManager::getUILocale()).getLanguage(); - if (aLang == "zh") aLang = "zh-cn";//tdf#127401 OUString aBcp47 = LanguageTag(utl::ConfigManager::getUILocale()).getBcp47(); OUString sURL(officecfg::Office::Common::Menus::DonationURL::get() + //https://hub.libreoffice.org/donation/ "?BCP47=" + aBcp47 + "&LOlang=" + aLang ); @@ -561,11 +560,9 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) case SID_WHATSNEW: { // Open release notes depending on version and locale - OUString aLang = LanguageTag(utl::ConfigManager::getUILocale()).getLanguage(); - if (aLang == "zh") aLang = "zh-cn";//tdf#127401 OUString sURL(officecfg::Office::Common::Menus::ReleaseNotesURL::get() + //https://hub.libreoffice.org/ReleaseNotes/ "?LOvers=" + utl::ConfigManager::getProductVersion() + - "&LOlocale=" + aLang ); + "&LOlocale=" + LanguageTag(utl::ConfigManager::getUILocale()).getBcp47() ); sfx2::openUriExternally(sURL, false); break; } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits