From 2de75ea42737dcc5b85f323da4db5cba374c9093 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Mon, 5 Apr 2010 08:43:12 -0700
Subject: [PATCH] Remove i18n cruft in Dutch and Spanish.  Fixes bug #11506

---
 docs/changelog/7.x.x.txt             |  1 +
 docs/upgrades/upgrade_7.9.1-7.9.2.pl | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 9ddbd2498..dfe5353ef 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -10,6 +10,7 @@
  - fixed #11494: Error message on mysql down
  - fixed: Viewing a Gallery File with non-ASCII keywords crashes
  - fixed #11509: System trash not sticky
+ - fixed #11506: Cruft on i18n dirs in the released .tar.gz
 
 7.9.1
  - fixed #11464: blank page after setting posts per page in Collaboration System to 0 (zero)
diff --git a/docs/upgrades/upgrade_7.9.1-7.9.2.pl b/docs/upgrades/upgrade_7.9.1-7.9.2.pl
index 5669b4bce..a12b9b425 100644
--- a/docs/upgrades/upgrade_7.9.1-7.9.2.pl
+++ b/docs/upgrades/upgrade_7.9.1-7.9.2.pl
@@ -30,19 +30,23 @@ my $quiet; # this line required
 
 my $session = start(); # this line required
 
+# upgrade functions go here
 addSortItemsSCColumn($session);
+removeTranslationCruft($session);
 
 finish($session); # this line required
 
 
 #----------------------------------------------------------------------------
 # Describe what our function does
-#sub exampleFunction {
-#    my $session = shift;
-#    print "\tWe're doing some stuff here that you should know about... " unless $quiet;
-#    # and here's our code
-#    print "DONE!\n" unless $quiet;
-#}
+sub removeTranslationCruft {
+    my $session = shift;
+    print "\tRemoving files left over from unpacking translations... " unless $quiet;
+    # and here's our code
+    unlink File::Spec->catfile($webguiRoot, qw/lib WebGUi i18n Spanish .pm/);
+    unlink File::Spec->catfile($webguiRoot, qw/lib WebGUi i18n Dutch .DS_Store/);
+    print "DONE!\n" unless $quiet;
+}
 
 #----------------------------------------------------------------------------
 sub addSortItemsSCColumn {