From 46481fe331ff3e62c76627504354e8b05c206523 Mon Sep 17 00:00:00 2001
From: Jean-Pascal <jean-pascal.aubry@inrae.fr>
Date: Wed, 9 Oct 2024 15:39:59 +0000
Subject: [PATCH 1/2] fix: update Electron warning message Refs #641

---
 jalhyd_branch | 2 +-
 main.js       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/jalhyd_branch b/jalhyd_branch
index 35ca24e72..ce57f6456 100644
--- a/jalhyd_branch
+++ b/jalhyd_branch
@@ -1 +1 @@
-379-rugofond-ajouter-un-avertissement-sur-les-lignes-d-eau-trop-elevees
+develop
\ No newline at end of file
diff --git a/main.js b/main.js
index edc7e2487..7c909cb8b 100644
--- a/main.js
+++ b/main.js
@@ -135,7 +135,8 @@ const lookForUpdates = function() {
                             }
                             let notif = new Notification({
                                 title: `Cassiopee version ${data.latest} is available`,
-                                body: `The desktop distribution of Cassiopeia will no longer be updated in 2024. You are invited to use the progressive web app Cassiopée instead. Click to download update installer.`,
+                                body: `La version ${data.latest} de Cassiopée est disponible mais l'application "desktop" que vous utilisez n'est plus maintenue. Pour bénéficier des dernières fonctionnalités de Cassiopée, vous êtes invités à utiliser la distribution PWA en suivant la procédure suivante: https://cassiopee.g-eau.fr/assets/docs/fr/general/installation.html \n\n` +
+                                `Version ${data.latest} of Cassiopée is available but the desktop application you are using is no longer maintained. To take advantage of the latest Cassiopée features, you are invited to use the PWA distribution by following the procedure below: https://cassiopee.g-eau.fr/assets/docs/en/general/installation.html`,
                                 icon: nativeImage.createFromPath(iconPath) // @see https://github.com/electron/electron/issues/24221
                             });
                             notif.addListener("click", () => {
-- 
GitLab


From 8453c5f5bda46fe4d35c52fc54dd44a2ef8ba3f3 Mon Sep 17 00:00:00 2001
From: David Dorchies <david.dorchies@inrae.fr>
Date: Thu, 27 Feb 2025 15:28:55 +0000
Subject: [PATCH 2/2] fix: jalhyd_branch

---
 jalhyd_branch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jalhyd_branch b/jalhyd_branch
index ce57f6456..626e97d71 100644
--- a/jalhyd_branch
+++ b/jalhyd_branch
@@ -1 +1 @@
-develop
\ No newline at end of file
+devel
\ No newline at end of file
-- 
GitLab