From 9eacde825c37640c56dc2211a7930840a7ccccd0 Mon Sep 17 00:00:00 2001 From: Gunter Labes Date: Wed, 7 Oct 2009 10:42:50 +0000 Subject: [PATCH] made the error message on duplicate msgids understandable --- utils/pofix.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/pofix.py b/utils/pofix.py index d9fccc1d401..9d3b5f036d4 100755 --- a/utils/pofix.py +++ b/utils/pofix.py @@ -298,9 +298,10 @@ if __name__ == '__main__': #this check is problematic and the last clause is added to prevent false #positives in case that new is a substring of old, though this can also #lead to "real" probs not found, the real check would be "does replacing - #old with new lead to duplicate msgids?" which is not easily done... + #old with new lead to duplicate msgids? (including old ones marked with #~)" + #which is not easily done in the current design... elif new in after and old in after and not new in old: - print "pofix: %s has a msgid \n\t\"%s\"\nand a typoed version \n\t\"%s\"\nthis needs handfixing for now." % (path, old, new) + print "pofix: %s already includes the new string\n\t\"%s\"\nbut also the old\n\t\"%s\"\nthis needs handfixing for now since it likely creates duplicate msgids." % (path, new, old) else: after = after.replace(old, new) if after != before: