Sort deleted and inserted messages, so that adjacent may possibly be

printed next to each other. To test, try e.g.
        "diff_po.pl -r39000:39100 sk.po"

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39246 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/po/diff_po.pl b/po/diff_po.pl
index 86fedc81513fd239cec538ae2eb29ee21d84ceda..857b96aae2652b6a63d670cd66e1cc19f1407619 100755 (executable)
--- a/po/diff_po.pl
+++ b/po/diff_po.pl
@@ -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);
 }