[Libreoffice-commits] core.git: Branch 'aoo/trunk' - solenv/bin

[Matthias Seidel]

 solenv/bin/modules/installer/download.pm |    2 +-
 solenv/bin/modules/installer/globals.pm  |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit ec0762eeb02bde6b1be98907e5ad8f77e5b2fbdb
Author: Matthias Seidel <mseidel at apache.org>
Date:   Sat Apr 14 09:30:15 2018 +0000

    #i74793#
    
    Removed Ukrainian (uk) from "noMSLocaleLangs".
    MSI for uk can be built without bundling en-US.
    
    Temporarily disable translation of NSIS because of a problem in Ukrainian.nsh (NSIS 3.03).

diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm
index 788e04d0621f..7254677adee8 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -1228,7 +1228,7 @@ sub nsis_language_converter
     elsif ( $language eq "th" ) { $nsislanguage = "Thai"; }
     elsif ( $language eq "zh-TW" ) { $nsislanguage = "TradChinese"; }
     elsif ( $language eq "tr" ) { $nsislanguage = "Turkish"; }
-    elsif ( $language eq "uk" ) { $nsislanguage = "Ukrainian"; }
+    #elsif ( $language eq "uk" ) { $nsislanguage = "Ukrainian"; } #temporarily disabled (problem in Ukrainian.nsh)
     elsif ( $language eq "vi" ) { $nsislanguage = "Vietnamese"; }
     elsif ( $language eq "cy" ) { $nsislanguage = "Welsh"; }
     else
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index 83df6518a241..cd9826a4367b 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -69,7 +69,6 @@ BEGIN
         "eo",
         "ka",
         "ga",
-        "uk",
         "gd",
         "my",
         "mai",