[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] Empty timezone string in warning message on login

Benoit Grégoire pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
4e8fec4c by Alain Cisirika at 2025-09-18T16:31:38+00:00
[FIX] Empty timezone string in warning message on login
---
* [FIX] trunk: Empty timezone string in warning message on login

See merge request tikiwiki/tiki!8515

- - - - -


1 changed file:

- templates/user/localtimezonesync.tpl


Changes:

=====================================
templates/user/localtimezonesync.tpl
=====================================
@@ -1,10 +1,13 @@
 <div id="timezone-sync-box" style="display: none;">
-    {remarksbox  close="" title="{tr}Timezone Synchronisation{/tr}"}
+    {remarksbox  close="" title="{tr}Timezone Synchronization{/tr}"}
         <div class="d-flex justify-content-between">
             <form method="post" id="timezone-form" action="{service controller=user action=localtimezonesync}">
                 {ticket}
-                <p>
-                    {tr _0='<strong><span class="detected-tz-name"></span></strong>' _1='<strong><span class="current-tz-name"></span></strong>'}New Timezone Detected We detect a new timezone %0, but your configured timezone is set to %1.{/tr}
+                <p id="tz_message_configured" style="display: none;">
+                    {tr _0='<strong><span class="detected-tz-name"></span></strong>' _1='<strong><span class="current-tz-name"></span></strong>'}The detected timezone is %0, but your configured timezone is set to %1.{/tr}
+                </p>
+                <p id="tz_message_unconfigured" style="display: none;">
+                    {tr _0='<strong><span class="detected-tz-name"></span></strong>'}The detected timezone is %0, and you have not configured a preferred timezone yet.{/tr}
                 </p>
                 <p class="mb-3">{tr}What would you like to do?{/tr}</p>
                 <input type="hidden" name="client_timezone" id="client-timezone" value=""/>
@@ -48,6 +51,11 @@
                 $('#client-timezone').val(response.clientTimezone);
                 $('.detected-tz-name').text(response.clientTimezone);
                 $('.current-tz-name').text(response.preferedTimezone);
+                if (response.preferedTimezone) {
+                    $('#tz_message_configured').show();
+                } else {
+                    $('#tz_message_unconfigured').show();
+                }
             }
         }, 'json');
     });



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/4e8fec4cc0de9cd4f6473f42c32d846c504989ef

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/4e8fec4cc0de9cd4f6473f42c32d846c504989ef
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs