Refresh patch

[pkg/t-prot.git] / t-prot

diff --git a/t-prot b/t-prot
index f461425910bece44ad8223efe433a077e625992e..e3171624af13d88557be9e96c660476c7d0c4ae2 100755 (executable)
--- a/t-prot
+++ b/t-prot
@@ -1,13 +1,13 @@
 #!/usr/bin/perl -w
-# $Id: t-prot,v 1.319 2013/10/29 11:39:43 jochen Exp $
+# $Id: t-prot,v 1.322 2014/08/18 15:14:36 jochen Exp $
 
 require 5.006;
 use strict;
 use Fcntl qw(O_EXCL O_WRONLY O_CREAT);
 use Getopt::Long qw(:config gnu_getopt no_ignore_case);
-use constant VER            => '3.0';
+use constant VER            => '3.1';
 use constant REV            => '';
-use constant REL            => q$Revision: 1.319 $=~m/(\d+(?:\.\d+)+)/;
+use constant REL            => q$Revision: 1.322 $=~m/(\d+(?:\.\d+)+)/;
 # MTA expecting mail on STDIN
 # (you might have to adjust this if using a different MTA)
 use constant SENDMAIL       => '/usr/sbin/sendmail -oi';
@@ -816,7 +816,7 @@ sub process_msg {
         # bloat this array if you want more internationalization:
         my @tofu = ('Original Message',
                     'Original-Nachricht',
-                    'Urspr.ngliche Nachricht',
+                    'Urspr..?ngliche Nachricht',
                     'Mensagem original',
                     'Ursprungligt meddelande',
                     'Oorspronkelijk bericht',
@@ -1125,7 +1125,9 @@ if (defined $_t_maxsig) { $lsig = $_t_maxsig ? $_t_maxsig : $maxsig; }
 if (defined $_t_mua) {
     $mua = lc($_t_mua);
     # mutt still displays the message when ^C'ing pgp verification:
-    if ($mua eq 'mutt') { $SIG{'INT'} = 'sigint_handler'; }
+    if ($mua eq 'mutt' || $mua eq 'mutt-kz') {
+        $SIG{'INT'} = 'sigint_handler';
+    }
 }
 if (defined $_t_redir) { $mda = $_t_redir ? $_t_redir : '1'; }
 if (defined $_t_check) {
@@ -1142,11 +1144,12 @@ if (defined $_t_nohdr) { $nohdr=1; $hdrs=1; }
 if (defined $_t_cr) { $cr = $_t_cr ? $_t_cr : $crshrink; }
 if ($ms_smart) { $ms = 1; }
 
-if ($mua eq 'mutt') {
-    if (defined $locale && $locale ne '' && $locale ne 'C' && $locale ne 'POSIX') {
+if ($mua eq 'mutt' || $mua eq 'mutt-kz') {
+    if (defined $locale &&
+            $locale ne '' && $locale ne 'C' && $locale ne 'POSIX') {
         eval { require Locale::gettext; };
         if ($@) { warn $@; exit(EX_SOFTWARE); } else {
-            Locale::gettext::textdomain('mutt');
+            Locale::gettext::textdomain($mua);
             ($mutt_attachment) =
                 Locale::gettext::gettext("[-- Attachment #%d") =~
                 m/^([^%]*)/;
@@ -1209,6 +1212,9 @@ if ($mua eq 'mutt') {
                 Locale::gettext::gettext("... this is a bug (%s:%d:%s)\n") =~
                 m/^([^%]*)/;
         }
+        # mutt and mutt-kz right now only differ in the gettext domain name,
+        # so after fetching the gettext lines we treat them the same:
+        $mua = 'mutt';
     }
 
 }