[PATCH] drop now unused DEFAULT_TO_ENGLISH_FOR_PACKING

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3908

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/08/3908/1

drop now unused DEFAULT_TO_ENGLISH_FOR_PACKING

See
http://lists.freedesktop.org/archives/libreoffice/2013-May/051706.html
for explanation.

Change-Id: Ieb7480f9f7a64a026abc985edde3ed932c1e8f56
---
M config_host.mk.in
M solenv/bin/modules/installer/scriptitems.pm
M solenv/bin/ooinstall
3 files changed, 2 insertions(+), 71 deletions(-)



diff --git a/config_host.mk.in b/config_host.mk.in
index 02da41e..cc626e0 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -88,7 +88,6 @@
 export DBUS_CFLAGS=$(gb_SPACE)@DBUS_CFLAGS@
 export DBUS_LIBS=$(gb_SPACE)@DBUS_LIBS@
 export DEFAULT_BRAND_IMAGES=@DEFAULT_BRAND_IMAGES@
-export DEFAULT_TO_ENGLISH_FOR_PACKING=yes
 export DEVINSTALLDIR=@DEVINSTALLDIR@
 export DIAGRAM_EXTENSION_PACK=@DIAGRAM_EXTENSION_PACK@
 export DICT_SYSTEM_DIR=@DICT_SYSTEM_DIR@
diff --git a/solenv/bin/modules/installer/scriptitems.pm 
b/solenv/bin/modules/installer/scriptitems.pm
index cd4b141..3406e2f 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -926,15 +926,7 @@
         $onefile = "";  # the sourcepath has to be empty
         if ( $write_logfile)
         {
-            if ( $ENV{'DEFAULT_TO_ENGLISH_FOR_PACKING'} )
-            {
-                $infoline = "WARNING: Source for $$searchfilenameref not found!\n";  # Important 
message in log file
-            }
-            else
-            {
-                $infoline = "ERROR: Source for $$searchfilenameref not found!\n";    # Important 
message in log file
-            }
-
+            $infoline = "ERROR: Source for $$searchfilenameref not found!\n";    # Important 
message in log file
             push( @installer::globals::logfileinfo, $infoline);
         }
     }
@@ -1002,15 +994,7 @@
         $onefile = "";  # the sourcepath has to be empty
         if ( $write_logfile)
         {
-            if ( $ENV{'DEFAULT_TO_ENGLISH_FOR_PACKING'} )
-            {
-                $infoline = "WARNING: Source for $$searchfilenameref not found!\n";  # Important 
message in log file
-            }
-            else
-            {
-                $infoline = "ERROR: Source for $$searchfilenameref not found!\n";    # Important 
message in log file
-            }
-
+            $infoline = "ERROR: Source for $$searchfilenameref not found!\n";    # Important 
message in log file
             push( @installer::globals::logfileinfo, $infoline);
         }
     }
@@ -1097,54 +1081,6 @@
         else { $sourcepathref = get_sourcepath_from_filename_and_includepath(\$onefilename, 
$includepatharrayref, 1); }
 
         $onefile->{'sourcepath'} = $$sourcepathref; # This $$sourcepathref is empty, if no source 
was found
-
-        # defaulting to english for multilingual files if DEFAULT_TO_ENGLISH_FOR_PACKING is set
-
-        if ( $ENV{'DEFAULT_TO_ENGLISH_FOR_PACKING'} )
-        {
-            if (( ! $onefile->{'sourcepath'} ) && ( $onefile->{'ismultilingual'} ))
-            {
-                my $oldname = $onefile->{'Name'};
-                my $oldlanguage = $onefile->{'specificlanguage'};
-                my $newlanguage = "en-US";
-                $onefilename = $onefile->{'Name'};
-                $onefilename =~ s/$oldlanguage\./$newlanguage\./;   # Example: tplwizfax_it.zip -> 
tplwizfax_en-US.zip
-                $onefilename =~ s/^\s*\Q$installer::globals::separator\E//;     # filename begins 
with a slash, for instance /registry/schema/org/openoffice/VCL.xcs
-                $sourcepathref = get_sourcepath_from_filename_and_includepath(\$onefilename, 
$includepatharrayref, 1);
-                $onefile->{'sourcepath'} = $$sourcepathref;                     # This 
$$sourcepathref is empty, if no source was found
-
-                if ($onefile->{'sourcepath'})   # defaulting to english was successful
-                {
-                    $infoline = "WARNING: Using $onefilename instead of $oldname\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    print "    $infoline";
-
-                    # If the directory, in which the new file is installed, is not language 
dependent,
-                    # the filename has to be changed to avoid installation conflicts
-                    # No mechanism for resource files!
-                    # -> implementing for the content of ARCHIVE files
-
-                    if ( $onefile->{'Styles'} =~ /\bARCHIVE\b/ )
-                    {
-                        my $directorygid = $onefile->{'Dir'};
-                        my $islanguagedependent = 
determine_directory_language_dependency($directorygid, $dirsref);
-
-                        if ( ! $islanguagedependent )
-                        {
-                            $onefile->{'Styles'} =~ s/\bARCHIVE\b/ARCHIVE, RENAME_TO_LANGUAGE/; # 
Setting new flag RENAME_TO_LANGUAGE
-                            $infoline = "Setting flag RENAME_TO_LANGUAGE: File $onefile->{'Name'} 
in directory: $directorygid\n";
-                            push( @installer::globals::logfileinfo, $infoline);
-                        }
-                    }
-                }
-                else
-                {
-                    $infoline = "WARNING: Using $onefile->{'Name'} instead of $oldname was not 
successful\n";
-                    push( @installer::globals::logfileinfo, $infoline);
-                    $onefile->{'Name'} = $oldname;  # Switching back to old file name
-                }
-            }
-        }
     }
 
     $infoline = "\n";   # empty line after listing of all files
diff --git a/solenv/bin/ooinstall b/solenv/bin/ooinstall
index 4902dda..59335e8 100755
--- a/solenv/bin/ooinstall
+++ b/solenv/bin/ooinstall
@@ -72,10 +72,6 @@
 $ENV{OUT} = "../$ENV{'INPATH'}";
 $ENV{LOCAL_OUT} = $ENV{OUT};
 $ENV{LOCAL_COMMON_OUT} = $ENV{OUT};
-# FIXME: the following variable helps to install localizations even if some
-# files are not localized (like Japanese, Chinese wordbook), it makes
-# the installer to use the English localization of the file instead.
-$ENV{DEFAULT_TO_ENGLISH_FOR_PACKING} = 1;
 
 my @larr;
 $langs=$ENV{WITH_LANG_LIST};

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb7480f9f7a64a026abc985edde3ed932c1e8f56
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: David Tardon <dtardon@redhat.com>