- Let the perl scripts (edmail, parse-patch and remove-trailing-ws) work

  without Locale::gettext.

8 files changed, 119 insertions, 62 deletions

diff --git a/po/de.po b/po/de.po
index 1b4e959..6f0b5ea 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1308,37 +1308,37 @@ msgstr ""
 "zur Erzeugung des Arbeitsverzeichnis verwendet wurden, oder entfernen Sie "
 "das Verzeichnis %s, und wenden Sie die Patches neu an.\\n"
 
-#: scripts/edmail.in:64
+#: scripts/edmail.in:81
 #, perl-format
 msgid "Display name '%s' contains unpaired parentheses\n"
 msgstr "Anzeigename '%s' enthält eine unvollständige Klammerung\n"
 
-#: scripts/edmail.in:68
+#: scripts/edmail.in:85
 #, perl-format
 msgid "Display name '%s' contains invalid characters\n"
 msgstr "Anzeigename '%s' enthält ungültige Zeichen\n"
 
-#: scripts/edmail.in:72
+#: scripts/edmail.in:89
 #, perl-format
 msgid "Display name '%s' contains non-printable or 8-bit characters\n"
 msgstr "Anzeigename '%s' enthält nichtdruckbare or 8-Bit-Zeichen\n"
 
-#: scripts/edmail.in:78
+#: scripts/edmail.in:95
 #, perl-format
 msgid "Delivery address '%s' is invalid\n"
 msgstr "Zustelladresse '%s' ist ungültig\n"
 
-#: scripts/parse-patch.in:33
+#: scripts/parse-patch.in:50
 #, perl-format
 msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
 msgstr "Verwendung: %s {-s|-u} abschnitt datei [< ersetzung]\n"
 
-#: scripts/parse-patch.in:80 scripts/parse-patch.in:87
+#: scripts/parse-patch.in:97 scripts/parse-patch.in:104
 #, perl-format
 msgid "File %s disappeared!\n"
 msgstr "Datei %s ist verschwunden\n"
 
-#: scripts/parse-patch.in:133 scripts/parse-patch.in:139
+#: scripts/parse-patch.in:150 scripts/parse-patch.in:156
 #, perl-format
 msgid "Failed to rename %s to %s: %s\n"
 msgstr "Konnte %s nicht auf %s umbenennen: %s\n"
@@ -1364,37 +1364,37 @@ msgstr ""
 "Das Arbeitsverzeichnis wurde von einer älteren Version von quilt erstellt. "
 "Bitte führen Sie \\`quilt upgrade' aus.\\n"
 
-#: scripts/remove-trailing-ws.in:26
+#: scripts/remove-trailing-ws.in:43
 #, perl-format
 msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
 msgstr "Aufruf: %s [-p num] [-n] [patch]\n"
 
-#: scripts/remove-trailing-ws.in:48 scripts/remove-trailing-ws.in:75
+#: scripts/remove-trailing-ws.in:65 scripts/remove-trailing-ws.in:92
 #, perl-format
 msgid "%s: I'm confused.\n"
 msgstr "%s: Ich bin verwirrt.\n"
 
-#: scripts/remove-trailing-ws.in:96
+#: scripts/remove-trailing-ws.in:113
 #, perl-format
 msgid "Warning: trailing whitespace in line %s of %s\n"
 msgstr "Warnung: abschliessende Leerzeichen in Zeile %s von %s\n"
 
-#: scripts/remove-trailing-ws.in:99
+#: scripts/remove-trailing-ws.in:116
 #, perl-format
 msgid "Warning: trailing whitespace in lines %s of %s\n"
 msgstr "Warnung: abschliessende Leerzeichen in den Zeilen %s von %s\n"
 
-#: scripts/remove-trailing-ws.in:103
+#: scripts/remove-trailing-ws.in:120
 #, perl-format
 msgid "Removing trailing whitespace from line %s of %s\n"
 msgstr "Entferne abschliessende Leerzeichen in Zeile %s von %s\n"
 
-#: scripts/remove-trailing-ws.in:106
+#: scripts/remove-trailing-ws.in:123
 #, perl-format
 msgid "Removing trailing whitespace from lines %s of %s\n"
 msgstr "Entferne abschliessende Leerzeichen in den Zeilen %s von %s\n"
 
-#: scripts/remove-trailing-ws.in:126
+#: scripts/remove-trailing-ws.in:143
 #, perl-format
 msgid "Renaming %s to %s: %s\n"
 msgstr "Umbenennen von %s auf %s: %s\n"
diff --git a/po/fr.po b/po/fr.po
index 890cf7a..08d30ae 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1324,37 +1324,37 @@ msgstr ""
 "version utilis�e pour cr�er cet arbre de travail, ou effacez le r�pertoire\n"
 "%s et r�appliquez compl�tement vos patchs.\\n"
 
