[meld] filediff: Update bad comparison warning to new dialog helper
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] filediff: Update bad comparison warning to new dialog helper
- Date: Wed, 31 Dec 2014 23:33:02 +0000 (UTC)
commit a9aaecff422a904edef78ea3f1766214175205fc
Author: Kai Willadsen <kai willadsen gmail com>
Date: Mon Dec 29 08:53:51 2014 +1000
filediff: Update bad comparison warning to new dialog helper
meld/filediff.py | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index c7a5086..da06c8c 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -810,8 +810,13 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
txt = filt.filter.sub(killit, txt)
except AssertionError:
if not self.warned_bad_comparison:
- misc.run_dialog(_("Filter '%s' changed the number of lines in the file. "
- "Comparison will be incorrect. See the user manual for more details.") % filt.label)
+ misc.error_dialog(
+ primary=_(u"Comparison results will be inaccurate"),
+ secondary=_(
+ u"Filter ā%sā changed the number of lines in the "
+ u"file, which is unsupported. The comparison will "
+ u"not be accurate.") % filt.label,
+ )
self.warned_bad_comparison = True
return txt
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]