[Libreoffice-commits] .: Branch 'libreoffice-4-0' - svtools/source

[Libreoffice Gerrit user]

 svtools/source/misc/langhelp.cxx |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 4f2d6cd5332c9aa2ccca4a12a241263a51f76da2
Author: Andras Timar <atimar at suse.com>
Date:   Tue Jan 15 10:35:20 2013 +0100

    fdo#59158 About dialog Website button link fix for zh-CN and zh-TW
    
    Change-Id: I85007bf689bb6c7119a4971f0bd925beccb8bd30
    Reviewed-on: https://gerrit.libreoffice.org/1688
    Reviewed-by: Noel Power <noel.power at suse.com>
    Tested-by: Noel Power <noel.power at suse.com>

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;