Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1306850 - in /incubator/ooo/trunk/main: extensions.lst
 solenv/bin/modules/ExtensionsLst.pm
Date: Thu, 29 Mar 2012 13:34:44 -0000
To: ooo-commits@incubator.apache.org
From: af@apache.org
Message-Id: <20120329133445.0983123889BB@eris.apache.org>

Author: af
Date: Thu Mar 29 13:34:44 2012
New Revision: 1306850

URL: http://svn.apache.org/viewvc?rev=1306850&view=rev
Log:
Added dictionaries for de_AT and de_CH.  Additional dictionaries for de_DE.  Download only extensions required for languages in WITH_LANG.

Modified:
    incubator/ooo/trunk/main/extensions.lst
    incubator/ooo/trunk/main/solenv/bin/modules/ExtensionsLst.pm

Modified: incubator/ooo/trunk/main/extensions.lst
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/extensions.lst?rev=1306850&r1=1306849&r2=1306850&view=diff
==============================================================================
--- incubator/ooo/trunk/main/extensions.lst (original)
+++ incubator/ooo/trunk/main/extensions.lst Thu Mar 29 13:34:44 2012
@@ -33,33 +33,35 @@
 
 # Some extensions that are installed indepently of the language.
 
-[ language=all && ENABLE_PRESENTER_SCREEN=YES ]
-    file://presenter/presenter-screen.oxt
+#[ language=all && ENABLE_PRESENTER_SCREEN=YES ]
+#    file://presenter/presenter-screen.oxt
 
-[ language=all && ENABLE_MINIMIZER=YES ]
-    file://minimizer/presentation-minimizer.oxt
+#[ language=all && ENABLE_MINIMIZER=YES ]
+#    file://minimizer/presentation-minimizer.oxt
 
 
 
-# English dictionaries.
-[ language=en.* ]
-
-    # Generic
+# English dictionary
+[ language=en.* || language=de ]
     b7ce02d25eb302e5b23572cdccaea461 http://numbertext.org/tmp/dict-en.oxt
     
-    # Canada (en_CA)
+# English (Canada, en_CA) dictionary
+[ language=en.* ]
     e545415a4c813075c67ea58ea99802e5 http://sourceforge.net/projects/aoo-extensions/files/1263/1/en_CA_2_0_0.oxt/download "en_CA_2_0_0.oxt"
 
-    # Australia (en_AU)
+# English (Australia, en_AU) dictionary
+[ language=en.* ]
     68bfee769199749288c5e1aaf200a1ca http://sourceforge.net/projects/aoo-extensions/files/1232/7/dict-en-au-2008-12-15.oxt/download "dict-en-au-2008-12-15.oxt"
 
-    # South Africa (en_ZA)
+# English (South Africa, en_ZA) dictionary
+[ language=en.* ]
     c0c052e01b124a9ca5739facdb3ddbd5 http://sourceforge.net/projects/aoo-extensions/files/3089/0/dict-en_ZA-2009.10.22.oxt/download "dict-en_ZA-2009.10.22.oxt"
 
-    # New Zealand (en_NZ)
+# English (New Zealand, en_NZ) dictionary
+[ language=en.* ]
     87123666ecce441b075c0170fa58690c http://sourceforge.net/projects/aoo-extensions/files/1665/1/dict-en-nz-2008-12-03.oxt/download "dict-en-nz-2008-12-03.oxt"
 
-# English (en_US) dictionary
+# English (USA, en_US) dictionary
 [ language=en.* || language==nl || language==ru ]
     e2eab80772ab1aa09716954219351a80 http://sourceforge.net/projects/aoo-extensions/files/1470/1/en_US.oxt/download "en_US.oxt"
 
@@ -72,11 +74,11 @@
     5c0de383ef649cffefc128cfb36b4d43 http://sourceforge.net/projects/aoo-extensions/files/1456/6/nl-dict-v2.00g.oxt/download "nl-dict-v2.00g.oxt"
 
 # French dictionary.
-[ language=fr || language=nl ]
+[ language=fr || language=nl || language=de || language=de_DE ]
     47ca39e385b02839c24a5d953495cb98 http://sourceforge.net/projects/aoo-extensions/files/3554/5/ooo-dictionnaire-fr-moderne-v4.2.oxt/download "ooo-dictionnaire-fr-moderne-v4.2.oxt"
 
 # Italian dictionary.
-[ language=it ]
+[ language=it || language=de || language=de_DE ]
     c71fa1e7a047cf4efdb27027e3f75a16 http://sourceforge.net/projects/aoo-extensions/files/1204/10/dict-it.oxt/download "dict-it.oxt"
 
 # Spanish dictionary.
@@ -102,3 +104,11 @@
 # Slovenian dictionary.
 [ language=sl ]
     33eb80b84d163e00298bc2c98ddd81cb http://sl.openoffice.org/test/pack-sl.oxt "pack-sl.oxt"
+
+# German (Austria) dictionary.
+[ language=de || language=de_AT || language=de_DE ]
+    76654bcb6ba11bb265111ef1fe3c6007 http://sourceforge.net/projects/aoo-extensions/files/1697/7/dict-de_AT-frami_2011-06-03.oxt/download "dict-de_AT-frami_2011-06-03.oxt"
+
+# German (Switzerland) dictionary.
+[ language=de || language=de_CH || language=de_DE ]
+    7c9f63dcd9de3e4ec6ddbde160a0d793 http://sourceforge.net/projects/aoo-extensions/files/1699/7/dict-de_CH-frami_2011-06-03.oxt/download "dict-de_CH-frami_2011-06-03.oxt"

Modified: incubator/ooo/trunk/main/solenv/bin/modules/ExtensionsLst.pm
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/modules/ExtensionsLst.pm?rev=1306850&r1=1306849&r2=1306850&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/modules/ExtensionsLst.pm (original)
+++ incubator/ooo/trunk/main/solenv/bin/modules/ExtensionsLst.pm Thu Mar 29 13:34:44 2012
@@ -521,6 +521,7 @@ sub Download (@)
 =head3 DownloadExtensions
     This function is intended to be called during bootstrapping.  It extracts the set of extensions
     that will be used later, when the installation sets are built.
+    The set of languages is taken from the WITH_LANG environment variable.
 =cut
 sub DownloadExtensions ()
 {
@@ -528,7 +529,16 @@ sub DownloadExtensions ()
          && $ENV{'ENABLE_BUNDLED_DICTIONARIES'} eq "YES")
     {
         my $full_file_name = Prepare();
-        my @urls = ParseExtensionsLst($full_file_name, []);
+        my $languages = [ "en_US" ];
+        if (defined $ENV{'WITH_LANG'})
+        {
+            @$languages = split(/\s+/, $ENV{'WITH_LANG'});
+            foreach my $l (@$languages)
+            {
+                print "$l\n";
+            }
+        }
+        my @urls = ParseExtensionsLst($full_file_name, $languages);
         Download(@urls);
     }
     else