Don't allow newline characters in document settings.

[lyx.git] / po / diff_po.pl

diff --git a/po/diff_po.pl b/po/diff_po.pl
index a39fbb7085700fe77cbd76e130a039daf4094f0a..857b96aae2652b6a63d670cd66e1cc19f1407619 100755 (executable)
--- a/po/diff_po.pl
+++ b/po/diff_po.pl
@@ -33,6 +33,7 @@
 
 use strict;
 use Term::ANSIColor qw(:constants);
+use File::Temp;
 
 my ($status, $foundline, $msgid, $msgstr, $fuzzy);
 
@@ -43,7 +44,6 @@ my %Fuzzy = ();                 # inside new po-file
 my $result = 0;                 # exit value
 my $printlines = 0;
 my @names = ();
-my $tmpfile = "/tmp/blax";
 
 # Check first, if called as standalone program for git
 if ($ARGV[0] =~ /^-r(.*)/) {
@@ -65,16 +65,16 @@ if ($ARGV[0] =~ /^-r(.*)/) {
     }
     if (-d "$filedir/../.git") {
       my @args = ();
+      my $tmpfile = File::Temp->new();
       push(@args, "-L", $argf . "    (" . $rev . ")");
       push(@args, "-L", $argf . "    (local copy)");
       open(FI, "git show $rev:po/$baseargf|");
-      open(FO, '>', $tmpfile);
+      $tmpfile->unlink_on_destroy( 1 );
       while(my $l = <FI>) {
-       print FO $l;
+       print $tmpfile $l;
       }
       close(FI);
-      close(FO);
-      push(@args, $tmpfile, $argf);
+      push(@args, $tmpfile->filename, $argf);
       print "===================================================================\n";
       &diff_po(@args);
     }
@@ -146,26 +146,48 @@ sub diff_po($$)
     }
   }
 
-  @MsgKeys = &getLineSortedKeys(\%Messages);
-  for my $k (@MsgKeys) {
-    $result |= 8;
-    print "deleted message\n";
-    print "< line = " . $Messages{$k}->{line} . "\n" if ($printlines);
-    print RED "< fuzzy = " . $Messages{$k}->{fuzzy} . "\n", RESET;
-    print RED "< msgid = \"$k\"\n", RESET;
-    print RED "< msgstr = \"" . $Messages{$k}->{msgstr} . "\"\n", RESET;
+  if (1) {
+    @MsgKeys = sort keys %Messages, keys %newMessages;
+    for my $k (@MsgKeys) {
+      if (defined($Messages{$k})) {
+       $result |= 8;
+       print "deleted message\n";
+       print "< line = " . $Messages{$k}->{line} . "\n" if ($printlines);
+       print RED "< fuzzy = " . $Messages{$k}->{fuzzy} . "\n", RESET;
+       print RED "< msgid = \"$k\"\n", RESET;
+       print RED "< msgstr = \"" . $Messages{$k}->{msgstr} . "\"\n", RESET;
+      }
+      if (defined($newMessages{$k})) {
+       $result |= 16;
+       print "new message\n";
+       print "> line = " . $newMessages{$k}->{line} . "\n" if ($printlines);
+       print GREEN "> fuzzy = " . $newMessages{$k}->{fuzzy} . "\n", RESET;
+       print GREEN "> msgid = \"$k\"\n", RESET;
+       print GREEN "> msgstr = \"" . $newMessages{$k}->{msgstr} . "\"\n", RESET;
+      }
+    }
   }
+  else {
+    @MsgKeys = &getLineSortedKeys(\%Messages);
+    for my $k (@MsgKeys) {
+      $result |= 8;
+      print "deleted message\n";
+      print "< line = " . $Messages{$k}->{line} . "\n" if ($printlines);
+      print RED "< fuzzy = " . $Messages{$k}->{fuzzy} . "\n", RESET;
+      print RED "< msgid = \"$k\"\n", RESET;
+      print RED "< msgstr = \"" . $Messages{$k}->{msgstr} . "\"\n", RESET;
+    }
 
-  @MsgKeys = &getLineSortedKeys(\%newMessages);
-  for my $k (@MsgKeys) {
-    $result |= 16;
-    print "new message\n";
-    print "> line = " . $newMessages{$k}->{line} . "\n" if ($printlines);
-    print GREEN "> fuzzy = " . $newMessages{$k}->{fuzzy} . "\n", RESET;
-    print GREEN "> msgid = \"$k\"\n", RESET;
-    print GREEN "> msgstr = \"" . $newMessages{$k}->{msgstr} . "\"\n", RESET;
+    @MsgKeys = &getLineSortedKeys(\%newMessages);
+    for my $k (@MsgKeys) {
+      $result |= 16;
+      print "new message\n";
+      print "> line = " . $newMessages{$k}->{line} . "\n" if ($printlines);
+      print GREEN "> fuzzy = " . $newMessages{$k}->{fuzzy} . "\n", RESET;
+      print GREEN "> msgid = \"$k\"\n", RESET;
+      print GREEN "> msgstr = \"" . $newMessages{$k}->{msgstr} . "\"\n", RESET;
+    }
   }
-
   &printExtraMessages("fuzzy", \%Fuzzy);
   &printExtraMessages("untranslated", \%Untranslated);
 }