-#: scripts/edmail.in:64
+#: scripts/edmail.in:81
 #, perl-format
 msgid "Display name '%s' contains unpaired parentheses\n"
 msgstr "Le nom '%s' est mal parenth�s�\n"
 
-#: scripts/edmail.in:68
+#: scripts/edmail.in:85
 #, perl-format
 msgid "Display name '%s' contains invalid characters\n"
 msgstr "Le nom '%s' comprend des caract�res invalides\n"
 
-#: scripts/edmail.in:72
+#: scripts/edmail.in:89
 #, perl-format
 msgid "Display name '%s' contains non-printable or 8-bit characters\n"
 msgstr "Le nom '%s' comprend des caract�res non-affichables ou 8 bits\n"
 
-#: scripts/edmail.in:78
+#: scripts/edmail.in:95
 #, perl-format
 msgid "Delivery address '%s' is invalid\n"
 msgstr "L'adresse de destination '%s' est invalide\n"
 
-#: scripts/parse-patch.in:33
+#: scripts/parse-patch.in:50
 #, perl-format
 msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
 msgstr "USAGE : %s {-s|-u} section fichier [< remplacement]\n"
 
-#: scripts/parse-patch.in:80 scripts/parse-patch.in:87
+#: scripts/parse-patch.in:97 scripts/parse-patch.in:104
 #, perl-format
 msgid "File %s disappeared!\n"
 msgstr "Le fichier %s a disparu !\n"
 
-#: scripts/parse-patch.in:133 scripts/parse-patch.in:139
+#: scripts/parse-patch.in:150 scripts/parse-patch.in:156
 #, perl-format
 msgid "Failed to rename %s to %s: %s\n"
 msgstr "Impossible de renommer %s en %s : %s\n"
@@ -1379,37 +1379,37 @@ msgstr ""
 "Votre arbre a �t� cr�� par une vieille version de quilt. Veuillez \n"
 "utiliser � quilt upgrade �.\\n"
 
-#: scripts/remove-trailing-ws.in:26
+#: scripts/remove-trailing-ws.in:43
 #, perl-format
 msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
 msgstr "SYNOPSIS : %s [-p num] [-n] [patch]\n"
 
-#: scripts/remove-trailing-ws.in:48 scripts/remove-trailing-ws.in:75
+#: scripts/remove-trailing-ws.in:65 scripts/remove-trailing-ws.in:92
 #, perl-format
 msgid "%s: I'm confused.\n"
 msgstr "%s : Je suis confus.\n"
 
-#: scripts/remove-trailing-ws.in:96
+#: scripts/remove-trailing-ws.in:113
 #, perl-format
 msgid "Warning: trailing whitespace in line %s of %s\n"
 msgstr "Attention : espaces � la fin de la ligne %s de %s\n"
 
-#: scripts/remove-trailing-ws.in:99
+#: scripts/remove-trailing-ws.in:116
 #, perl-format
 msgid "Warning: trailing whitespace in lines %s of %s\n"
 msgstr "Attention : espaces � la fin des lignes %s de %s\n"
 
-#: scripts/remove-trailing-ws.in:103
+#: scripts/remove-trailing-ws.in:120
 #, perl-format
 msgid "Removing trailing whitespace from line %s of %s\n"
 msgstr "Suppression des espaces � la fin de la ligne %s de %s\n"
 
-#: scripts/remove-trailing-ws.in:106
+#: scripts/remove-trailing-ws.in:123
 #, perl-format
 msgid "Removing trailing whitespace from lines %s of %s\n"
 msgstr "Suppression des espaces � la fin des lignes %s de %s\n"
 
-#: scripts/remove-trailing-ws.in:126
+#: scripts/remove-trailing-ws.in:143
 #, perl-format
 msgid "Renaming %s to %s: %s\n"
 msgstr "En renommant %s en %s : %s\n"
diff --git a/po/ja.po b/po/ja.po
index 03f69f9..cdece6f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1248,37 +1248,37 @@ msgstr ""
 "pop -a'を実行し、すべてのパッチをはずしてください。または、%s ディレク\n"
 "トリを削除し、最初からパッチをあて直してください。\\n"
 
-#: scripts/edmail.in:64
+#: scripts/edmail.in:81
 #, perl-format
 msgid "Display name '%s' contains unpaired parentheses\n"
 msgstr ""
 
-#: scripts/edmail.in:68
+#: scripts/edmail.in:85
 #, perl-format
 msgid "Display name '%s' contains invalid characters\n"
 msgstr ""
 
