From 3d3d9732e6c0c51675f67bf3bdc7a4b548d57105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl?= <78355193+Daniel-H123@users.noreply.github.com> Date: Tue, 14 Nov 2023 09:38:50 +0100 Subject: [PATCH 1/5] Add minutes UTC offset to timestamp --- addons/markers/functions/fnc_onButtonClickConfirm.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/markers/functions/fnc_onButtonClickConfirm.sqf b/addons/markers/functions/fnc_onButtonClickConfirm.sqf index 9968b035bc..4d9338a8b3 100644 --- a/addons/markers/functions/fnc_onButtonClickConfirm.sqf +++ b/addons/markers/functions/fnc_onButtonClickConfirm.sqf @@ -31,7 +31,7 @@ if (cbChecked _aceTimestamp && {ACE_player call FUNC(canTimestamp)}) then { systemTimeUTC params ["", "", "", "_hour", "_min", "_sec"]; _hour = (_hour + round (GVAR(timestampUTCOffset))) % 24; _hour = if (_hour < 0) then { 24 + _hour } else { _hour }; - _hour + _min/60 + _sec/3600 + _hour + (_min + GVAR(timestampUTCMinutesOffset))/60 + _sec/3600 }; default { dayTime From f98c5a5e04d49096fc340180c769aa787317626c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl?= <78355193+Daniel-H123@users.noreply.github.com> Date: Tue, 14 Nov 2023 09:44:42 +0100 Subject: [PATCH 2/5] Add UTC minutes offset setting --- addons/markers/initSettings.sqf | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/addons/markers/initSettings.sqf b/addons/markers/initSettings.sqf index 5d8d11c03a..61ab277966 100644 --- a/addons/markers/initSettings.sqf +++ b/addons/markers/initSettings.sqf @@ -52,6 +52,17 @@ private _categoryName = format ["ACE %1", localize ELSTRING(map,Module_DisplayNa true ] call CBA_fnc_addSetting; +[ + QGVAR(TimestampUTCMinutesOffset), "LIST", + [LSTRING(TimestampUTCMinutesOffset), LSTRING(TimestampUTCMinutesOffsetDescription)], + [_categoryName, LLSTRING(Module_DisplayName)], + [ + [0, 15, 30, 45], + [+00, +15, +30, +45], + 0 + ] +] call CBA_fnc_addSetting; + [ QGVAR(timestampHourFormat), "LIST", [LSTRING(TimestampHourFormat), LSTRING(TimestampHourFormatDescription)], From ee9871a17139056c49ecb31c93972f1600915124 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl?= <78355193+Daniel-H123@users.noreply.github.com> Date: Tue, 14 Nov 2023 09:51:12 +0100 Subject: [PATCH 3/5] Add translation for UTC minute offset setting --- addons/markers/stringtable.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/addons/markers/stringtable.xml b/addons/markers/stringtable.xml index 644c553321..8319ab8e38 100644 --- a/addons/markers/stringtable.xml +++ b/addons/markers/stringtable.xml @@ -303,6 +303,28 @@ Ändere die Zeitverschiebung für den UTC-Zeitstempel 更改UTC时间戳的时间偏移量 UTC 타임 스탬프의 시간 오프셋을 변경하십시오 + + + UTC Minutes Offset + UTC Минутное Смещение + Décalage des minutes UTC + UTC分オフセット + Desplazamiento de minutos UTC + Przesunięcie minut UTC + UTC-Minutenversatz + UTC分钟偏移量 + UTC 분 오프셋 + + + Change the minute offset for the UTC timestamp + Изменить минутное смещение для времени UTC + Modifier le décalage des minutes pour l'horodatage UTC + UTCタイムスタンプの分差を変更する + Cambiar el desplazamiento de minutos para la marca de tiempo UTC + Zmień przesunięcie minut dla sygnatury czasowej UTC + Ändere den Minutenversatz für den UTC-Zeitstempel + 更改UTC时间戳的分钟偏移量 + UTC 타임 스탬프의 분 오프셋을 변경하십시오 Timestamp Format From 256623e3aaca831422c3a8be4394e5e8b63c3385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl?= Date: Tue, 14 Nov 2023 18:50:10 +0100 Subject: [PATCH 4/5] Prevent timestamp going over 24 after adding minutes offset --- addons/markers/functions/fnc_onButtonClickConfirm.sqf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/markers/functions/fnc_onButtonClickConfirm.sqf b/addons/markers/functions/fnc_onButtonClickConfirm.sqf index 4d9338a8b3..9aeb7e04c0 100644 --- a/addons/markers/functions/fnc_onButtonClickConfirm.sqf +++ b/addons/markers/functions/fnc_onButtonClickConfirm.sqf @@ -29,9 +29,10 @@ if (cbChecked _aceTimestamp && {ACE_player call FUNC(canTimestamp)}) then { }; case 2: { systemTimeUTC params ["", "", "", "_hour", "_min", "_sec"]; - _hour = (_hour + round (GVAR(timestampUTCOffset))) % 24; - _hour = if (_hour < 0) then { 24 + _hour } else { _hour }; - _hour + (_min + GVAR(timestampUTCMinutesOffset))/60 + _sec/3600 + _hour = _hour + round (GVAR(timestampUTCOffset)); + _min = _min + GVAR(timestampUTCMinutesOffset); + _time = (_hour + _min/60 + _sec/3600) % 24 + 24; + _time % 24 }; default { dayTime From 991a2fbd8dec712a98b6cc34fc93d410082b8924 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl?= Date: Tue, 14 Nov 2023 18:51:14 +0100 Subject: [PATCH 5/5] Modify english description for offset settings --- addons/markers/stringtable.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/markers/stringtable.xml b/addons/markers/stringtable.xml index 8319ab8e38..20d00cb61e 100644 --- a/addons/markers/stringtable.xml +++ b/addons/markers/stringtable.xml @@ -239,7 +239,7 @@ 시간대 - Change the time zone for the timestamp + Changes the time zone for the timestamp Измените часовой пояс для метки времени Modifiez le fuseau horaire pour l'horodatage タイムスタンプの時間帯を変更します @@ -294,7 +294,7 @@ UTC 오프셋 - Change the time offset for the UTC timestamp + Changes the time offset for the UTC timestamp Измените смещение времени для метки времени UTC Modifier le décalage horaire pour l'horodatage UTC UTCタイムスタンプの時差を変更する