From 3335c33223b47ec2afe87c4a9f49ed2cd315399c Mon Sep 17 00:00:00 2001
From: Maren Hachmann <934908-Moini@users.noreply.gitlab.com>
Date: Thu, 20 Aug 2020 14:25:07 +0000
Subject: [PATCH] A few string improvements for the Scribus export extension.

---
 scribus_export_pdf.inx | 16 ++++++++--------
 scribus_export_pdf.py  | 18 +++++++++---------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/scribus_export_pdf.inx b/scribus_export_pdf.inx
index c0186e03..84f761ca 100644
--- a/scribus_export_pdf.inx
+++ b/scribus_export_pdf.inx
@@ -4,19 +4,19 @@
     <id>com.activdesign.export.scribus</id>
     <dependency type="executable" location="extensions">scribus_export_pdf.py</dependency>
     <dependency type="executable" location="path">scribus</dependency>
-    <param name="pdf-version" gui-text="PDF version" type="optiongroup" appearance="combo">
+    <param name="pdf-version" gui-text="PDF version:" type="optiongroup" appearance="combo">
         <option value="11">PDF/X-1a</option>
         <option value="12">PDF/X-3</option>
         <option value="13">PDF 1.3</option>
         <option value="14">PDF 1.4</option>
         <option value="15">PDF 1.5</option>
     </param>
-    <param name="title" gui-text="PDF title (mandatory for PDF/X-3)" type="string"></param>
-    <param name="bleed" gui-text="bleed added to each side of the document (mm)" type="float" min="0" max="1000">0</param>
-    <param name="bleed-marks" gui-text="show bleed marks" type="bool">false</param>
-    <param name="color-marks" gui-text="show color reference" type="bool">false</param>
+    <param name="title" gui-text="PDF title (mandatory for PDF/X):" type="string"></param>
+    <param name="bleed" gui-text="Bleed added around the document (mm):" type="float" min="0" max="1000" gui-description="Include an area of the given size around the Inkscape page in the final document.">0</param>
+    <param name="bleed-marks" gui-text="Show bleed marks" type="bool">false</param>
+    <param name="color-marks" gui-text="Show color reference" type="bool">false</param>
 
-    <param name="intent" gui-text="Rendering intent" type="optiongroup" appearance="combo">
+    <param name="intent" gui-text="Rendering intent:" type="optiongroup" appearance="combo">
         <option value="0">Perceptual</option>
         <option value="1">Relative Colorimetric</option>
         <option value="2">Saturation</option>
@@ -31,8 +31,8 @@
     <output>
         <extension>.pdf</extension>
         <mimetype>application/pdf</mimetype>
-        <filetypename>Scribus CMYK PDF (*.PDF)</filetypename>
-        <filetypetooltip>Exports the document to PDF using scribus</filetypetooltip>
+        <filetypename>Scribus CMYK PDF (*.pdf)</filetypename>
+        <filetypetooltip>Exports the document to PDF using Scribus</filetypetooltip>
     </output>
     <script>
         <command location="inx" interpreter="python">scribus_export_pdf.py</command>
diff --git a/scribus_export_pdf.py b/scribus_export_pdf.py
index 32437915..8430582f 100644
--- a/scribus_export_pdf.py
+++ b/scribus_export_pdf.py
@@ -41,16 +41,16 @@ VERSION_REGEX = re.compile(r"(\d+)\.(\d+)\.(\d+)")
 class Scribus(TempDirMixin, inkex.OutputExtension):
     def add_arguments(self, arg_parser):
         arg_parser.add_argument("--pdf-version", type=int, dest="pdfVersion", default="13",
-                                help="PDF version (see Scribus documentation)")
+                                help="PDF version (e.g. integer numbers between 11 and 15, see Scribus documentation for details)")
         arg_parser.add_argument("--bleed", type=float, dest="bleed", default="0",
                                 help="Bleed value")
         arg_parser.add_argument("--bleed-marks", type=inkex.Boolean, dest="bleedMarks",
-                default=False, help="Bleed marks")
+                default=False, help="Draw bleed marks")
         arg_parser.add_argument("--color-marks", type=inkex.Boolean, dest="colorMarks",
-                default=False, help="Color Marks")
+                default=False, help="Draw color marks")
         arg_parser.add_argument("--intent", type=int, dest="intent", default="0",
-                                help="0: Perceptual, 1: Relative Colorimetric, 2: Saturation, 3: Absolute Colorimetric")
-        arg_parser.add_argument("--title", type=str, dest="title", default="", help="PDF title")
+                                help="Rendering intent. Options: 0: Perceptual, 1: Relative Colorimetric, 2: Saturation, 3: Absolute Colorimetric")
+        arg_parser.add_argument("--title", type=str, dest="title", default="", help="PDF title, required for PDF/X")
         #arg_parser.add_argument("--fonts", type=int, dest="fonts", default="1",
         #                        help="Embed fonts : 0 for embedding, 1 to convert to path, 2 to prevent embedding")
 
@@ -61,7 +61,7 @@ class Scribus(TempDirMixin, inkex.OutputExtension):
         bleedMarks = self.options.bleedMarks
         colorMarks = self.options.colorMarks
         if ((bleedMarks or colorMarks) and margin < 7):
-            raise AbortExtension("You need 7mm bleed to show cutting marks or color marks")
+            raise AbortExtension("You need at least 7mm bleed to show cutting marks or color marks")
         if (bleedMarks or colorMarks):
             margin = margin - 7 #because scribus is weird. At the time of 1.5.5, it adds 7 when those are set.
         stream.write("""
@@ -119,16 +119,16 @@ exportPDF()""".format(**locals()))
         minor = int(version_match.group(2))
         point = int(version_match.group(3))
         if (major < 1) or (major == 1 and minor < 5):
-            raise AbortExtension("Found Scribus {}. This extension requires Scribus 1.5.x".format(version_match.group(0)))
+            raise AbortExtension("Found Scribus {}. This extension requires Scribus 1.5.x.".format(version_match.group(0)))
 
         input_file = self.options.input_file
         py_file = os.path.join(self.tempdir, 'scribus.py')
         svg_file = os.path.join(self.tempdir, 'in.svg')
         profiles = self.svg.defs.findall("svg:color-profile")
         if len(profiles) == 0:
-            raise AbortExtension("You did not link a color profile in this document.")
+            raise AbortExtension("Please select a color profile in the document settings.")
         elif len(profiles) > 1:
-            raise AbortExtension("More than one color profiles are linked in this document. No output generated.")
+            raise AbortExtension("Please only link a single color profile in the document settings. No output generated.")
         iccPath = profiles[0].get("xlink:href")
 
 
-- 
GitLab