From b932f6a4439718416adf781510f4f19eddca2137 Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Mon, 12 Dec 2022 18:36:02 +0100
Subject: fix #1936

(#1955)
---
 lib/elements/element.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib/elements')

diff --git a/lib/elements/element.py b/lib/elements/element.py
index 84141d4f..df9e1b95 100644
--- a/lib/elements/element.py
+++ b/lib/elements/element.py
@@ -343,7 +343,7 @@ class EmbroideryElement(object):
 
     @property
     @param('trim_after',
-           _ ('Trim After'),
+           _('Trim After'),
            tooltip=_('Add a TRIM command after stitching this object.'),
            type='boolean',
            default=False,
@@ -353,7 +353,7 @@ class EmbroideryElement(object):
 
     @property
     @param('stop_after',
-           _ ('Stop After'),
+           _('Stop After'),
            tooltip=_('Add a STOP command after stitching this object.'),
            type='boolean',
            default=False,
-- 
cgit v1.2.3


From a4f86a3106dff5d342380a19beac5191026bfb08 Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Mon, 19 Dec 2022 21:11:50 +0100
Subject: Point to troubleshoot in fatal error message (#1967)

* point to troubleshoot in fatal error message

* shapely version
---
 lib/elements/element.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'lib/elements')

diff --git a/lib/elements/element.py b/lib/elements/element.py
index df9e1b95..436423a4 100644
--- a/lib/elements/element.py
+++ b/lib/elements/element.py
@@ -380,7 +380,7 @@ class EmbroideryElement(object):
 
         return patches
 
-    def fatal(self, message):
+    def fatal(self, message, point_to_troubleshoot=False):
         label = self.node.get(INKSCAPE_LABEL)
         id = self.node.get("id")
         if label:
@@ -389,8 +389,11 @@ class EmbroideryElement(object):
             name = id
 
         # L10N used when showing an error message to the user such as
-        # "Some Path (path1234): error: satin column: One or more of the rungs doesn't intersect both rails."
-        error_msg = "%s: %s %s" % (name, _("error:"), message)
+        # "Failed on PathLabel (path1234): Satin column: One or more of the rungs doesn't intersect both rails."
+        error_msg = "%s %s: %s" % (_("Failed on "), name, message)
+        if point_to_troubleshoot:
+            error_msg += "\n\n%s" % _("Please run Extensions > Ink/Stitch > Troubleshoot > Troubleshoot objects. "
+                                      "This will indicate the errorneus position.")
         inkex.errormsg(error_msg)
         sys.exit(1)
 
@@ -425,4 +428,4 @@ class EmbroideryElement(object):
 
         for error in self.validation_errors():
             # note that self.fatal() exits, so this only shows the first error
-            self.fatal(error.description)
+            self.fatal(error.description, True)
-- 
cgit v1.2.3