-#: scripts/edmail.in:72
+#: scripts/edmail.in:89
 #, perl-format
 msgid "Display name '%s' contains non-printable or 8-bit characters\n"
 msgstr ""
 
-#: scripts/edmail.in:78
+#: scripts/edmail.in:95
 #, perl-format
 msgid "Delivery address '%s' is invalid\n"
 msgstr ""
 
-#: scripts/parse-patch.in:33
+#: scripts/parse-patch.in:50
 #, perl-format
 msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
 msgstr ""
 
-#: scripts/parse-patch.in:80 scripts/parse-patch.in:87
+#: scripts/parse-patch.in:97 scripts/parse-patch.in:104
 #, perl-format
 msgid "File %s disappeared!\n"
 msgstr ""
 
-#: scripts/parse-patch.in:133 scripts/parse-patch.in:139
+#: scripts/parse-patch.in:150 scripts/parse-patch.in:156
 #, fuzzy, perl-format
 msgid "Failed to rename %s to %s: %s\n"
 msgstr "パッチ %s の作成に失敗しました\\n"
@@ -1303,37 +1303,37 @@ msgstr ""
 "現在作業中のディレクトリは古いバージョンの quiltによって作られたもので"
 "す。'quilt upgrade'を実行してください。\\n"
 
-#: scripts/remove-trailing-ws.in:26
+#: scripts/remove-trailing-ws.in:43
 #, perl-format
 msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws.in:48 scripts/remove-trailing-ws.in:75
+#: scripts/remove-trailing-ws.in:65 scripts/remove-trailing-ws.in:92
 #, perl-format
 msgid "%s: I'm confused.\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws.in:96
+#: scripts/remove-trailing-ws.in:113
 #, perl-format
 msgid "Warning: trailing whitespace in line %s of %s\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws.in:99
+#: scripts/remove-trailing-ws.in:116
 #, perl-format
 msgid "Warning: trailing whitespace in lines %s of %s\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws.in:103
+#: scripts/remove-trailing-ws.in:120
 #, perl-format
 msgid "Removing trailing whitespace from line %s of %s\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws.in:106
+#: scripts/remove-trailing-ws.in:123
 #, perl-format
 msgid "Removing trailing whitespace from lines %s of %s\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws.in:126
+#: scripts/remove-trailing-ws.in:143
 #, fuzzy, perl-format
 msgid "Renaming %s to %s: %s\n"
 msgstr "パッチ %sからパッチ %sへの分岐に失敗しました\\n"
diff --git a/po/quilt.pot b/po/quilt.pot
index 9b0dad5..caab8c1 100644
--- a/po/quilt.pot
+++ b/po/quilt.pot
@@ -912,37 +912,37 @@ msgid ""
 "patches from scratch.\\n"
 msgstr ""
 
-#: scripts/edmail.in:64
+#: scripts/edmail.in:81
 #, perl-format
 msgid "Display name '%s' contains unpaired parentheses\n"
 msgstr ""
 
-#: scripts/edmail.in:68
+#: scripts/edmail.in:85
 #, perl-format
 msgid "Display name '%s' contains invalid characters\n"
 msgstr ""
 
-#: scripts/edmail.in:72
+#: scripts/edmail.in:89
 #, perl-format
 msgid "Display name '%s' contains non-printable or 8-bit characters\n"
 msgstr ""
 
-#: scripts/edmail.in:78
+#: scripts/edmail.in:95
 #, perl-format
 msgid "Delivery address '%s' is invalid\n"
 msgstr ""
 
-#: scripts/parse-patch.in:33
+#: scripts/parse-patch.in:50
 #, perl-format
 msgid "USAGE: %s {-s|-u} section file [< replacement]\n"
 msgstr ""
 
-#: scripts/parse-patch.in:80 scripts/parse-patch.in:87
+#: scripts/parse-patch.in:97 scripts/parse-patch.in:104
 #, perl-format
 msgid "File %s disappeared!\n"
 msgstr ""
 
-#: scripts/parse-patch.in:133 scripts/parse-patch.in:139
+#: scripts/parse-patch.in:150 scripts/parse-patch.in:156
 #, perl-format
 msgid "Failed to rename %s to %s: %s\n"
 msgstr ""
@@ -961,37 +961,37 @@ msgid ""
 "upgrade'.\\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws.in:26
+#: scripts/remove-trailing-ws.in:43
 #, perl-format
 msgid "SYNOPSIS: %s [-p num] [-n] [patch]\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws.in:48 scripts/remove-trailing-ws.in:75
+#: scripts/remove-trailing-ws.in:65 scripts/remove-trailing-ws.in:92
 #, perl-format
 msgid "%s: I'm confused.\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws.in:96
