[meld] Bugfix: error dialog for multiple line text filters fixed



commit 96ed9997fdca017c9cea0af64f59f6482f1e5cc1
Author: David Rabel <david rabel noresoft com>
Date:   Mon Feb 22 19:33:03 2016 +0100

    Bugfix: error dialog for multiple line text filters fixed
    
    In patch eee58a571b1dc75f0d85d266aecec48a52df38c3 we applied
    a new text filter mechanism. This broke the error message when using
    multiple line text filters.
    
    Because the filters are not applied one by one anymore, the error dialog
    does not know which filter is wrong.
    
    With this patch the filter is no longer mentioned in the error message.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=761028

 meld/filediff.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index 507a48a..94950d9 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -793,9 +793,9 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
                 misc.error_dialog(
                     primary=_(u"Comparison results will be inaccurate"),
                     secondary=_(
-                        u"Filter ā€œ%sā€ changed the number of lines in the "
+                        u"A filter changed the number of lines in the "
                         u"file, which is unsupported. The comparison will "
-                        u"not be accurate.") % filt.label,
+                        u"not be accurate."),
                 )
                 self.warned_bad_comparison = True
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]