diff --git a/addons/markers/functions/fnc_onButtonClickConfirm.sqf b/addons/markers/functions/fnc_onButtonClickConfirm.sqf index 9968b035bc8..9aeb7e04c07 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/60 + _sec/3600 + _hour = _hour + round (GVAR(timestampUTCOffset)); + _min = _min + GVAR(timestampUTCMinutesOffset); + _time = (_hour + _min/60 + _sec/3600) % 24 + 24; + _time % 24 }; default { dayTime diff --git a/addons/markers/initSettings.sqf b/addons/markers/initSettings.sqf index 5d8d11c03a0..61ab277966f 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)], diff --git a/addons/markers/stringtable.xml b/addons/markers/stringtable.xml index 644c5533212..20d00cb61e9 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タイムスタンプの時差を変更する @@ -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