+#: scripts/remove-trailing-ws.in:113
 #, perl-format
 msgid "Warning: trailing whitespace in line %s of %s\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws.in:99
+#: scripts/remove-trailing-ws.in:116
 #, perl-format
 msgid "Warning: trailing whitespace in lines %s of %s\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws.in:103
+#: scripts/remove-trailing-ws.in:120
 #, perl-format
 msgid "Removing trailing whitespace from line %s of %s\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws.in:106
+#: scripts/remove-trailing-ws.in:123
 #, perl-format
 msgid "Removing trailing whitespace from lines %s of %s\n"
 msgstr ""
 
-#: scripts/remove-trailing-ws.in:126
+#: scripts/remove-trailing-ws.in:143
 #, perl-format
 msgid "Renaming %s to %s: %s\n"
 msgstr ""
diff --git a/quilt.changes b/quilt.changes
index 319e542..a91f432 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Sun Jul 24 16:46:54 CEST 2005 - khali@linux-fr.org
+
+- Let the perl scripts (edmail, parse-patch and
+  remove-trailing-ws) work without Locale::gettext.
+
+-------------------------------------------------------------------
 Fri Jul 22 19:05:13 CEST 2005 - khali@linux-fr.org
 
 - Makefile.in: Drop pointless dependency between quilt command
diff --git a/scripts/edmail.in b/scripts/edmail.in
index 5413f0c..84b192b 100644
--- a/scripts/edmail.in
+++ b/scripts/edmail.in
@@ -1,10 +1,27 @@
 #! @PERL@ -w
 
 use Getopt::Long;
-use POSIX qw(setlocale);
-use Locale::gettext;
 use strict;
 
+# This ugly trick lets the script work even if gettext support is missing.
+# We did so because Locale::gettext doesn't ship with the standard perl
+# distribution.
+BEGIN {
+    if (eval { require Locale::gettext }) {
+	import Locale::gettext;
+	require POSIX;
+	import POSIX, qw(setlocale);
+    } else {
+	eval '
+	    use constant LC_MESSAGES => 0;
+	    sub setlocale($$) { }
+	    sub bindtextdomain($$) { }
+	    sub textdomain($) { }
+	    sub gettext($) { shift }
+	'
+    }
+}
+
 setlocale(LC_MESSAGES, "");
 bindtextdomain("quilt", "@LOCALEDIR@");
 textdomain("quilt");
diff --git a/scripts/parse-patch.in b/scripts/parse-patch.in
index 6441b82..cb5a8e5 100644
--- a/scripts/parse-patch.in
+++ b/scripts/parse-patch.in
@@ -12,10 +12,27 @@
 use FileHandle;
 use Getopt::Long;
 use File::Temp qw(tempfile);
-use POSIX qw(setlocale);
-use Locale::gettext;
 use strict;
 
+# This ugly trick lets the script work even if gettext support is missing.
+# We did so because Locale::gettext doesn't ship with the standard perl
+# distribution.
+BEGIN {
+    if (eval { require Locale::gettext }) {
+	import Locale::gettext;
+	require POSIX;
+	import POSIX, qw(setlocale);
+    } else {
+	eval '
+	    use constant LC_MESSAGES => 0;
+	    sub setlocale($$) { }
+	    sub bindtextdomain($$) { }
+	    sub textdomain($) { }
+	    sub gettext($) { shift }
+	'
+    }
+}
+
 setlocale(LC_MESSAGES, "");
 bindtextdomain("quilt", "@LOCALEDIR@");
 textdomain("quilt");
diff --git a/scripts/remove-trailing-ws.in b/scripts/remove-trailing-ws.in
index dfda46b..8179a9a 100644
--- a/scripts/remove-trailing-ws.in
+++ b/scripts/remove-trailing-ws.in
@@ -8,11 +8,28 @@
 use strict;
 use FileHandle;
 use File::Temp qw( :mktemp );
-use POSIX qw(setlocale);
-use Locale::gettext;
 use Getopt::Std;
 use vars qw($opt_p $opt_n);
 
+# This ugly trick lets the script work even if gettext support is missing.
+# We did so because Locale::gettext doesn't ship with the standard perl
+# distribution.
+BEGIN {
+    if (eval { require Locale::gettext }) {
+	import Locale::gettext;
+	require POSIX;
+	import POSIX, qw(setlocale);
+    } else {
+	eval '
+	    use constant LC_MESSAGES => 0;
+	    sub setlocale($$) { }
+	    sub bindtextdomain($$) { }
+	    sub textdomain($) { }
+	    sub gettext($) { shift }
+	'
+    }
+}
+
 setlocale(LC_MESSAGES, "");
 bindtextdomain("quilt", "@LOCALEDIR@");
 textdomain("quilt");