From afad672a30071e466b3e622f55e8e6dd0805cb03 Mon Sep 17 00:00:00 2001
From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com>
Date: Tue, 7 Feb 2023 22:01:59 +0000
Subject: [PATCH] fix merge

---
 src/main/resources/templates/add-image.html   |  2 +-
 .../resources/templates/compress-pdf.html     |  2 +-
 .../templates/convert/img-to-pdf.html         | 49 +++++++++----------
 .../templates/convert/pdf-to-img.html         |  2 +-
 .../resources/templates/pdf-organizer.html    |  2 +-
 .../resources/templates/remove-pages.html     |  2 +-
 src/main/resources/templates/rotate-pdf.html  |  2 +-
 .../templates/security/add-password.html      |  2 +-
 .../templates/security/add-watermark.html     |  2 +-
 .../security/change-permissions.html          |  2 +-
 .../templates/security/remove-metadata.html   |  2 +-
 .../templates/security/remove-password.html   |  2 +-
 src/main/resources/templates/split-pdfs.html  |  2 +-
 13 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/src/main/resources/templates/add-image.html b/src/main/resources/templates/add-image.html
index 703fed1a5..31d170a77 100644
--- a/src/main/resources/templates/add-image.html
+++ b/src/main/resources/templates/add-image.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
 
 
 <th:block th:insert="~{fragments/common :: head(title=#{addImage.title})}"></th:block>
diff --git a/src/main/resources/templates/compress-pdf.html b/src/main/resources/templates/compress-pdf.html
index f5605d732..6b17672d7 100644
--- a/src/main/resources/templates/compress-pdf.html
+++ b/src/main/resources/templates/compress-pdf.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
 
 
 <th:block th:insert="~{fragments/common :: head(title=#{compress.title})}"></th:block>
diff --git a/src/main/resources/templates/convert/img-to-pdf.html b/src/main/resources/templates/convert/img-to-pdf.html
index bfcf902ac..7f833e320 100644
--- a/src/main/resources/templates/convert/img-to-pdf.html
+++ b/src/main/resources/templates/convert/img-to-pdf.html
@@ -3,37 +3,36 @@
 
 <th:block th:insert="~{fragments/common :: head(title=#{imageToPDF.title})}"></th:block>
 
-<body>
-<div id="page-container">
-	<div id="content-wrap">
 
-		<div th:insert="~{fragments/navbar.html :: navbar}"></div>
+<body>	<div id="page-container">
+		<div id="content-wrap">
+	<div th:insert="~{fragments/navbar.html :: navbar}"></div>
+	<br>
+	<br>
+	<div class="container">
+		<div class="row justify-content-center">
+			<div class="col-md-6">
+				<h2 th:text="#{imageToPDF.header}"></h2>
 
-		<br>
-		<br>
+				<form method="post" enctype="multipart/form-data"
+					th:action="@{img-to-pdf}">
+					<div class="custom-file">
+						<input type="file" class="custom-file-input" id="fileInput"
+							name="fileInput" required> <label
+							class="custom-file-label" for="fileInput" th:text="#{imgPrompt}"></label>
+					</div>
+					<br>
+					<br>
+					<button type="submit" class="btn btn-primary" th:text="#{imageToPDF.submit}"></button>
 
-		<div class="container">
-			<div class="row justify-content-center">
-				<div class="col-md-6">
-					<h2 th:text="#{imageToPDF.header}"></h2>
-
-					<form method="post" enctype="multipart/form-data" th:action="@{img-to-pdf}">
-						<div class="custom-file">
-							<input type="file" class="custom-file-input" id="fileInput" name="fileInput" required>
-							<label class="custom-file-label" for="fileInput" th:text="#{imgPrompt}"></label>
-						</div>
-						<br>
-						<br>
-						<button type="submit" class="btn btn-primary" th:text="#{imageToPDF.submit}"></button>
-					</form>
-
-					<th:block th:insert="~{fragments/common :: filelist}"></th:block>
-				</div>
+				</form>
+				<th:block th:insert="~{fragments/common :: filelist}"></th:block>
 			</div>
 		</div>
+	</div>
 
 	</div>
