Changeset 32275 for main/trunk/greenstone2

Timestamp:

2018-07-13T21:02:27+12:00 (6 years ago)

Author:

ak19

Message:

Moving another fixed English language string into strings.properties from PDF and PDFv1 plugins, so that it becomes translatable.

Location:

main/trunk/greenstone2/perllib

Files:

• plugins/PDFPlugin.pm (modified) (2 diffs)
• plugins/PDFv1Plugin.pm (modified) (1 diff)
• strings.properties (modified) (1 diff)

main/trunk/greenstone2/perllib/plugins/PDFPlugin.pm

@@ -143 +143 @@
     # PDFv1Plugin, if they want to use the old pdftohtml tool's capabilities,
     # and PDFv2Plugin, if they want to use pdfbox or the new xpdftools capabilities.
-    &gsprintf::gsprintf(STDERR, "{PDFPlugin.deprecated_plugin}");
+    &gsprintf::gsprintf(STDERR, "{PDFPlugin.deprecated_plugin}\n");
     
     # these are passed through to gsConvert.pl by ConvertBinaryFile.pm
@@ -158 +158 @@
 
     # check convert_to
-    # TODO: Start supporting PDF to txt on Windows if we're going to be using XPDF Tools (incl pdftotext) on Windows/Linux/Mac
     if ($self->{'convert_to'} eq "text" && $ENV{'GSDLOS'} =~ /^windows$/i) {
-    #print STDERR "On Windows, Greenstone now uses Xpdf tools to support pdf to text conversion.\n";
-    print STDERR "Windows does not support pdf to text. PDFs will be converted to HTML instead\n";
+    &gsprintf::gsprintf(STDERR, "{PDFPlugin.win_old_pdftotext_unsupported}\n", "PDFPlugin");
     $self->{'convert_to'} = "html";
     }

main/trunk/greenstone2/perllib/plugins/PDFv1Plugin.pm

@@ -146 +146 @@
 
     # check convert_to
-    # TODO: Start supporting PDF to txt on Windows if we're going to be using XPDF Tools (incl pdftotext) on Windows/Linux/Mac
     if ($self->{'convert_to'} eq "text" && $ENV{'GSDLOS'} =~ /^windows$/i) {
-    print STDERR "*** On Windows, PDFv1Plugin does not support pdf to text. PDFs will be converted to HTML instead.\n";
-    print STDERR "*** Use PDFv2Plugin if you really want pdf to text conversion.\n";
+    &gsprintf::gsprintf(STDERR, "{PDFPlugin.win_old_pdftotext_unsupported}\n", "PDFv1Plugin");
     $self->{'convert_to'} = "html";
     }

main/trunk/greenstone2/perllib/strings.properties

@@ -1179 +1179 @@
 PDFPlugin.use_sections:Create a separate section for each page of the PDF file.
 
+PDFPlugin.win_old_pdftotext_unsupported:*** On Windows, %s does not support pdf to text. PDFs will be converted to HTML instead.\n*** Use PDFv2Plugin if you really want pdf to text conversion.
+
 PDFPlugin.zoom:The factor by which to zoom the PDF for output. If not outputting as paged_html, then zoom is only useful if -complex is set.