From 63a9e40aa90b01c5fced7d36223c3da332d2e4ad Mon Sep 17 00:00:00 2001 From: albanobattistella <34811668+albanobattistella@users.noreply.github.com> Date: Mon, 14 Apr 2025 23:37:51 +0200 Subject: [PATCH 1/9] Update messages_it_IT.properties (#3350) # Description of Changes Please provide a summary of the changes, including: - What was changed - Why the change was made - Any challenges encountered Closes #(issue_number) --- ## Checklist ### General - [ ] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md) - [ ] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md) (if applicable) - [ ] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md) (if applicable) - [ ] I have performed a self-review of my own code - [ ] My changes generate no new warnings ### Documentation - [ ] I have updated relevant docs on [Stirling-PDF's doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/) (if functionality has heavily changed) - [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only) ### UI Changes (if applicable) - [ ] Screenshots or videos demonstrating the UI changes are attached (e.g., as comments or direct attachments in the PR) ### Testing (if applicable) - [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing) for more details. --- src/main/resources/messages_it_IT.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/messages_it_IT.properties b/src/main/resources/messages_it_IT.properties index 62b8b096..30368524 100644 --- a/src/main/resources/messages_it_IT.properties +++ b/src/main/resources/messages_it_IT.properties @@ -10,9 +10,9 @@ multiPdfPrompt=Scegli 2 o più PDF multiPdfDropPrompt=Scegli (o trascina e rilascia) uno o più PDF imgPrompt=Scegli immagine/i genericSubmit=Invia -uploadLimit=Maximum file size: -uploadLimitExceededSingular=is too large. Maximum allowed size is -uploadLimitExceededPlural=are too large. Maximum allowed size is +uploadLimit=Dimensione massima del file: +uploadLimitExceededSingular=è troppo grande. La dimensione massima consentita è +uploadLimitExceededPlural=sono troppo grandi. La dimensione massima consentita è processTimeWarning=Nota: Questo processo potrebbe richiedere fino a un minuto in base alla dimensione dei file pageOrderPrompt=Ordine delle pagine (inserisci una lista di numeri separati da virgola): pageSelectionPrompt=Selezione pagina personalizzata (inserisci un elenco separato da virgole di numeri di pagina 1,5,6 o funzioni come 2n+1) : @@ -93,7 +93,7 @@ legal.terms=Termini e Condizioni legal.accessibility=Accessibilità legal.cookie=Informativa sui cookie legal.impressum=Informazioni legali -legal.showCookieBanner=Cookie Preferences +legal.showCookieBanner=Preferenze sui cookie ############### # Pipeline # From 5a0567cf6a316c686cd4d91302235878c110c9e3 Mon Sep 17 00:00:00 2001 From: ConnorYoh <40631091+ConnorYoh@users.noreply.github.com> Date: Mon, 14 Apr 2025 23:33:40 +0100 Subject: [PATCH 2/9] Error reductions found via analytics (#3351) # Description of Changes Please provide a summary of the changes, including: - What was changed - Why the change was made - Any challenges encountered Closes #(issue_number) --- ## Checklist ### General - [ ] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md) - [ ] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md) (if applicable) - [ ] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md) (if applicable) - [ ] I have performed a self-review of my own code - [ ] My changes generate no new warnings ### Documentation - [ ] I have updated relevant docs on [Stirling-PDF's doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/) (if functionality has heavily changed) - [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only) ### UI Changes (if applicable) - [ ] Screenshots or videos demonstrating the UI changes are attached (e.g., as comments or direct attachments in the PR) ### Testing (if applicable) - [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing) for more details. --- src/main/resources/static/js/downloader.js | 4 +++- src/main/resources/static/js/fileInput.js | 2 +- src/main/resources/static/js/homecard-legacy.js | 7 +++++++ src/main/resources/static/js/homecard.js | 7 +------ src/main/resources/static/js/languageSelection.js | 10 +++++++--- .../static/js/multitool/commands/delete-page.js | 7 ------- src/main/resources/static/js/pages/home.js | 2 +- src/main/resources/templates/fragments/navbar.html | 2 +- src/main/resources/templates/login.html | 2 +- src/main/resources/templates/misc/add-image.html | 2 +- 10 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/main/resources/static/js/downloader.js b/src/main/resources/static/js/downloader.js index 3b325b59..7bdcd83d 100644 --- a/src/main/resources/static/js/downloader.js +++ b/src/main/resources/static/js/downloader.js @@ -132,7 +132,9 @@ } } catch (error) { clearTimeout(timeoutId); - showGameBtn.style.display = 'none'; + if(showGameBtn){ + showGameBtn.style.display = 'none'; + } submitButton.textContent = originalButtonText; submitButton.disabled = false; handleDownloadError(error); diff --git a/src/main/resources/static/js/fileInput.js b/src/main/resources/static/js/fileInput.js index a67ff1fd..b24563c0 100644 --- a/src/main/resources/static/js/fileInput.js +++ b/src/main/resources/static/js/fileInput.js @@ -170,7 +170,7 @@ function setupFileInput(chooser) { inputContainer.querySelector('#fileInputText').innerHTML = window.fileInput.loading; async function checkZipFile() { - const hasZipFiles = allFiles.some(file => zipTypes.includes(file.type)); + const hasZipFiles = allFiles.some(file => file.type && zipTypes.includes(file.type)); // Only change to extractPDF message if we actually have zip files if (hasZipFiles) { diff --git a/src/main/resources/static/js/homecard-legacy.js b/src/main/resources/static/js/homecard-legacy.js index 02789efd..a43453f1 100644 --- a/src/main/resources/static/js/homecard-legacy.js +++ b/src/main/resources/static/js/homecard-legacy.js @@ -255,5 +255,12 @@ document.addEventListener('DOMContentLoaded', function () { }); }, 500); + Array.from(document.querySelectorAll('.feature-group-header')).forEach((header) => { + const parent = header.parentNode; + header.onclick = () => { + expandCollapseToggle(parent); + }; + }); + showFavoritesOnly(); }); diff --git a/src/main/resources/static/js/homecard.js b/src/main/resources/static/js/homecard.js index 33d49a78..8f5a92f0 100644 --- a/src/main/resources/static/js/homecard.js +++ b/src/main/resources/static/js/homecard.js @@ -241,10 +241,5 @@ document.addEventListener('DOMContentLoaded', async function () { console.error('Material Symbols Rounded font failed to load.'); }); - Array.from(document.querySelectorAll('.feature-group-header')).forEach((header) => { - const parent = header.parentNode; - header.onclick = () => { - expandCollapseToggle(parent); - }; - }); + }); diff --git a/src/main/resources/static/js/languageSelection.js b/src/main/resources/static/js/languageSelection.js index 2c7e0406..7d4b8bc0 100644 --- a/src/main/resources/static/js/languageSelection.js +++ b/src/main/resources/static/js/languageSelection.js @@ -57,11 +57,15 @@ function initLanguageSettings() { function sortLanguageDropdown() { document.addEventListener('DOMContentLoaded', function () { - const dropdownMenu = document.querySelector('.dropdown-menu .dropdown-item.lang_dropdown-item').parentElement; + const dropdownMenu = document.getElementById('languageSelection'); if (dropdownMenu) { - const items = Array.from(dropdownMenu.children).filter((child) => child.matches('a')); + const items = Array.from(dropdownMenu.children).filter((child) => child.querySelector('a')); items - .sort((a, b) => a.dataset.bsLanguageCode.localeCompare(b.dataset.bsLanguageCode)) + .sort((wrapperA, wrapperB) => { + const a = wrapperA.querySelector('a'); + const b = wrapperB.querySelector('a'); + return a.dataset.bsLanguageCode.localeCompare(b.dataset.bsLanguageCode); + }) .forEach((node) => dropdownMenu.appendChild(node)); } }); diff --git a/src/main/resources/static/js/multitool/commands/delete-page.js b/src/main/resources/static/js/multitool/commands/delete-page.js index 89fbe8a2..751b115e 100644 --- a/src/main/resources/static/js/multitool/commands/delete-page.js +++ b/src/main/resources/static/js/multitool/commands/delete-page.js @@ -21,12 +21,10 @@ export class DeletePageCommand extends Command { this.pagesContainer.removeChild(this.element); if (this.pagesContainer.childElementCount === 0) { const filenameInput = document.getElementById("filename-input"); - const filenameParagraph = document.getElementById("filename"); const downloadBtn = document.getElementById("export-button"); filenameInput.disabled = true; filenameInput.value = ""; - filenameParagraph.innerText = ""; downloadBtn.disabled = true; } @@ -43,13 +41,10 @@ export class DeletePageCommand extends Command { } const filenameInput = document.getElementById("filename-input"); - const filenameParagraph = document.getElementById("filename"); const downloadBtn = document.getElementById("export-button"); filenameInput.disabled = false; filenameInput.value = this.filenameInputValue; - if (this.filenameParagraph) - filenameParagraph.innerText = this.filenameParagraphText; downloadBtn.disabled = false; } @@ -63,12 +58,10 @@ export class DeletePageCommand extends Command { this.pagesContainer.removeChild(this.element); if (this.pagesContainer.childElementCount === 0) { const filenameInput = document.getElementById("filename-input"); - const filenameParagraph = document.getElementById("filename"); const downloadBtn = document.getElementById("export-button"); filenameInput.disabled = true; filenameInput.value = ""; - filenameParagraph.innerText = ""; downloadBtn.disabled = true; } diff --git a/src/main/resources/static/js/pages/home.js b/src/main/resources/static/js/pages/home.js index 8565c44a..7872374e 100644 --- a/src/main/resources/static/js/pages/home.js +++ b/src/main/resources/static/js/pages/home.js @@ -112,10 +112,10 @@ function setAsDefault(value) { function adjustVisibleElements() { const container = document.querySelector('.recent-features'); + if(!container) return; const subElements = Array.from(container.children); let totalWidth = 0; - const containerWidth = container.offsetWidth; subElements.forEach((element) => { totalWidth += 12 * parseFloat(getComputedStyle(document.documentElement).fontSize); diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html index b338f3f7..593d8c21 100644 --- a/src/main/resources/templates/fragments/navbar.html +++ b/src/main/resources/templates/fragments/navbar.html @@ -143,7 +143,7 @@
-
+
diff --git a/src/main/resources/templates/login.html b/src/main/resources/templates/login.html index 0cdd347d..a359b20e 100644 --- a/src/main/resources/templates/login.html +++ b/src/main/resources/templates/login.html @@ -143,7 +143,7 @@
-
+
diff --git a/src/main/resources/templates/misc/add-image.html b/src/main/resources/templates/misc/add-image.html index b9374744..ec75b822 100644 --- a/src/main/resources/templates/misc/add-image.html +++ b/src/main/resources/templates/misc/add-image.html @@ -27,7 +27,7 @@
-
+
From 1c2794432976b8a982a035cdca20a04cf15aca7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 10:34:29 +0100 Subject: [PATCH 3/9] Bump io.micrometer:micrometer-core from 1.14.5 to 1.14.6 (#3353) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [io.micrometer:micrometer-core](https://github.com/micrometer-metrics/micrometer) from 1.14.5 to 1.14.6.
Release notes

Sourced from io.micrometer:micrometer-core's releases.

1.14.6

:lady_beetle: Bug Fixes

  • Gauge double registration warning for Kafka metrics #5757
  • Log warning about "function" meter re-registration #6070

:heart: Contributors

Thank you to all the contributors who worked on this release:

@​izeye

Commits
  • c3f3a80 Merge branch '1.13.x' into 1.14.x
  • fa523b1 Bump io.micrometer:context-propagation from 1.1.2 to 1.1.3 (#6115)
  • d5f3d34 Bump org.junit:junit-bom from 5.12.1 to 5.12.2 (#6111)
  • 9ebcde1 Bump com.netflix.spectator:spectator-reg-atlas from 1.8.9 to 1.8.10 (#6112)
  • 0ae9b47 Bump org.junit:junit-bom from 5.12.1 to 5.12.2 (#6107)
  • d0e70fc Merge branch '1.13.x' into 1.14.x
  • 3b2270c Bump uk.org.webcompere:system-stubs-jupiter from 2.1.7 to 2.1.8 (#6096)
  • f62f2ee Bump uk.org.webcompere:system-stubs-jupiter from 2.1.7 to 2.1.8 (#6094)
  • 53b9a35 Replace deprecated Project.task() (#6092)
  • 0ebdd7d Bump com.netflix.spectator:spectator-reg-atlas from 1.8.8 to 1.8.9 (#6091)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=io.micrometer:micrometer-core&package-manager=gradle&previous-version=1.14.5&new-version=1.14.6)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 4f884a4a..eef7c6de 100644 --- a/build.gradle +++ b/build.gradle @@ -516,7 +516,7 @@ dependencies { implementation "org.bouncycastle:bcprov-jdk18on:$bouncycastleVersion" implementation "org.bouncycastle:bcpkix-jdk18on:$bouncycastleVersion" implementation "org.springframework.boot:spring-boot-starter-actuator:$springBootVersion" - implementation "io.micrometer:micrometer-core:1.14.5" + implementation "io.micrometer:micrometer-core:1.14.6" implementation group: "com.google.zxing", name: "core", version: "3.5.3" // https://mvnrepository.com/artifact/org.commonmark/commonmark implementation "org.commonmark:commonmark:0.24.0" From 6da84338dc9f1071033f3de5ca90850b036dbace Mon Sep 17 00:00:00 2001 From: Reece Browne <74901996+reecebrowne@users.noreply.github.com> Date: Tue, 15 Apr 2025 21:44:21 +1200 Subject: [PATCH 4/9] Bug/498/signature slow firefox mobile (#3322) # Description of Changes Please provide a summary of the changes, including: - What was changed - Why the change was made - Any challenges encountered Closes #(498) --- ## Checklist ### General - [ ] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md) - [ ] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md) (if applicable) - [ ] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md) (if applicable) - [ ] I have performed a self-review of my own code - [ ] My changes generate no new warnings ### Documentation - [ ] I have updated relevant docs on [Stirling-PDF's doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/) (if functionality has heavily changed) - [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only) ### UI Changes (if applicable) - [ ] Screenshots or videos demonstrating the UI changes are attached (e.g., as comments or direct attachments in the PR) ### Testing (if applicable) - [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing) for more details. --------- Co-authored-by: Reece Browne --- .../static/js/sign/signature-canvas.js | 46 ++++++++++--------- src/main/resources/templates/sign.html | 8 ++-- 2 files changed, 28 insertions(+), 26 deletions(-) diff --git a/src/main/resources/static/js/sign/signature-canvas.js b/src/main/resources/static/js/sign/signature-canvas.js index bd06e845..a3f7b1e9 100644 --- a/src/main/resources/static/js/sign/signature-canvas.js +++ b/src/main/resources/static/js/sign/signature-canvas.js @@ -26,7 +26,6 @@ window.addEventListener("keydown", (event) => { function undoDraw() { const data = signaturePad.toData(); - if (data && data.length > 0) { const removed = data.pop(); undoData.push(removed); @@ -35,7 +34,6 @@ function undoDraw() { } function redoDraw() { - if (undoData.length > 0) { const data = signaturePad.toData(); data.push(undoData.pop()); @@ -52,24 +50,18 @@ function addDraggableFromPad() { } function getCroppedCanvasDataUrl(canvas) { - let originalCtx = canvas.getContext('2d'); + let originalCtx = canvas.getContext('2d', { willReadFrequently: true }); let originalWidth = canvas.width; let originalHeight = canvas.height; let imageData = originalCtx.getImageData(0, 0, originalWidth, originalHeight); - let minX = originalWidth + 1, - maxX = -1, - minY = originalHeight + 1, - maxY = -1, - x = 0, - y = 0, - currentPixelColorValueIndex; + let minX = originalWidth + 1, maxX = -1, minY = originalHeight + 1, maxY = -1; - for (y = 0; y < originalHeight; y++) { - for (x = 0; x < originalWidth; x++) { - currentPixelColorValueIndex = (y * originalWidth + x) * 4; - let currentPixelAlphaValue = imageData.data[currentPixelColorValueIndex + 3]; - if (currentPixelAlphaValue > 0) { + for (let y = 0; y < originalHeight; y++) { + for (let x = 0; x < originalWidth; x++) { + let idx = (y * originalWidth + x) * 4; + let alpha = imageData.data[idx + 3]; + if (alpha > 0) { if (minX > x) minX = x; if (maxX < x) maxX = x; if (minY > y) minY = y; @@ -81,14 +73,14 @@ function getCroppedCanvasDataUrl(canvas) { let croppedWidth = maxX - minX; let croppedHeight = maxY - minY; if (croppedWidth < 0 || croppedHeight < 0) return null; - let cuttedImageData = originalCtx.getImageData(minX, minY, croppedWidth, croppedHeight); + let cutImageData = originalCtx.getImageData(minX, minY, croppedWidth, croppedHeight); - let croppedCanvas = document.createElement('canvas'), - croppedCtx = croppedCanvas.getContext('2d'); + let croppedCanvas = document.createElement('canvas'); + let croppedCtx = croppedCanvas.getContext('2d'); croppedCanvas.width = croppedWidth; croppedCanvas.height = croppedHeight; - croppedCtx.putImageData(cuttedImageData, 0, 0); + croppedCtx.putImageData(cutImageData, 0, 0); return croppedCanvas.toDataURL(); } @@ -114,10 +106,20 @@ function resizeCanvas() { signaturePad.clear(); } -new IntersectionObserver((entries, observer) => { +const debounce = (fn, delay = 100) => { + let timer; + return (...args) => { + clearTimeout(timer); + timer = setTimeout(() => fn(...args), delay); + }; +}; + +const debouncedResize = debounce(resizeCanvas, 200); + +new IntersectionObserver((entries) => { if (entries.some((entry) => entry.intersectionRatio > 0)) { - resizeCanvas(); + debouncedResize(); } }).observe(signaturePadCanvas); -new ResizeObserver(resizeCanvas).observe(signaturePadCanvas); +new ResizeObserver(debouncedResize).observe(signaturePadCanvas); diff --git a/src/main/resources/templates/sign.html b/src/main/resources/templates/sign.html index b0c66c27..ef815d1d 100644 --- a/src/main/resources/templates/sign.html +++ b/src/main/resources/templates/sign.html @@ -43,13 +43,13 @@
-
+
-
+

-
+
@@ -134,7 +134,7 @@
-
+
From 1e0e942d93e03534f6158c64d7434318c095f93d Mon Sep 17 00:00:00 2001 From: "stirlingbot[bot]" <195170888+stirlingbot[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 10:44:42 +0100 Subject: [PATCH 5/9] Update 3rd Party Licenses (#3354) Auto-generated by StirlingBot Signed-off-by: stirlingbot[bot] <1113334+stirlingbot[bot]@users.noreply.github.com> Co-authored-by: stirlingbot[bot] <195170888+stirlingbot[bot]@users.noreply.github.com> --- src/main/resources/static/3rdPartyLicenses.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/static/3rdPartyLicenses.json b/src/main/resources/static/3rdPartyLicenses.json index e76bca57..8d07e610 100644 --- a/src/main/resources/static/3rdPartyLicenses.json +++ b/src/main/resources/static/3rdPartyLicenses.json @@ -553,7 +553,7 @@ { "moduleName": "io.micrometer:micrometer-core", "moduleUrl": "https://github.com/micrometer-metrics/micrometer", - "moduleVersion": "1.14.5", + "moduleVersion": "1.14.6", "moduleLicense": "The Apache Software License, Version 2.0", "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt" }, From de9e3edf5cd13c8baada353a655bfe78956fc71e Mon Sep 17 00:00:00 2001 From: "stirlingbot[bot]" <195170888+stirlingbot[bot]@users.noreply.github.com> Date: Tue, 15 Apr 2025 10:45:00 +0100 Subject: [PATCH 6/9] :globe_with_meridians: Sync Translations + Update README Progress Table (#3352) ### Description of Changes This Pull Request was automatically generated to synchronize updates to translation files and documentation. Below are the details of the changes made: #### **1. Synchronization of Translation Files** - Updated translation files (`messages_*.properties`) to reflect changes in the reference file `messages_en_GB.properties`. - Ensured consistency and synchronization across all supported language files. - Highlighted any missing or incomplete translations. #### **2. Update README.md** - Generated the translation progress table in `README.md`. - Added a summary of the current translation status for all supported languages. - Included up-to-date statistics on translation coverage. #### **Why these changes are necessary** - Keeps translation files aligned with the latest reference updates. - Ensures the documentation reflects the current translation progress. --- Auto-generated by [create-pull-request][1]. [1]: https://github.com/peter-evans/create-pull-request Co-authored-by: stirlingbot[bot] <195170888+stirlingbot[bot]@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 472398a8..e622929a 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,7 @@ Stirling-PDF currently supports 39 languages! | Hungarian (Magyar) (hu_HU) | ![89%](https://geps.dev/progress/89) | | Indonesian (Bahasa Indonesia) (id_ID) | ![81%](https://geps.dev/progress/81) | | Irish (Gaeilge) (ga_IE) | ![92%](https://geps.dev/progress/92) | -| Italian (Italiano) (it_IT) | ![98%](https://geps.dev/progress/98) | +| Italian (Italiano) (it_IT) | ![99%](https://geps.dev/progress/99) | | Japanese (日本語) (ja_JP) | ![89%](https://geps.dev/progress/89) | | Korean (한국어) (ko_KR) | ![92%](https://geps.dev/progress/92) | | Norwegian (Norsk) (no_NB) | ![86%](https://geps.dev/progress/86) | From def0552f244fdeef75b69b05c5342b4c46c091d7 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Tue, 15 Apr 2025 15:15:08 +0100 Subject: [PATCH 7/9] fix pipelines via changing to service (#3358) # Description of Changes Please provide a summary of the changes, including: - What was changed - Why the change was made - Any challenges encountered Closes #(issue_number) --- ## Checklist ### General - [ ] I have read the [Contribution Guidelines](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/CONTRIBUTING.md) - [ ] I have read the [Stirling-PDF Developer Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md) (if applicable) - [ ] I have read the [How to add new languages to Stirling-PDF](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md) (if applicable) - [ ] I have performed a self-review of my own code - [ ] My changes generate no new warnings ### Documentation - [ ] I have updated relevant docs on [Stirling-PDF's doc repo](https://github.com/Stirling-Tools/Stirling-Tools.github.io/blob/main/docs/) (if functionality has heavily changed) - [ ] I have read the section [Add New Translation Tags](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/HowToAddNewLanguage.md#add-new-translation-tags) (for new translation tags only) ### UI Changes (if applicable) - [ ] Screenshots or videos demonstrating the UI changes are attached (e.g., as comments or direct attachments in the PR) ### Testing (if applicable) - [ ] I have tested my changes locally. Refer to the [Testing Guide](https://github.com/Stirling-Tools/Stirling-PDF/blob/main/DeveloperGuide.md#6-testing) for more details. --- build.gradle | 2 +- .../software/SPDF/config/AppConfig.java | 27 --------- .../web/GlobalUploadLimitWebController.java | 30 ---------- .../controller/web/UploadLimitService.java | 55 +++++++++++++++++++ .../resources/templates/fragments/common.html | 12 ++-- 5 files changed, 62 insertions(+), 64 deletions(-) delete mode 100644 src/main/java/stirling/software/SPDF/controller/web/GlobalUploadLimitWebController.java create mode 100644 src/main/java/stirling/software/SPDF/controller/web/UploadLimitService.java diff --git a/build.gradle b/build.gradle index eef7c6de..b49b03c0 100644 --- a/build.gradle +++ b/build.gradle @@ -29,7 +29,7 @@ ext { } group = "stirling.software" -version = "0.45.5" +version = "0.45.6" java { // 17 is lowest but we support and recommend 21 diff --git a/src/main/java/stirling/software/SPDF/config/AppConfig.java b/src/main/java/stirling/software/SPDF/config/AppConfig.java index 146f9762..1c850b2d 100644 --- a/src/main/java/stirling/software/SPDF/config/AppConfig.java +++ b/src/main/java/stirling/software/SPDF/config/AppConfig.java @@ -109,33 +109,6 @@ public class AppConfig { return (rateLimit != null) ? Boolean.valueOf(rateLimit) : false; } - @Bean(name = "uploadLimit") - public long uploadLimit() { - String maxUploadSize = - applicationProperties.getSystem().getFileUploadLimit() != null - ? applicationProperties.getSystem().getFileUploadLimit() - : ""; - - if (maxUploadSize.isEmpty()) { - return 0; - } else if (!new Regex("^[1-9][0-9]{0,2}[KMGkmg][Bb]$").matches(maxUploadSize)) { - log.error( - "Invalid maxUploadSize format. Expected format: [1-9][0-9]{0,2}[KMGkmg][Bb], but got: {}", - maxUploadSize); - return 0; - } else { - String unit = maxUploadSize.replaceAll("[1-9][0-9]{0,2}", "").toUpperCase(); - String number = maxUploadSize.replaceAll("[KMGkmg][Bb]", ""); - long size = Long.parseLong(number); - return switch (unit) { - case "KB" -> size * 1024; - case "MB" -> size * 1024 * 1024; - case "GB" -> size * 1024 * 1024 * 1024; - default -> 0; - }; - } - } - @Bean(name = "RunningInDocker") public boolean runningInDocker() { return Files.exists(Paths.get("/.dockerenv")); diff --git a/src/main/java/stirling/software/SPDF/controller/web/GlobalUploadLimitWebController.java b/src/main/java/stirling/software/SPDF/controller/web/GlobalUploadLimitWebController.java deleted file mode 100644 index 1c8b2b3a..00000000 --- a/src/main/java/stirling/software/SPDF/controller/web/GlobalUploadLimitWebController.java +++ /dev/null @@ -1,30 +0,0 @@ -package stirling.software.SPDF.controller.web; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.ControllerAdvice; -import org.springframework.web.bind.annotation.ModelAttribute; - -@Component -@ControllerAdvice -public class GlobalUploadLimitWebController { - - @Autowired() private long uploadLimit; - - @ModelAttribute("uploadLimit") - public long populateUploadLimit() { - return uploadLimit; - } - - @ModelAttribute("uploadLimitReadable") - public String populateReadableLimit() { - return humanReadableByteCount(uploadLimit); - } - - private String humanReadableByteCount(long bytes) { - if (bytes < 1024) return bytes + " B"; - int exp = (int) (Math.log(bytes) / Math.log(1024)); - String pre = "KMGTPE".charAt(exp - 1) + "B"; - return String.format("%.1f %s", bytes / Math.pow(1024, exp), pre); - } -} diff --git a/src/main/java/stirling/software/SPDF/controller/web/UploadLimitService.java b/src/main/java/stirling/software/SPDF/controller/web/UploadLimitService.java new file mode 100644 index 00000000..c1c9aebc --- /dev/null +++ b/src/main/java/stirling/software/SPDF/controller/web/UploadLimitService.java @@ -0,0 +1,55 @@ +package stirling.software.SPDF.controller.web; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import lombok.extern.slf4j.Slf4j; +import stirling.software.SPDF.model.ApplicationProperties; + +import java.util.regex.Pattern; + +@Service +@Slf4j +public class UploadLimitService { + + @Autowired + private ApplicationProperties applicationProperties; + + public long getUploadLimit() { + String maxUploadSize = + applicationProperties.getSystem().getFileUploadLimit() != null + ? applicationProperties.getSystem().getFileUploadLimit() + : ""; + + if (maxUploadSize.isEmpty()) { + return 0; + } else if (!Pattern.compile("^[1-9][0-9]{0,2}[KMGkmg][Bb]$").matcher(maxUploadSize).matches()) { + log.error( + "Invalid maxUploadSize format. Expected format: [1-9][0-9]{0,2}[KMGkmg][Bb], but got: {}", + maxUploadSize); + return 0; + } else { + String unit = maxUploadSize.replaceAll("[1-9][0-9]{0,2}", "").toUpperCase(); + String number = maxUploadSize.replaceAll("[KMGkmg][Bb]", ""); + long size = Long.parseLong(number); + return switch (unit) { + case "KB" -> size * 1024; + case "MB" -> size * 1024 * 1024; + case "GB" -> size * 1024 * 1024 * 1024; + default -> 0; + }; + } + } + + //TODO: why do this server side not client? + public String getReadableUploadLimit() { + return humanReadableByteCount(getUploadLimit()); + } + + private String humanReadableByteCount(long bytes) { + if (bytes < 1024) return bytes + " B"; + int exp = (int) (Math.log(bytes) / Math.log(1024)); + String pre = "KMGTPE".charAt(exp - 1) + "B"; + return String.format("%.1f %s", bytes / Math.pow(1024, exp), pre); + } +} \ No newline at end of file diff --git a/src/main/resources/templates/fragments/common.html b/src/main/resources/templates/fragments/common.html index b8211481..7fd26c77 100644 --- a/src/main/resources/templates/fragments/common.html +++ b/src/main/resources/templates/fragments/common.html @@ -240,8 +240,8 @@ window.stirlingPDF.sessionExpired = /*[[#{session.expired}]]*/ ''; window.stirlingPDF.refreshPage = /*[[#{session.refreshPage}]]*/ 'Refresh Page'; window.stirlingPDF.error = /*[[#{error}]]*/ "Error"; - window.stirlingPDF.uploadLimit = /*[[${uploadLimit}]]*/ 0; - window.stirlingPDF.uploadLimitReadable = /*[[${uploadLimitReadable}]]*/ 'Unlimited'; + window.stirlingPDF.uploadLimitReadable = /*[[${@uploadLimitService.getReadableUploadLimit()}]]*/ 'Unlimited'; + window.stirlingPDF.uploadLimit = /*[[${@uploadLimitService.getUploadLimit()}]]*/ 0; window.stirlingPDF.uploadLimitExceededSingular = /*[[#{uploadLimitExceededSingular}]]*/ 'is too large. Maximum allowed size is'; window.stirlingPDF.uploadLimitExceededPlural = /*[[#{uploadLimitExceededPlural}]]*/ 'are too large. Maximum allowed size is'; })(); @@ -292,10 +292,10 @@
-
- Maximum file size: - -
+
+ Maximum file size: + +