Merge branch 'main' of git@github.com:Stirling-Tools/Stirling-PDF.git into main

* Removed horizontal scroll logic from multi-tool template

* Remove unused horizontalScroll.js

README.md

@@ -182,7 +182,7 @@ Stirling PDF currently supports 38!
 | Dutch (Nederlands) (nl_NL)                  | ![88%](https://geps.dev/progress/88)   |
 | 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)                   | ![85%](https://geps.dev/progress/85)   |
+| French (Français) (fr_FR)                   | ![88%](https://geps.dev/progress/88)   |
 | German (Deutsch) (de_DE)                    | ![94%](https://geps.dev/progress/94) |
 | Greek (Ελληνικά) (el_GR)                    | ![75%](https://geps.dev/progress/75)   |
 | Hindi (हिंदी) (hi_IN)                          | ![72%](https://geps.dev/progress/72)   |

build.gradle

@@ -22,7 +22,7 @@ ext {
 }
 
 group = "stirling.software"
-version = "0.30.0"
+version = "0.30.1"
 
 java {
     // 17 is lowest but we support and recommend 21

chart/stirling-pdf/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 0.30.0
+appVersion: 0.30.1
 description: locally hosted web application that allows you to perform various operations
   on PDF files
 home: https://github.com/Stirling-Tools/Stirling-PDF

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

@@ -7,20 +7,19 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 
+import lombok.extern.slf4j.Slf4j;
 import stirling.software.SPDF.model.ApplicationProperties;
 
 @Configuration
 @Lazy
+@Slf4j
 public class EEAppConfig {
 
-    private static final Logger logger = LoggerFactory.getLogger(EEAppConfig.class);
-
     @Autowired ApplicationProperties applicationProperties;
-
     @Autowired private LicenseKeyChecker licenseKeyChecker;
 
     @Bean(name = "runningEE")
     public boolean runningEnterpriseEdition() {
-        return licenseKeyChecker.getEnterpriseEnabledResult();
+    	return licenseKeyChecker.getEnterpriseEnabledResult();
     }
-}
+}

src/main/java/stirling/software/SPDF/config/AppConfig.java

@@ -15,6 +15,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Scope;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.ResourceLoader;
@@ -162,12 +163,14 @@ public class AppConfig {
     }
 
     @Bean(name = "analyticsPrompt")
+    @Scope("request")
     public boolean analyticsPrompt() {
         return applicationProperties.getSystem().getEnableAnalytics() == null
                 || "undefined".equals(applicationProperties.getSystem().getEnableAnalytics());
     }
 
     @Bean(name = "analyticsEnabled")
+    @Scope("request")
     public boolean analyticsEnabled() {
         if (applicationProperties.getEnterpriseEdition().isEnabled()) return true;
         return applicationProperties.getSystem().getEnableAnalytics() != null

src/main/java/stirling/software/SPDF/controller/api/SettingsController.java

@@ -32,6 +32,7 @@ public class SettingsController {
         }
         GeneralUtils.saveKeyToConfig("system.enableAnalytics", String.valueOf(enabled), false);
         applicationProperties.getSystem().setEnableAnalytics(String.valueOf(enabled));
+
         return ResponseEntity.ok("Updated");
     }
 }

src/main/resources/messages_fr_FR.properties

@@ -145,7 +145,7 @@ navbar.sections.convertFrom=Convertir depuis PDF
 navbar.sections.security=Signature et sécurité
 navbar.sections.advance=Mode avancé
 navbar.sections.edit=Voir et modifier
-navbar.sections.popular=Popular
+navbar.sections.popular=Populaire
 
 #############
 #  SETTINGS #
@@ -202,9 +202,9 @@ adminUserSettings.header=Administration des paramètres des utilisateurs
 adminUserSettings.admin=Administateur
 adminUserSettings.user=Utilisateur
 adminUserSettings.addUser=Ajouter un utilisateur
-adminUserSettings.deleteUser=Delete User
-adminUserSettings.confirmDeleteUser=Should the user be deleted?
-adminUserSettings.confirmChangeUserStatus=Should the user be disabled/enabled?
+adminUserSettings.deleteUser=Supprimer l'utilisateur
+adminUserSettings.confirmDeleteUser=Voulez vous vraiment supprimer l'utilisateur ?
+adminUserSettings.confirmChangeUserStatus=Voulez vous vraiment déactiver/réactiver l'utilisateur ?
 adminUserSettings.usernameInfo=Le nom d'utilisateur ne peut contenir que des lettres, des chiffres et les caractères spéciaux suivants @._+- ou doit être une adresse e-mail valide.
 adminUserSettings.roles=Rôles
 adminUserSettings.role=Rôle
@@ -218,13 +218,13 @@ adminUserSettings.forceChange=Forcer l’utilisateur à changer son nom d’util
 adminUserSettings.submit=Ajouter
 adminUserSettings.changeUserRole=Changer le rôle de l'utilisateur
 adminUserSettings.authenticated=Authentifié
-adminUserSettings.editOwnProfil=Edit own profile
-adminUserSettings.enabledUser=enabled user
-adminUserSettings.disabledUser=disabled user
-adminUserSettings.activeUsers=Active Users:
-adminUserSettings.disabledUsers=Disabled Users:
-adminUserSettings.totalUsers=Total Users:
-adminUserSettings.lastRequest=Last Request
+adminUserSettings.editOwnProfil=Éditer son propre profil
+adminUserSettings.enabledUser=Utilisateur activé
+adminUserSettings.disabledUser=Utilisateur désactivé
+adminUserSettings.activeUsers=Utilisateurs actifs :
+adminUserSettings.disabledUsers=Utilisateurs désactivés :
+adminUserSettings.totalUsers=Utilisateurs au total :
+adminUserSettings.lastRequest=Dernière requête
 
 
 database.title=Database Import/Export
@@ -243,7 +243,7 @@ database.fileNotFound=File not Found
 database.fileNullOrEmpty=File must not be null or empty
 database.failedImportFile=Failed Import File
 
-session.expired=Your session has expired. Please refresh the page and try again.
+session.expired=Votre session a expiré. Veuillez recharger la page et réessayer.
 
 #############
 # HOME-PAGE #
@@ -321,7 +321,7 @@ home.changeMetadata.desc=Modifiez, supprimez ou ajoutez des métadonnées à un
 changeMetadata.tags=métadonnées,titre,auteur,date,création,heure,éditeur,statistiques,title,author,date,creation,time,publisher,producer,stats,metadata
 
 home.fileToPDF.title=Fichier en PDF
-home.fileToPDF.desc=Convertissez presque n’importe quel fichiers en PDF (DOCX, PNG, XLS, PPT, TXT et plus).
+home.fileToPDF.desc=Convertissez presque n’importe quel fichier en PDF (DOCX, PNG, XLS, PPT, TXT, etc.).
 fileToPDF.tags=convertion,transformation,format,document,image,slide,texte,conversion,office,docs,word,excel,powerpoint
 
 home.ocr.title=OCR / Nettoyage des numérisations
@@ -390,9 +390,9 @@ home.certSign.title=Signer avec un certificat
 home.certSign.desc=Signez un PDF avec un certificat ou une clé (PEM/P12).
 certSign.tags=signer,chiffrer,certificat,authenticate,PEM,P12,official,encrypt
 
-home.removeCertSign.title=Remove Certificate Sign
-home.removeCertSign.desc=Remove certificate signature from PDF
-removeCertSign.tags=authenticate,PEM,P12,official,decrypt
+home.removeCertSign.title=Supprimer la signature par certificat
+home.removeCertSign.desc=Supprimez la signature par certificat d'un PDF
+removeCertSign.tags=signer,chiffrer,certificat,authenticate,PEM,P12,official,decrypt
 
 home.pageLayout.title=Fusionner des pages
 home.pageLayout.desc=Fusionnez plusieurs pages d’un PDF en une seule.
@@ -498,14 +498,14 @@ home.BookToPDF.title=eBook vers PDF
 home.BookToPDF.desc=Convertit les formats de livres/bandes dessinées en PDF à l'aide de calibre
 BookToPDF.tags=Book,Comic,Calibre,Convert,manga,amazon,kindle
 
-home.removeImagePdf.title=Remove image
-home.removeImagePdf.desc=Remove image from PDF to reduce file size
-removeImagePdf.tags=Remove Image,Page operations,Back end,server side
+home.removeImagePdf.title=Supprimer les images
+home.removeImagePdf.desc=Supprimez les images d'un PDF pour réduire sa taille
+removeImagePdf.tags=Images,Remove Image,Page operations,Back end,server side
 
 
-home.splitPdfByChapters.title=Split PDF by Chapters
-home.splitPdfByChapters.desc=Split a PDF into multiple files based on its chapter structure.
-splitPdfByChapters.tags=split,chapters,bookmarks,organize
+home.splitPdfByChapters.title=Séparer un PDF par chapitres
+home.splitPdfByChapters.desc=Séparez un PDF en fichiers multiples en fonction de sa structure par chapitres.
+splitPdfByChapters.tags=séparer,chapitres,split,chapters,bookmarks,organize
 
 #replace-invert-color
 replace-color.title=Replace-Invert-Color
@@ -786,14 +786,14 @@ compare.submit=Comparer
 #BookToPDF
 BookToPDF.title=Livres et BD vers PDF
 BookToPDF.header=Livre vers PDF
-BookToPDF.credit=Utiliser Calibre
+BookToPDF.credit=Utilise Calibre
 BookToPDF.submit=Convertir
 
 #PDFToBook
 PDFToBook.title=PDF vers Livre
 PDFToBook.header=PDF vers Livre
 PDFToBook.selectText.1=Format
-PDFToBook.credit=Utiliser Calibre
+PDFToBook.credit=Utilise Calibre
 PDFToBook.submit=Convertir
 
 #sign
@@ -1076,7 +1076,7 @@ pdfToPDFA.credit=Ce service utilise ghostscript pour la conversion en PDF/A.
 pdfToPDFA.submit=Convertir
 pdfToPDFA.tip=Ne fonctionne actuellement pas pour plusieurs entrées à la fois
 pdfToPDFA.outputFormat=Format de sortie
-pdfToPDFA.pdfWithDigitalSignature=The PDF contains a digital signature. This will be removed in the next step.
+pdfToPDFA.pdfWithDigitalSignature=Le PDF contient une signature numérique. Elle sera supprimée dans l'étape suivante.
 
 
 #PDFToWord

src/main/resources/static/js/multitool/horizontalScroll.js

@@ -1,39 +0,0 @@
-const scrollDivHorizontally = (id) => {
-  var scrollDeltaX = 0; // variable to store the accumulated horizontal scroll delta
-  var scrollDeltaY = 0; // variable to store the accumulated vertical scroll delta
-  var isScrolling = false; // variable to track if scroll is already in progress
-  const divToScroll = document.getElementById(id);
-
-  function scrollLoop() {
-    // Scroll the div horizontally and vertically by a fraction of the accumulated scroll delta
-    divToScroll.scrollLeft += scrollDeltaX * 0.1;
-    divToScroll.scrollTop += scrollDeltaY * 0.1;
-
-    // Reduce the accumulated scroll delta by a fraction
-    scrollDeltaX *= 0.9;
-    scrollDeltaY *= 0.9;
-
-    // If scroll delta is still significant, continue the scroll loop
-    if (Math.abs(scrollDeltaX) > 0.1 || Math.abs(scrollDeltaY) > 0.1) {
-      requestAnimationFrame(scrollLoop);
-    } else {
-      isScrolling = false; // Reset scroll in progress flag
-    }
-  }
-
-  divToScroll.addEventListener("wheel", function (e) {
-    e.preventDefault(); // prevent default mousewheel behavior
-
-    // Accumulate the horizontal and vertical scroll delta
-    scrollDeltaX -= e.deltaX || e.wheelDeltaX || -e.deltaY || -e.wheelDeltaY;
-    scrollDeltaY -= e.deltaY || e.wheelDeltaY || -e.deltaX || -e.wheelDeltaX;
-
-    // If scroll is not already in progress, start the scroll loop
-    if (!isScrolling) {
-      isScrolling = true;
-      requestAnimationFrame(scrollLoop);
-    }
-  });
-};
-
-export default scrollDivHorizontally;

src/main/resources/templates/fragments/navbar.html

@@ -360,7 +360,7 @@
             </div>
           </li>
 
-          <li class="nav-item">
+          <li class="nav-item" th:if="${!@runningEE}">
             <a href="https://stirlingpdf.com/pricing" class="nav-link go-pro-link" target="_blank" rel="noopener noreferrer">
         <span class="go-pro-badge" th:text="#{enterpriseEdition.button}"></span>
             </a>

src/main/resources/templates/home.html

@@ -374,10 +374,10 @@
           <p th:text="#{analytics.paragraph2}">Please consider enabling analytics to help Stirling-PDF grow and to allow us to understand our users better.</p>
           <p th:text="#{analytics.settings}">You can change the settings for analytics in the config/settings.yml file</p>
         </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-primary" th:text="#{analytics.enable}" onclick="setAnalytics(true)">Enable analytics</button>
-          <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" onclick="setAnalytics(false)" th:text="#{analytics.disable}">Disable analytics</button>
-        </div>
+        <div class="modal-footer justify-content-between">
+                <button type="button" class="btn btn-secondary" data-bs-dismiss="modal" onclick="setAnalytics(false)" th:text="#{analytics.disable}">Disable analytics</button>
+                <button type="button" class="btn btn-primary" th:text="#{analytics.enable}" onclick="setAnalytics(true)">Enable analytics</button>
+            </div>
       </div>
     </div>
   </div>
@@ -426,50 +426,60 @@
 
 
 
-    document.addEventListener("DOMContentLoaded", function() {
-      const surveyVersion = "2.0";
-      const modal = new bootstrap.Modal(document.getElementById('surveyModal'));
-      const dontShowAgain = document.getElementById('dontShowAgain');
-      const takeSurveyButton = document.getElementById('takeSurvey');
+document.addEventListener("DOMContentLoaded", function() {
+    const surveyVersion = "2.0";
+    const modal = new bootstrap.Modal(document.getElementById('surveyModal'));
+    const dontShowAgain = document.getElementById('dontShowAgain');
+    const takeSurveyButton = document.getElementById('takeSurvey');
 
-      const viewThresholds = [5, 15, 30, 50, 75, 100, 150, 200];
-      let pageViews = parseInt(localStorage.getItem('pageViews') || '0');
+    const viewThresholds = [5, 10, 15, 22, 30, 50, 75, 100, 150, 200];
 
-      pageViews++;
-      localStorage.setItem('pageViews', pageViews.toString());
+    // Check if survey version changed and reset page views if it did
+    const storedVersion = localStorage.getItem('surveyVersion');
+    if (storedVersion && storedVersion !== surveyVersion) {
+        localStorage.setItem('pageViews', '0');
+    }
 
-      function shouldShowSurvey() {
-        if (localStorage.getItem('dontShowSurvey') === 'true' || localStorage.getItem('surveyTaken') === 'true') {
-          return false;
+    let pageViews = parseInt(localStorage.getItem('pageViews') || '0');
+
+    pageViews++;
+    localStorage.setItem('pageViews', pageViews.toString());
+
+    function shouldShowSurvey() {
+        if (localStorage.getItem('dontShowSurvey') === 'true' ||
+            localStorage.getItem('surveyTaken') === 'true') {
+            return false;
         }
 
-        if (localStorage.getItem('surveyVersion') !== surveyVersion) {
-          return true;
+        // If survey version changed and we hit a threshold, show the survey
+        if (localStorage.getItem('surveyVersion') !== surveyVersion &&
+            viewThresholds.includes(pageViews)) {
+            return true;
         }
 
         return viewThresholds.includes(pageViews);
-      }
+    }
 
-      if (shouldShowSurvey()) {
+    if (shouldShowSurvey()) {
         modal.show();
-      }
+    }
 
-      dontShowAgain.addEventListener('change', function() {
+    dontShowAgain.addEventListener('change', function() {
         if (this.checked) {
-          localStorage.setItem('dontShowSurvey', 'true');
-          localStorage.setItem('surveyVersion', surveyVersion);
+            localStorage.setItem('dontShowSurvey', 'true');
+            localStorage.setItem('surveyVersion', surveyVersion);
         } else {
-          localStorage.removeItem('dontShowSurvey');
-          localStorage.removeItem('surveyVersion');
+            localStorage.removeItem('dontShowSurvey');
+            localStorage.removeItem('surveyVersion');
         }
-      });
+    });
 
-      takeSurveyButton.addEventListener('click', function() {
+    takeSurveyButton.addEventListener('click', function() {
         localStorage.setItem('surveyTaken', 'true');
         localStorage.setItem('surveyVersion', surveyVersion);
         modal.hide();
-      });
     });
+});
   </script>
 
 

src/main/resources/templates/multi-tool.html

@@ -80,7 +80,6 @@
   <script type="module">
     import PdfContainer from './js/multitool/PdfContainer.js';
     import DragDropManager from "./js/multitool/DragDropManager.js";
-    import scrollDivHorizontally from "./js/multitool/horizontalScroll.js";
     import ImageHighlighter from "./js/multitool/ImageHighlighter.js";
     import PdfActionsManager from './js/multitool/PdfActionsManager.js';
     import FileDragManager from './js/multitool/fileInput.js';
@@ -93,7 +92,6 @@
     const fileDragManager = new FileDragManager();
 
     // Scroll the wrapper horizontally
-    scrollDivHorizontally('pages-container-wrapper');
 
     // Automatically exposes rotateAll, addFiles and exportPdf to the window for the global buttons.
     const pdfContainer = new PdfContainer(
@@ -111,4 +109,4 @@
   </script>
 </body>
 
-</html>
+</html>