From c04374928a0d54052a38a0f3fb217833562dd31d Mon Sep 17 00:00:00 2001
From: HWFord <54360213+HWFord@users.noreply.github.com>
Date: Mon, 17 Nov 2025 10:00:53 +0100
Subject: [PATCH] issue #2439 update popin

Add translations
remove last major update conf when in piwigo Upgrade
don't send popin template if not needed
---
 admin.php                                |  3 ++-
 admin/themes/default/template/footer.tpl |  8 +++++---
 include/common.inc.php                   |  1 +
 language/en_UK/whats_new_16.lang.php     | 11 +++++++++++
 language/fr_FR/whats_new_16.lang.php     | 11 +++++++++++
 upgrade.php                              |  3 +++
 6 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 language/en_UK/whats_new_16.lang.php
 create mode 100644 language/fr_FR/whats_new_16.lang.php

diff --git a/admin.php b/admin.php
index 2f04c3cc8..afa343086 100644
--- a/admin.php
+++ b/admin.php
@@ -382,6 +382,7 @@ $whats_new_imgs = array(
   // '4' =>'https://ressources.piwigo.com/uploads/c/v/7/cv7jpz6hf8//2024/11/07/20241107171642-1109101f.png',
 );
 
+//If last major update conf is less than a month old then display bell for whats new popin
 $display_bell = false;
 if (strtotime($conf['last_major_update']) > strtotime('1 month ago'))
 {
@@ -394,7 +395,7 @@ $template->assign(
   'WHATS_NEW_MAJOR_VERSION' => $whats_new_major_version,
   'RELEASE_NOTE_URL' => $release_note_url,
   'WHATS_NEW_IMGS' => $whats_new_imgs,
-  'DISPLAY_BELL' => false, // $display_bell,
+  'DISPLAY_BELL' => $display_bell,
   )
 );
 
diff --git a/admin/themes/default/template/footer.tpl b/admin/themes/default/template/footer.tpl
index 1c244f372..6ca6461b0 100644
--- a/admin/themes/default/template/footer.tpl
+++ b/admin/themes/default/template/footer.tpl
@@ -37,6 +37,7 @@
 </div>{* <!-- footer --> *}
 </div>{* <!-- the_page --> *}
 
+{if (isset($SHOW_WHATS_NEW) and $SHOW_WHATS_NEW) or (isset($DISPLAY_BELL) and $DISPLAY_BELL)}
 <div id="whats_new">
     <div id="whats_new_popin">
       <a class="icon-cancel close_whats_new" onClick="hide_user_whats_new()"></a>
@@ -44,17 +45,17 @@
       <div>
         <div class="whats_new_block_container">
           <div class="whats_new_block icon-blue whats_new_block_w_60">
-            <h4>Brand new login & preferences with Standard pages !</h4>
+            <h4>{'Brand new login & preferences with Standard pages !'|translate}</h4>
             <a href="{$RELEASE_NOTE_URL}" target="_blank"><img src="{$WHATS_NEW_IMGS.1}"></a>
           </div>
           <div class="whats_new_block icon-purple whats_new_block_w_40">
-            <h4>Two factor authentication is here</h4>
+            <h4>{'Two factor authentication is here'|translate}</h4>
             <a href="{$RELEASE_NOTE_URL}" target="_blank"><img src="{$WHATS_NEW_IMGS.2}"></a>
           </div>
         </div>
         <div class="whats_new_block_container">
           <div class="whats_new_block icon-green whats_new_block_w_100">
-            <h4>UI redesigns that make a difference</h4>
+            <h4>{'UI redesigns that make a difference'|translate}</h4>
             <a href="{$RELEASE_NOTE_URL}" target="_blank"><img src="{$WHATS_NEW_IMGS.3}"></a>
           </div>
           {* <div class="whats_new_block icon-yellow">
@@ -69,6 +70,7 @@
       </div>
     </div>
 </div>
+{/if}
 
 <style>
 
diff --git a/include/common.inc.php b/include/common.inc.php
index d9b6f2420..78ae39dcd 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -168,6 +168,7 @@ elseif ($conf['piwigo_installed_version'] != PHPWG_VERSION)
   conf_update_param('piwigo_installed_version', PHPWG_VERSION);
 }
 
+//Check if last major update conf is set if not set it
 if (!isset($conf['last_major_update']))
 {
   list($dbnow) = pwg_db_fetch_row(pwg_query('SELECT NOW();'));
diff --git a/language/en_UK/whats_new_16.lang.php b/language/en_UK/whats_new_16.lang.php
new file mode 100644
index 000000000..4cf78d774
--- /dev/null
+++ b/language/en_UK/whats_new_16.lang.php
@@ -0,0 +1,11 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | This file is part of Piwigo.                                          |
+// |                                                                       |
+// | For copyright and license information, please view the COPYING.txt    |
+// | file that was distributed with this source code.                      |
+// +-----------------------------------------------------------------------+
+
+$lang['Brand new login & preferences with Standard pages !'] = 'Brand new login & preferences with Standard pages !';
+$lang['Two factor authentication is here'] = 'Two factor authentication is here';
+$lang['UI redesigns that make a difference'] = 'UI redesigns that make a difference';
diff --git a/language/fr_FR/whats_new_16.lang.php b/language/fr_FR/whats_new_16.lang.php
new file mode 100644
index 000000000..02fdc58e1
--- /dev/null
+++ b/language/fr_FR/whats_new_16.lang.php
@@ -0,0 +1,11 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | This file is part of Piwigo.                                          |
+// |                                                                       |
+// | For copyright and license information, please view the COPYING.txt    |
+// | file that was distributed with this source code.                      |
+// +-----------------------------------------------------------------------+
+
+$lang['Brand new login & preferences with Standard pages !'] = 'Nouvelle connexion et préférences avec les pages standard !';
+$lang['Two factor authentication is here'] = 'L\'authentification à deux facteurs est disponible ici';
+$lang['UI redesigns that make a difference'] = 'Des refontes d\'interface utilisateur qui font la différence';
diff --git a/upgrade.php b/upgrade.php
index 93e191682..0878d2984 100644
--- a/upgrade.php
+++ b/upgrade.php
@@ -415,6 +415,9 @@ if ((isset($_POST['submit']) or isset($_GET['now']))
     include($upgrade_file);
     conf_update_param('piwigo_db_version', get_branch_from_version(PHPWG_VERSION));
 
+    //Conf delete param on last major update for whats new popin to be displayed when changing major version
+    conf_delete_param('last_major_update');
+
     // Something to add in database.inc.php?
     if (!empty($mysql_changes))
     {