From a8d150749a8f1b50591e5058e9e082b65ffdf221 Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
Date: Mon, 20 Mar 2023 21:44:32 +0000
Subject: [PATCH] fixes and lang
---
.../RearrangePagesPDFController.java | 1 -
src/main/resources/messages_ar_AR.properties | 46 ++++++++++++++++-
src/main/resources/messages_de_DE.properties | 49 +++++++++++++++++-
src/main/resources/messages_en_GB.properties | 3 +-
src/main/resources/messages_en_US.properties | 46 ++++++++++++++++-
src/main/resources/messages_fr_FR.properties | 50 ++++++++++++++++++-
.../templates/convert/file-to-pdf.html | 2 +-
.../resources/templates/fragments/common.html | 2 +-
.../resources/templates/fragments/navbar.html | 12 +++--
src/main/resources/templates/ocr-pdf.html | 8 +--
10 files changed, 200 insertions(+), 19 deletions(-)
diff --git a/src/main/java/stirling/software/SPDF/controller/RearrangePagesPDFController.java b/src/main/java/stirling/software/SPDF/controller/RearrangePagesPDFController.java
index 71b4ba219..7c107c1b5 100644
--- a/src/main/java/stirling/software/SPDF/controller/RearrangePagesPDFController.java
+++ b/src/main/java/stirling/software/SPDF/controller/RearrangePagesPDFController.java
@@ -49,7 +49,6 @@ public class RearrangePagesPDFController {
int pageIndex = pagesToRemove.get(i);
document.removePage(pageIndex);
}
- System.out.println("here");
return PdfUtils.pdfDocToWebResponse(document, pdfFile.getOriginalFilename().replaceFirst("[.][^.]+$", "") + "_removed_pages.pdf");
}
diff --git a/src/main/resources/messages_ar_AR.properties b/src/main/resources/messages_ar_AR.properties
index 235883ddc..6ad6d0a1e 100644
--- a/src/main/resources/messages_ar_AR.properties
+++ b/src/main/resources/messages_ar_AR.properties
@@ -19,6 +19,8 @@ goToPage=اذهب
true=\u0635\u062D\u064A\u062D
false=\u062E\u0637\u0623
unknown=\u063A\u064A\u0631 \u0645\u0639\u0631\u0648\u0641
+save=\u062D\u0641\u0638
+close=\u0625\u063A\u0644\u0627\u0642
#############
# HOME-PAGE #
@@ -75,8 +77,48 @@ home.compressPdfs.desc=ضغط ملفات PDF لتقليل حجم الملف.
home.changeMetadata.title = \u062A\u063A\u064A\u064A\u0631 \u0627\u0644\u0628\u064A\u0627\u0646\u0627\u062A \u0627\u0644\u0648\u0635\u0641\u064A\u0629
home.changeMetadata.desc = \u062A\u063A\u064A\u064A\u0631 / \u0625\u0632\u0627\u0644\u0629 / \u0625\u0636\u0627\u0641\u0629 \u0628\u064A\u0627\u0646\u0627\u062A \u0623\u0648\u0644\u064A\u0629 \u0645\u0646 \u0645\u0633\u062A\u0646\u062F PDF
-home.xlsToPdf.title = \u062A\u062D\u0648\u064A\u0644 Excel (Xls) \u0625\u0644\u0649 PDF
-home.xlsToPdf.desc = \u0642\u0645 \u0628\u062A\u062D\u0648\u064A\u0644 \u0645\u0633\u062A\u0646\u062F Excel (xls \u060C xlsx) \u0625\u0644\u0649 PDF.
+
+home.fileToPDF.title=\u062A\u062D\u0648\u064A\u0644 \u0627\u0644\u0645\u0644\u0641 \u0625\u0644\u0649 PDF
+home.fileToPDF.desc=\u062A\u062D\u0648\u064A\u0644 \u0623\u064A \u0645\u0644\u0641 \u062A\u0642\u0631\u064A\u0628\u0627 \u0625\u0644\u0649 PDF (DOCX \u0648PNG \u0648XLS \u0648PPT \u0648TXT \u0648\u0627\u0644\u0645\u0632\u064A\u062F)
+
+home.ocr.title=\u062A\u0634\u063A\u064A\u0644 OCR \u0639\u0644\u0649 PDF
+home.ocr.desc=\u0645\u0633\u062D \u0648\u0627\u0643\u062A\u0634\u0627\u0641 \u0627\u0644\u0646\u0635 \u0645\u0646 \u0627\u0644\u0635\u0648\u0631 \u062F\u0627\u062E\u0644 PDF \u0648\u0625\u0639\u0627\u062F\u0629 \u0625\u0636\u0627\u0641\u062A\u0647 \u0643\u0646\u0635.
+
+home.extractImages.title=\u0627\u0633\u062A\u062E\u0631\u0627\u062C \u0627\u0644\u0635\u0648\u0631
+home.extractImages.desc=\u064A\u0633\u062A\u062E\u0631\u062C \u062C\u0645\u064A\u0639 \u0627\u0644\u0635\u0648\u0631 \u0645\u0646 \u0645\u0644\u0641 PDF \u0648\u064A\u062D\u0641\u0638\u0647\u0627 \u0641\u064A \u0627\u0644\u0631\u0645\u0632 \u0627\u0644\u0628\u0631\u064A\u062F\u064A
+
+navbar.settings = \u0625\u0639\u062F\u0627\u062F\u0627\u062A
+settings.title=\u0627\u0644\u0625\u0639\u062F\u0627\u062F\u0627\u062A
+settings.update = \u0627\u0644\u062A\u062D\u062F\u064A\u062B \u0645\u062A\u0627\u062D
+settings.appVersion = \u0625\u0635\u062F\u0627\u0631 \u0627\u0644\u062A\u0637\u0628\u064A\u0642:
+settings.downloadOption.title=\u062A\u062D\u062F\u064A\u062F \u062E\u064A\u0627\u0631 \u0627\u0644\u062A\u0646\u0632\u064A\u0644 (\u0644\u0644\u062A\u0646\u0632\u064A\u0644\u0627\u062A \u0630\u0627\u062A \u0627\u0644\u0645\u0644\u0641 \u0627\u0644\u0648\u0627\u062D\u062F \u063A\u064A\u0631 \u0627\u0644\u0645\u0636\u063A\u0648\u0637):
+settings.downloadOption.1=\u0641\u062A\u062D \u0641\u064A \u0646\u0641\u0633 \u0627\u0644\u0646\u0627\u0641\u0630\u0629
+settings.downloadOption.2=\u0641\u062A\u062D \u0641\u064A \u0646\u0627\u0641\u0630\u0629 \u062C\u062F\u064A\u062F\u0629
+settings.downloadOption.3=\u062A\u0646\u0632\u064A\u0644 \u0627\u0644\u0645\u0644\u0641
+settings.zip=\u0645\u0644\u0641\u0627\u062A \u0627\u0644\u062A\u0646\u0632\u064A\u0644 \u0627\u0644\u0645\u062A\u0639\u062F\u062F \u0627\u0644\u0645\u0636\u063A\u0648\u0637\u0629
+
+#OCR
+OCR.title = OCR
+ocr.header=OCR (\u0627\u0644\u062A\u0639\u0631\u0641 \u0627\u0644\u0636\u0648\u0626\u064A \u0639\u0644\u0649 \u0627\u0644\u0623\u062D\u0631\u0641)
+ocr.selectText.1=\u062A\u062D\u062F\u064A\u062F \u0627\u0644\u0644\u063A\u0627\u062A \u0627\u0644\u062A\u064A \u0633\u064A\u062A\u0645 \u0627\u0643\u062A\u0634\u0627\u0641\u0647\u0627 \u062F\u0627\u062E\u0644 PDF (\u0627\u0644\u0644\u063A\u0627\u062A \u0627\u0644\u0645\u062F\u0631\u062C\u0629 \u0647\u064A \u062A\u0644\u0643 \u0627\u0644\u0645\u0643\u062A\u0634\u0641\u0629 \u062D\u0627\u0644\u064A\u0627):
+ocr.selectText.2=\u0625\u0646\u062A\u0627\u062C \u0645\u0644\u0641 \u0646\u0635\u064A \u064A\u062D\u062A\u0648\u064A \u0639\u0644\u0649 \u0646\u0635 OCR \u062C\u0646\u0628\u0627 \u0625\u0644\u0649 \u062C\u0646\u0628 \u0645\u0639 \u0645\u0644\u0641 PDF OCR'ed
+ocr.help=\u064A\u0631\u062C\u0649 \u0642\u0631\u0627\u0621\u0629 \u0647\u0630\u0647 \u0627\u0644\u0648\u062B\u0627\u0626\u0642 \u062D\u0648\u0644 \u0643\u064A\u0641\u064A\u0629 \u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0647\u0630\u0627 \u0644\u0644\u063A\u0627\u062A \u0623\u062E\u0631\u0649 \u0648 / \u0623\u0648 \u0627\u0644\u0627\u0633\u062A\u062E\u062F\u0627\u0645 \u0644\u064A\u0633 \u0641\u064A \u0639\u0627\u0645\u0644 \u0627\u0644\u0625\u0631\u0633\u0627\u0621
+ocr.credit=\u062A\u0633\u062A\u062E\u062F\u0645 \u0647\u0630\u0647 \u0627\u0644\u062E\u062F\u0645\u0629 OCRmyPDF \u0648 Tesseract \u0644 OCR.
+ocr.submit = \u0645\u0639\u0627\u0644\u062C\u0629 PDF \u0628\u0627\u0633\u062A\u062E\u062F\u0627\u0645 OCR
+
+
+extractImages.title=\u0627\u0633\u062A\u062E\u0631\u0627\u062C \u0627\u0644\u0635\u0648\u0631
+extractImages.header=\u0627\u0633\u062A\u062E\u0631\u0627\u062C \u0627\u0644\u0635\u0648\u0631
+extractImages.selectText=\u062D\u062F\u062F \u062A\u0646\u0633\u064A\u0642 \u0627\u0644\u0635\u0648\u0631\u0629 \u0644\u062A\u062D\u0648\u064A\u0644 \u0627\u0644\u0635\u0648\u0631 \u0627\u0644\u0645\u0633\u062A\u062E\u0631\u062C\u0629 \u0625\u0644\u0649
+extractImages.submit=\u0627\u0633\u062A\u062E\u0631\u0627\u062C
+
+#File \u0625\u0644\u0649 PDF
+fileToPDF.title=\u0645\u0644\u0641 \u0625\u0644\u0649 PDF
+fileToPDF.header=\u062A\u062D\u0648\u064A\u0644 \u0623\u064A \u0645\u0644\u0641 \u0625\u0644\u0649 PDF
+fileToPDF.credit=\u062A\u0633\u062A\u062E\u062F\u0645 \u0647\u0630\u0647 \u0627\u0644\u062E\u062F\u0645\u0629 \u0644\u064A\u0628\u0631 \u0623\u0648\u0641\u064A\u0633 \u0648\u0623\u0648\u0646\u0648\u0643\u0648\u0646\u0641 \u0644\u062A\u062D\u0648\u064A\u0644 \u0627\u0644\u0645\u0644\u0641\u0627\u062A.
+fileToPDF.supportedFileTypes=\u064A\u062C\u0628 \u0623\u0646 \u062A\u062A\u0636\u0645\u0646 \u0623\u0646\u0648\u0627\u0639 \u0627\u0644\u0645\u0644\u0641\u0627\u062A \u0627\u0644\u0645\u062F\u0639\u0648\u0645\u0629 \u0645\u0627 \u064A\u0644\u064A \u0648\u0644\u0643\u0646 \u0644\u0644\u062D\u0635\u0648\u0644 \u0639\u0644\u0649 \u0642\u0627\u0626\u0645\u0629 \u0645\u062D\u062F\u062B\u0629 \u0643\u0627\u0645\u0644\u0629 \u0628\u0627\u0644\u062A\u0646\u0633\u064A\u0642\u0627\u062A \u0627\u0644\u0645\u062F\u0639\u0648\u0645\u0629 \u060C \u064A\u0631\u062C\u0649 \u0627\u0644\u0631\u062C\u0648\u0639 \u0625\u0644\u0649 \u0648\u062B\u0627\u0626\u0642 LibreOffice
+fileToPDF.submit=\u062A\u062D\u0648\u064A\u0644 \u0625\u0644\u0649 PDF
+
#Add image
addImage.title=إضافة صورة
diff --git a/src/main/resources/messages_de_DE.properties b/src/main/resources/messages_de_DE.properties
index ae56b2aad..f4d1b974e 100644
--- a/src/main/resources/messages_de_DE.properties
+++ b/src/main/resources/messages_de_DE.properties
@@ -15,6 +15,8 @@ goToPage=Los
true=Wahr
false=Falsch
unknown=Unbekannt
+save=Speichern
+close=Schlieen
#############
# HOME-PAGE #
@@ -71,8 +73,51 @@ home.compressPdfs.desc=PDF komprimieren um die Dateigröße zu reduzieren.
home.changeMetadata.title=Metadaten ndern
home.changeMetadata.desc=ndern/Entfernen/Hinzufgen von Metadaten aus einem PDF-Dokument
-home.xlsToPdf.title=Excel (Xls) in PDF
-home.xlsToPdf.desc=Konvertiere ein Excel-Dokument (xls, xlsx) in PDF.
+home.fileToPDF.title=Datei in PDF konvertieren
+home.fileToPDF.desc=Konvertieren Sie nahezu jede Datei in PDF (DOCX, PNG, XLS, PPT, TXT und mehr)
+
+home.ocr.title=OCR auf PDF ausfhren
+home.ocr.desc=Scannt und erkennt Text aus Bildern in einer PDF-Datei und fgt ihn erneut als Text hinzu.
+
+home.extractImages.title=Bilder extrahieren
+home.extractImages.desc=Extrahiert alle Bilder aus einer PDF-Datei und speichert sie als Zip-Datei
+
+navbar.settings=Einstellungen
+settings.title=Einstellungen
+settings.update=Update verfgbar
+settings.appVersion=App-Version:
+settings.downloadOption.title=Download-Option whlen (fr einzelne Dateien, die keine Zip-Downloads sind):
+settings.downloadOption.1=Im selben Fenster ffnen
+settings.downloadOption.2=In neuem Fenster ffnen
+settings.downloadOption.3=Datei herunterladen
+settings.zip=Dateien mit mehrfachem Download zippen
+
+#OCR
+ocr.title=OCR
+ocr.header=OCR (Optische Zeichenerkennung)
+ocr.selectText.1=Whlen Sie die Sprachen aus, die in der PDF-Datei erkannt werden sollen (die aufgelisteten sind die aktuell erkannten):
+ocr.selectText.2=Textdatei mit OCR-Text neben der OCR-PDF-Datei erstellen
+ocr.help=Bitte lesen Sie diese Dokumentation, um zu erfahren, wie Sie dies fr andere Sprachen verwenden und/oder nicht in Docker verwenden knnen
+ocr.credit=Dieser Dienst verwendet OCRmyPDF und Tesseract fr OCR.
+ocr.submit=PDF mit OCR verarbeiten
+
+
+extractImages.title=Bilder extrahieren
+extractImages.header=Bilder extrahieren
+extractImages.selectText=Whlen Sie das Bildformat aus, in das extrahierte Bilder konvertiert werden sollen
+extractImages.submit=Extrahieren
+
+
+#File to PDF
+fileToPDF.title=Datei in PDF
+fileToPDF.header=Beliebige Dateien in PDF konvertieren
+fileToPDF.credit=Dieser Dienst verwendet LibreOffice und Unoconv fr die Dateikonvertierung.
+fileToPDF.supportedFileTypes=Untersttzte Dateitypen sollten die folgenden enthalten, eine vollstndige aktualisierte Liste der untersttzten Formate finden Sie jedoch in der LibreOffice-Dokumentation
+fileToPDF.submit=In PDF konvertieren
+
+
+
+
#Add image
addImage.title=Bild hinzufügen
diff --git a/src/main/resources/messages_en_GB.properties b/src/main/resources/messages_en_GB.properties
index 419578027..1214ab33a 100644
--- a/src/main/resources/messages_en_GB.properties
+++ b/src/main/resources/messages_en_GB.properties
@@ -17,6 +17,7 @@ false=False
unknown=Unknown
save=Save
close=Close
+
#############
# HOME-PAGE #
#############
@@ -82,7 +83,7 @@ home.extractImages.title=Extract Images
home.extractImages.desc=Extracts all images from a PDF and saves them to zip
-navbar.settings=Settings/About
+navbar.settings=Settings
settings.title=Settings
settings.update=Update available
settings.appVersion=App Version:
diff --git a/src/main/resources/messages_en_US.properties b/src/main/resources/messages_en_US.properties
index c3a46c67f..e3f011095 100644
--- a/src/main/resources/messages_en_US.properties
+++ b/src/main/resources/messages_en_US.properties
@@ -15,6 +15,9 @@ goToPage=Go
true=True
false=False
unknown=Unknown
+save=Save
+close=Close
+
#############
# HOME-PAGE #
#############
@@ -70,8 +73,47 @@ home.compressPdfs.desc=Compress PDFs to reduce their file size.
home.changeMetadata.title=Change Metadata
home.changeMetadata.desc=Change/Remove/Add metadata from a PDF document
-home.xlsToPdf.title=Excel (Xls) to PDF
-home.xlsToPdf.desc=Convert a Excel document (xls, xlsx) to PDF.
+home.fileToPDF.title=Convert file to PDF
+home.fileToPDF.desc=Convert nearly any file to PDF (DOCX, PNG, XLS, PPT, TXT and more)
+
+home.ocr.title=Run OCR on PDF
+home.ocr.desc=Scans and detects text from images within a PDF and re-adds it as text.
+
+home.extractImages.title=Extract Images
+home.extractImages.desc=Extracts all images from a PDF and saves them to zip
+
+
+navbar.settings=Settings
+settings.title=Settings
+settings.update=Update available
+settings.appVersion=App Version:
+settings.downloadOption.title=Choose download option (For single file non zip downloads):
+settings.downloadOption.1=Open in same window
+settings.downloadOption.2=Open in new window
+settings.downloadOption.3=Download file
+settings.zip=Zip multi-download files
+
+#OCR
+ocr.title=OCR
+ocr.header=OCR (Optical Character Recognition)
+ocr.selectText.1=Select languages that are to be detected within the PDF (Ones listed are the ones currently detected):
+ocr.selectText.2=Produce text file containing OCR text alongside the OCR'ed PDF
+ocr.help=Please read this documentation on how to use this for other languages and/or use not in docker
+ocr.credit=This service uses OCRmyPDF and Tesseract for OCR.
+ocr.submit=Process PDF with OCR
+
+extractImages.title=Extract Images
+extractImages.header=Extract Images
+extractImages.selectText=Select image format to convert extracted images to
+extractImages.submit=Extract
+
+
+#File to PDF
+fileToPDF.title=File to PDF
+fileToPDF.header=Convert any file to PDF
+fileToPDF.credit=This service uses LibreOffice and Unoconv for file conversion.
+fileToPDF.supportedFileTypes=Supported file types should include the below however for a full updated list of supported formats, please refer to the LibreOffice documentation
+fileToPDF.submit=Convert to PDF
#Add image
diff --git a/src/main/resources/messages_fr_FR.properties b/src/main/resources/messages_fr_FR.properties
index 33acd3183..05788282e 100644
--- a/src/main/resources/messages_fr_FR.properties
+++ b/src/main/resources/messages_fr_FR.properties
@@ -19,6 +19,8 @@ goToPage=Aller
true=Vrai
false=Faux
unknown=Inconnu
+save=Enregistrer
+close=Fermer
#############
# HOME-PAGE #
@@ -75,8 +77,52 @@ home.compressPdfs.desc=Compressez les PDF pour réduire leur taille de fichier.
home.changeMetadata.title=Modifier les mtadonnes
home.changeMetadata.desc=Modifier/Supprimer/Ajouter des mtadonnes d'un document PDF
-home.xlsToPdf.title=Excel (Xls) en PDF
-home.xlsToPdf.desc=Convertir un document Excel (xls, xlsx) en PDF.
+
+home.fileToPDF.title=Convertir un fichier en PDF
+home.fileToPDF.desc=Convertissez presque n\u2019importe quel fichier en PDF (DOCX, PNG, XLS, PPT, TXT et plus)
+
+home.ocr.title=Excuter OCR sur PDF
+home.ocr.desc=Analyse et dtecte le texte des images d\u2019un fichier PDF et le rajoute en tant que texte.
+
+home.extractImages.title=Extraire les images
+home.extractImages.desc=Extrait toutes les images d\u2019un PDF et les enregistre au format zip
+
+
+navbar.settings=Paramtres
+settings.title=Paramtres
+settings.update=Mise jour disponible
+settings.appVersion=Version de l\u2019application :
+settings.downloadOption.title=Choisissez l\u2019option de tlchargement (pour les tlchargements sans fichier unique) :
+settings.downloadOption.1=Ouvrir dans la mme fentre
+settings.downloadOption.2=Ouvrir dans une nouvelle fentre
+settings.downloadOption.3=Fichier tlcharg
+settings.zip=Fichiers multi-tlchargements Zip
+
+
+#OCR
+ocr.title=OCR
+ocr.header=OCR (reconnaissance optique de caractres)
+ocr.selectText.1=Slectionnez les langues dtecter dans le fichier PDF (celles rpertories sont celles actuellement dtectes) :
+ocr.selectText.2=Produire un fichier texte contenant du texte OCR ct du PDF OCR
+ocr.help=Veuillez lire cette documentation pour savoir comment l\u2019utiliser pour d\u2019autres langues et/ou une utilisation non dans docker
+ocr.credit=Ce service utilise OCRmyPDF et Tesseract pour l\u2019OCR.
+ocr.submit=Traiter PDF avec OCR
+
+
+extractImages.title=Extraire les images
+extractImages.header=Extraire les images
+extractImages.selectText=Slectionner le format d\u2019image pour convertir les images extraites en
+extractImages.submit=Extrait
+
+
+#File au format PDF
+fileToPDF.title=Fichier au PDF
+fileToPDF.header=Convertir n\u2019importe quel fichier au format PDF
+fileToPDF.credit=Ce service utilise LibreOffice et Unoconv pour la conversion de fichiers.
+fileToPDF.supportedFileTypes=Les types de fichiers pris en charge doivent inclure les lments ci-dessous, mais pour une liste complte et mise jour des formats pris en charge, veuillez vous rfrer la documentation de LibreOffice
+fileToPDF.submit=Convertir en PDF
+
+
#Add image
diff --git a/src/main/resources/templates/convert/file-to-pdf.html b/src/main/resources/templates/convert/file-to-pdf.html
index e86cc1ab4..d20f3fa4e 100644
--- a/src/main/resources/templates/convert/file-to-pdf.html
+++ b/src/main/resources/templates/convert/file-to-pdf.html
@@ -23,7 +23,7 @@
-
+ https://help.libreoffice.org/latest/en-US/text/shared/guide/supported_formats.html
diff --git a/src/main/resources/templates/fragments/common.html b/src/main/resources/templates/fragments/common.html
index c87aa11a7..ad46b8c11 100644
--- a/src/main/resources/templates/fragments/common.html
+++ b/src/main/resources/templates/fragments/common.html
@@ -117,7 +117,7 @@ function toggleDarkMode() {
const contentDispositionHeader = response.headers.get('Content-Disposition');
console.log(contentDispositionHeader)
if (contentDispositionHeader && contentDispositionHeader.indexOf('attachment') !== -1) {
- filename = contentDispositionHeader.match(/filename=(.+)$/)[1];
+ filename = contentDispositionHeader.split('filename=')[1].replace(/"/g, '');
} else {
// If the Content-Disposition header is not present or does not contain the filename, use a default filename
filename = 'download';
diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html
index 02b4d789a..1df0cc43f 100644
--- a/src/main/resources/templates/fragments/navbar.html
+++ b/src/main/resources/templates/fragments/navbar.html
@@ -172,8 +172,11 @@ function compareVersions(version1, version2) {