Merge branch 'main' into Frooodle-patch-9

.github/scripts/check_language_properties.py

@@ -11,8 +11,6 @@ adjusting the format.
 Usage:
     python check_language_properties.py --reference-file <path_to_reference_file> --branch <branch_name> [--actor <actor_name>] [--files <list_of_changed_files>]
 """
-# Sample for Windows:
-# python .github/scripts/check_language_properties.py --reference-file src\main\resources\messages_en_GB.properties --branch "" --files src\main\resources\messages_de_DE.properties src\main\resources\messages_uk_UA.properties
 
 import copy
 import glob
@@ -166,14 +164,8 @@ def check_for_differences(reference_file, file_list, branch, actor):
         basename_current_file = os.path.basename(os.path.join(branch, file_path))
         if (
             basename_current_file == basename_reference_file
-            or (
+            or not file_path.startswith(
-                # only local windows command
+                os.path.join("src", "main", "resources", "messages_")
-                not file_path.startswith(
-                    os.path.join("", "src", "main", "resources", "messages_")
-                )
-                and not file_path.startswith(
-                    os.path.join(os.getcwd(), "src", "main", "resources", "messages_")
-                )
             )
             or not file_path.endswith(".properties")
             or not basename_current_file.startswith("messages_")
@@ -283,12 +275,6 @@ if __name__ == "__main__":
         required=True,
         help="Branch name.",
     )
-    parser.add_argument(
-        "--check-file",
-        type=str,
-        required=False,
-        help="List of changed files, separated by spaces.",
-    )
     parser.add_argument(
         "--files",
         nargs="+",
@@ -307,14 +293,11 @@ if __name__ == "__main__":
 
     file_list = args.files
     if file_list is None:
-        if args.check_file:
+        file_list = glob.glob(
-            file_list = [args.check_file]
+            os.path.join(
-        else:
+                os.getcwd(), "src", "main", "resources", "messages_*.properties"
-            file_list = glob.glob(
-                os.path.join(
-                    os.getcwd(), "src", "main", "resources", "messages_*.properties"
-                )
             )
+        )
         update_missing_keys(args.reference_file, file_list)
     else:
         check_for_differences(args.reference_file, file_list, args.branch, args.actor)

.github/workflows/build.yml

@@ -102,7 +102,6 @@ jobs:
         uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
           python-version: "3.12"
-          cache: 'pip' # caching pip dependencies
 
       - name: Pip requirements
         run: |

.github/workflows/multiOSReleases.yml

@@ -130,8 +130,8 @@ jobs:
         include:
           - os: windows-latest
             platform: win-
-          - os: macos-latest
+          # - os: macos-latest
-            platform: mac-
+          #   platform: mac-
           # - os: ubuntu-latest
           #   platform: linux-
     runs-on: ${{ matrix.os }}
@@ -168,7 +168,6 @@ jobs:
         env:
           DOCKER_ENABLE_SECURITY: false
           STIRLING_PDF_DESKTOP_UI: true
-          BROWSER_OPEN: true
 
       # Rename and collect artifacts based on OS
       - name: Prepare artifacts
@@ -203,8 +202,8 @@ jobs:
         include:
           - os: windows-latest
             platform: win-
-          - os: macos-latest
+          # - os: macos-latest
-            platform: mac-
+          #   platform: mac-
           # - os: ubuntu-latest
           #   platform: linux-
     runs-on: ubuntu-latest

.github/workflows/pre_commit.yml

@@ -27,7 +27,6 @@ jobs:
         uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
           python-version: 3.12
-          cache: 'pip' # caching pip dependencies
       - name: Run Pre-Commit Hooks
         run: |
           pip install --require-hashes -r ./.github/scripts/requirements_pre_commit.txt

.github/workflows/sync_files.yml

@@ -29,7 +29,6 @@ jobs:
         uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5.3.0
         with:
           python-version: "3.12"
-          cache: 'pip' # caching pip dependencies
       - name: Install dependencies
         run: pip install --require-hashes -r ./.github/scripts/requirements_sync_readme.txt
       - name: Sync README

.github/workflows/update-translations.yml

@@ -1,7 +1,6 @@
 name: Update Translations
 
 on:
-  workflow_dispatch:
   push:
     branches: ["main"]
     paths:

.gitignore

@@ -21,7 +21,6 @@ pipeline/finishedFolders/
 customFiles/
 configs/
 watchedFolders/
-clientWebUI/
 !cucumber/
 !cucumber/exampleFiles/
 !cucumber/exampleFiles/example_html.zip

HowToAddNewLanguage.md

@@ -60,13 +60,3 @@ ignore = [
 - After adding the new tags to `messages_en_GB.properties`, add and translate them in the respective language file (e.g., `messages_pl_PL.properties`).
 
 Make sure to place the entry under the correct language section. This helps maintain the accuracy of translation progress statistics and ensures that the translation tool or scripts do not misinterpret the completion rate.
-
-### Use this code to perform a local check
-
-#### Windows command
-
-```ps
-python .github/scripts/check_language_properties.py --reference-file src\main\resources\messages_en_GB.properties --branch "" --files src\main\resources\messages_pl_PL.properties
-
-python .github/scripts/check_language_properties.py --reference-file src\main\resources\messages_en_GB.properties --branch "" --check-file src\main\resources\messages_pl_PL.properties
-```

README.md

@@ -129,7 +129,7 @@ Stirling-PDF currently supports 38 languages!
 | English (English) (en_GB)                    | ![100%](https://geps.dev/progress/100) |
 | English (US) (en_US)                         | ![100%](https://geps.dev/progress/100) |
 | French (Français) (fr_FR)                    | ![93%](https://geps.dev/progress/93)   |
-| German (Deutsch) (de_DE)                     | ![100%](https://geps.dev/progress/100)   |
+| German (Deutsch) (de_DE)                     | ![99%](https://geps.dev/progress/99)   |
 | Greek (Ελληνικά) (el_GR)                     | ![99%](https://geps.dev/progress/99)   |
 | Hindi (हिंदी) (hi_IN)                          | ![99%](https://geps.dev/progress/99)   |
 | Hungarian (Magyar) (hu_HU)                   | ![97%](https://geps.dev/progress/97)   |

build.gradle

@@ -25,7 +25,7 @@ ext {
 }
 
 group = "stirling.software"
-version = "0.37.1"
+version = "0.37.0"
 
 
 java {
@@ -111,15 +111,18 @@ def getMacVersion(String version) {
 
 jpackage {
     input = "build/libs"
-    destination = "${projectDir}/build/jpackage"
+
-    mainJar = "Stirling-PDF-${project.version}.jar"
     appName = "Stirling-PDF"
     appVersion = project.version
     vendor = "Stirling-Software"
-    appDescription = "Stirling PDF - Your Local PDF Editor"
+	appDescription = "Stirling PDF - Your Local PDF Editor"
+
+    mainJar = "Stirling-PDF-${project.version}.jar"
+    mainClass = "org.springframework.boot.loader.launch.JarLauncher"
+
     icon = "src/main/resources/static/favicon.ico"
-    verbose = true
+
-//    mainClass = "org.springframework.boot.loader.launch.JarLauncher"
+
 
     // JVM Options
     javaOptions = [
@@ -127,15 +130,17 @@ jpackage {
         "-DSTIRLING_PDF_DESKTOP_UI=true",
         "-Djava.awt.headless=false",
         "-Dapple.awt.UIElement=true",
-        "--add-opens=java.base/java.lang=ALL-UNNAMED",
+        "--add-opens", "java.base/java.lang=ALL-UNNAMED",
-        "--add-opens=java.desktop/java.awt.event=ALL-UNNAMED",
+        "--add-opens", "java.desktop/java.awt.event=ALL-UNNAMED",
-        "--add-opens=java.desktop/sun.awt=ALL-UNNAMED",
+        "--add-opens", "java.desktop/sun.awt=ALL-UNNAMED"
-        "--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED",
+
-        "--add-opens=java.desktop/sun.awt.windows=ALL-UNNAMED",
-        "--add-opens=java.desktop/sun.lwawt=ALL-UNNAMED",
-        "--add-opens=java.desktop/sun.lwawt.macosx=ALL-UNNAMED",
     ]
 
+
+    verbose = true
+
+    destination = "${projectDir}/build/jpackage"
+
     // Windows-specific configuration
     windows {
     	launcherAsService = false

scripts/ignore_translation.toml

@@ -50,7 +50,6 @@ ignore = [
     'pipeline.title',
     'pipelineOptions.pipelineHeader',
     'pro',
-    'redact.zoom',
     'sponsor',
     'text',
     'validateSignature.cert.bits',

src/main/java/stirling/software/SPDF/EE/EEAppConfig.java

@@ -25,7 +25,7 @@ public class EEAppConfig {
 
     @Bean(name = "runningEE")
     public boolean runningEnterpriseEdition() {
-        return licenseKeyChecker.getEnterpriseEnabledResult();
+    	return licenseKeyChecker.getEnterpriseEnabledResult();
     }
 
     @Bean(name = "SSOAutoLogin")

src/main/java/stirling/software/SPDF/config/security/database/DatabaseConfig.java

@@ -33,11 +33,7 @@ public class DatabaseConfig {
     public DatabaseConfig(
             ApplicationProperties applicationProperties,
             @Qualifier("runningEE") boolean runningEE) {
-        DATASOURCE_DEFAULT_URL =
+    	DATASOURCE_DEFAULT_URL = "jdbc:h2:file:" + InstallationPathConfig.getConfigPath() + File.separator + "stirling-pdf-DB-2.3.232;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE";
-                "jdbc:h2:file:"
-                        + InstallationPathConfig.getConfigPath()
-                        + File.separator
-                        + "stirling-pdf-DB-2.3.232;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE";
         this.applicationProperties = applicationProperties;
         this.runningEE = runningEE;
     }

src/main/java/stirling/software/SPDF/controller/web/GeneralWebController.java

@@ -55,10 +55,7 @@ public class GeneralWebController {
         List<String> pipelineConfigs = new ArrayList<>();
         List<Map<String, String>> pipelineConfigsWithNames = new ArrayList<>();
         if (new File(InstallationPathConfig.getPipelineDefaultWebUIConfigsDir()).exists()) {
-            try (Stream<Path> paths =
+            try (Stream<Path> paths = Files.walk(Paths.get(InstallationPathConfig.getPipelineDefaultWebUIConfigsDir()))) {
-                    Files.walk(
-                            Paths.get(
-                                    InstallationPathConfig.getPipelineDefaultWebUIConfigsDir()))) {
                 List<Path> jsonFiles =
                         paths.filter(Files::isRegularFile)
                                 .filter(p -> p.toString().endsWith(".json"))

src/main/resources/messages_de_DE.properties

@@ -862,7 +862,7 @@ sign.first=Erste Seite
 sign.last=Letzte Seite
 sign.next=Nächste Seite
 sign.previous=Vorherige Seite
-sign.maintainRatio=Seitenverhältnis beibehalten ein-/ausschalten
+sign.maintainRatio=Toggle maintain aspect ratio
 
 
 #repair
@@ -1320,8 +1320,8 @@ splitByChapters.submit=PDF teilen
 fileChooser.click=Klicken
 fileChooser.or=oder
 fileChooser.dragAndDrop=Drag & Drop
-fileChooser.dragAndDropPDF=Drag & Drop PDF-Datei
+fileChooser.dragAndDropPDF=Drag & Drop PDF file
-fileChooser.dragAndDropImage=Drag & Drop Bilddatei
+fileChooser.dragAndDropImage=Drag & Drop Image file
 fileChooser.hoveredDragAndDrop=Datei(en) hierhin Ziehen & Fallenlassen
 
 #release notes