-	<div th:insert="~{fragments/footer.html :: footer}"></div>
-</div>
+		<div th:insert="~{fragments/footer.html :: footer}"></div>
+	</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/convert/pdf-to-img.html b/src/main/resources/templates/convert/pdf-to-img.html
index 8ca231554..0c1eeb57c 100644
--- a/src/main/resources/templates/convert/pdf-to-img.html
+++ b/src/main/resources/templates/convert/pdf-to-img.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
 
 <th:block th:insert="~{fragments/common :: head(title=#{pdfToImage})}"></th:block>
 
diff --git a/src/main/resources/templates/pdf-organizer.html b/src/main/resources/templates/pdf-organizer.html
index 7a69e5978..93c9a8a54 100644
--- a/src/main/resources/templates/pdf-organizer.html
+++ b/src/main/resources/templates/pdf-organizer.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
 
 <th:block th:insert="~{fragments/common :: head(title=#{pdfOrganiser.title})}"></th:block>
 
diff --git a/src/main/resources/templates/remove-pages.html b/src/main/resources/templates/remove-pages.html
index 039f450a0..9e7c79dca 100644
--- a/src/main/resources/templates/remove-pages.html
+++ b/src/main/resources/templates/remove-pages.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
 
 <th:block th:insert="~{fragments/common :: head(title=#{pageRemover.title})}"></th:block>
 
diff --git a/src/main/resources/templates/rotate-pdf.html b/src/main/resources/templates/rotate-pdf.html
index bff21ed23..8cf600270 100644
--- a/src/main/resources/templates/rotate-pdf.html
+++ b/src/main/resources/templates/rotate-pdf.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
 
 
 <th:block th:insert="~{fragments/common :: head(title=#{rotate.title})}"></th:block>
diff --git a/src/main/resources/templates/security/add-password.html b/src/main/resources/templates/security/add-password.html
index 32ad9416d..85e3ebaf5 100644
--- a/src/main/resources/templates/security/add-password.html
+++ b/src/main/resources/templates/security/add-password.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
 
 <th:block th:insert="~{fragments/common :: head(title=#{addPassword.title})}"></th:block>
 
diff --git a/src/main/resources/templates/security/add-watermark.html b/src/main/resources/templates/security/add-watermark.html
index 419757bd8..42d92a33f 100644
--- a/src/main/resources/templates/security/add-watermark.html
+++ b/src/main/resources/templates/security/add-watermark.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
 
 <th:block th:insert="~{fragments/common :: head(title=#{watermark.title})}"></th:block>
 
diff --git a/src/main/resources/templates/security/change-permissions.html b/src/main/resources/templates/security/change-permissions.html
index b6c11f869..9d5972522 100644
--- a/src/main/resources/templates/security/change-permissions.html
+++ b/src/main/resources/templates/security/change-permissions.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
 
 <th:block th:insert="~{fragments/common :: head(title=#{permissions.title})}"></th:block>
 
diff --git a/src/main/resources/templates/security/remove-metadata.html b/src/main/resources/templates/security/remove-metadata.html
index 5b83b657b..c3ef00a1a 100644
--- a/src/main/resources/templates/security/remove-metadata.html
+++ b/src/main/resources/templates/security/remove-metadata.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
 
 <th:block th:insert="~{fragments/common :: head(title=#{removeMetadata.title})}"></th:block>
 
diff --git a/src/main/resources/templates/security/remove-password.html b/src/main/resources/templates/security/remove-password.html
index e71d4840f..c896907c3 100644
--- a/src/main/resources/templates/security/remove-password.html
+++ b/src/main/resources/templates/security/remove-password.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
 
 <th:block th:insert="~{fragments/common :: head(title=#{removePassword.title})}"></th:block>
 
diff --git a/src/main/resources/templates/split-pdfs.html b/src/main/resources/templates/split-pdfs.html
index 1b283e39c..516332a26 100644
--- a/src/main/resources/templates/split-pdfs.html
+++ b/src/main/resources/templates/split-pdfs.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<html th:lang="${#locale.language}" th:lang-direction="#{language.direction}" xmlns:th="http://www.thymeleaf.org">
 
 <th:block th:insert="~{fragments/common :: head(title=#{split.title})}"></th:block>
 
