Merge branch 'main' into bug/remember-me

src/main/resources/application.properties

@@ -50,4 +50,4 @@ springdoc.swagger-ui.url=/v1/api-docs
 
 
 posthog.api.key=phc_fiR65u5j6qmXTYL56MNrLZSWqLaDW74OrZH0Insd2xq
-posthog.host=https://eu.i.posthog.com
+posthog.host=https://eu.i.posthog.com

src/main/resources/messages_zh_TW.properties

@@ -79,8 +79,8 @@ info=資訊
 pro=專業版
 page=頁面
 pages=頁面
-loading=Loading...
-addToDoc=Add to Document
+loading=載入中...
+addToDoc=新增至文件
 
 legal.privacy=隱私權政策
 legal.terms=使用條款
@@ -140,7 +140,7 @@ navbar.darkmode=深色模式
 navbar.language=語言
 navbar.settings=設定
 navbar.allTools=工具
-navbar.multiTool=多功能工具
+navbar.multiTool=複合工具
 navbar.sections.organize=整理
 navbar.sections.convertTo=轉換為 PDF
 navbar.sections.convertFrom=從 PDF 轉換
@@ -246,7 +246,7 @@ database.fileNullOrEmpty=檔案不得為空或空白
 database.failedImportFile=匯入檔案失敗
 
 session.expired=您的工作階段已過期。請重新整理頁面並再試一次。
-session.refreshPage=Refresh Page
+session.refreshPage=重新整理頁面
 
 #############
 # HOME-PAGE #
@@ -751,7 +751,7 @@ certSign.showSig=顯示簽章
 certSign.reason=原因
 certSign.location=位置
 certSign.name=名稱
-certSign.showLogo=Show Logo
+certSign.showLogo=顯示 Logo
 certSign.submit=簽章 PDF
 
 
@@ -786,9 +786,9 @@ compare.highlightColor.2=標示顏色 2：
 compare.document.1=文件 1
 compare.document.2=文件 2
 compare.submit=比較
-compare.complex.message=One or both of the provided documents are large files, accuracy of comparison may be reduced
-compare.large.file.message=One or Both of the provided documents are too large to process
-compare.no.text.message=One or both of the selected PDFs have no text content. Please choose PDFs with text for comparison.
+compare.complex.message=選擇的檔案大小太大（其中一個或兩者皆是），可能會影響比較的精確度
+compare.large.file.message=選擇的檔案大小超出系統限制（其中一個或兩者皆是），無法處理
+compare.no.text.message=選擇的 PDF 檔案未包含文字（其中一個或兩者皆是）。請選擇含有文字的 PDF 進行比較
 
 #BookToPDF
 BookToPDF.title=電子書和漫畫轉 PDF
@@ -805,17 +805,17 @@ PDFToBook.submit=轉換
 
 #sign
 sign.title=簽章
-sign.header=簽章 PDF
+sign.header=簽署 PDF
 sign.upload=上傳影像
 sign.draw=繪製簽章
 sign.text=文字輸入
 sign.clear=清除
 sign.add=新增
-sign.saved=Saved Signatures
-sign.save=Save Signature
-sign.personalSigs=Personal Signatures
-sign.sharedSigs=Shared Signatures
-sign.noSavedSigs=No saved signatures found
+sign.saved=已儲存的簽章
+sign.save=儲存簽章
+sign.personalSigs=個人簽章
+sign.sharedSigs=共用簽章
+sign.noSavedSigs=尚未儲存任何簽章
 
 
 #repair

src/main/resources/settings.yml.template

@@ -102,3 +102,22 @@ metrics:
 AutomaticallyGenerated:
   key: example
   UUID: example
+
+processExecutor:
+  sessionLimit:    # Process executor instances limits
+    libreOfficeSessionLimit: 1
+    pdfToHtmlSessionLimit: 1
+    ocrMyPdfSessionLimit: 2
+    pythonOpenCvSessionLimit: 8
+    ghostScriptSessionLimit: 16
+    weasyPrintSessionLimit: 16
+    installAppSessionLimit: 1
+    calibreSessionLimit: 1
+  timeoutMinutes:    # Process executor timeout in minutes
+    libreOfficetimeoutMinutes: 30
+    pdfToHtmltimeoutMinutes: 20
+    pythonOpenCvtimeoutMinutes: 30
+    ghostScripttimeoutMinutes: 30
+    weasyPrinttimeoutMinutes: 30
+    installApptimeoutMinutes: 60
+    calibretimeoutMinutes: 30

src/main/resources/static/js/merge.js

@@ -21,27 +21,55 @@ async function displayFiles(files) {
   for (let i = 0; i < files.length; i++) {
     const pageCount = await getPDFPageCount(files[i]);
     const pageLabel = pageCount === 1 ? pageTranslation : pagesTranslation;
+    
+    // Create list item
     const item = document.createElement("li");
     item.className = "list-group-item";
-    item.innerHTML = `
-            <div class="d-flex justify-content-between align-items-center w-100">
-                <div class="filename">${files[i].name}</div>
-                <div class="page-info">
-                    <span class="page-count">${pageCount} ${pageLabel}</span>
-                </div>
-                <div class="arrows d-flex">
-                    <button class="btn btn-secondary move-up"><span>&uarr;</span></button>
-                    <button class="btn btn-secondary move-down"><span>&darr;</span></button>
-                    <button class="btn btn-danger remove-file"><span>&times;</span></button>
-                </div>
-            </div>
-        `;
+
+    // Create filename div and set textContent to sanitize
+    const fileNameDiv = document.createElement("div");
+    fileNameDiv.className = "filename";
+    fileNameDiv.textContent = files[i].name;
+
+    // Create page info div and set textContent to sanitize
+    const pageInfoDiv = document.createElement("div");
+    pageInfoDiv.className = "page-info";
+    const pageCountSpan = document.createElement("span");
+    pageCountSpan.className = "page-count";
+    pageCountSpan.textContent = `${pageCount} ${pageLabel}`;
+    pageInfoDiv.appendChild(pageCountSpan);
+
+    // Create arrows div with buttons
+    const arrowsDiv = document.createElement("div");
+    arrowsDiv.className = "arrows d-flex";
+
+    const moveUpButton = document.createElement("button");
+    moveUpButton.className = "btn btn-secondary move-up";
+    moveUpButton.innerHTML = "<span>&uarr;</span>";
+
+    const moveDownButton = document.createElement("button");
+    moveDownButton.className = "btn btn-secondary move-down";
+    moveDownButton.innerHTML = "<span>&darr;</span>";
+
+    const removeButton = document.createElement("button");
+    removeButton.className = "btn btn-danger remove-file";
+    removeButton.innerHTML = "<span>&times;</span>";
+
+    arrowsDiv.append(moveUpButton, moveDownButton, removeButton);
+
+    // Append elements to item and then to list
+    const itemContainer = document.createElement("div");
+    itemContainer.className = "d-flex justify-content-between align-items-center w-100";
+    itemContainer.append(fileNameDiv, pageInfoDiv, arrowsDiv);
+
+    item.appendChild(itemContainer);
     list.appendChild(item);
   }
 
   attachMoveButtons();
 }
 
+
 async function getPDFPageCount(file) {
   const blobUrl = URL.createObjectURL(file);
   const pdf = await pdfjsLib.getDocument(blobUrl).promise;