[PATCH] Change in core[libreoffice-4-0]: fdo#59158 About dialog Website button link fix for zh-CN and...

[Andras Timar (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1688

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/88/1688/1

fdo#59158 About dialog Website button link fix for zh-CN and zh-TW

Change-Id: I85007bf689bb6c7119a4971f0bd925beccb8bd30
---
M svtools/source/misc/langhelp.cxx
1 file changed, 12 insertions(+), 5 deletions(-)



diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index e4168a8..e8827cd 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -30,13 +30,20 @@
 #include <vcl/svapp.hxx>
 #include <rtl/ustring.hxx>
 
-void localizeWebserviceURI( ::rtl::OUString& rURI )
+void localizeWebserviceURI( OUString& rURI )
 {
-    ::rtl::OUString aLang = Application::GetSettings().GetUILanguageTag().getLanguage();
-    if ( aLang.equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("pt"))
-         && Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("br")) )
+    OUString aLang = Application::GetSettings().GetUILanguageTag().getLanguage();
+    if ( aLang.equalsIgnoreAsciiCase("pt")
+         && Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase("br") )
     {
-        aLang = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "pt-br" ));
+        aLang = OUString("pt-br");
+    }
+    if ( aLang.equalsIgnoreAsciiCase("zh") )
+    {
+        if ( Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase("cn") )
+            aLang = OUString("zh-cn");
+        if ( Application::GetSettings().GetUILanguageTag().getCountry().equalsIgnoreAsciiCase("tw") )
+            aLang = OUString("zh-tw");
     }
 
     rURI += aLang;

-- 
To view, visit https://gerrit.libreoffice.org/1688
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85007bf689bb6c7119a4971f0bd925beccb8bd30
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Andras Timar <atimar at suse.com>