Date time add

space-sunrise · Jun 8, 2024 · 5ee5426 · 5ee5426
1 parent 9d02db2
commit 5ee5426
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/Content.Client/PDA/PdaMenu.xaml.cs b/Content.Client/PDA/PdaMenu.xaml.cs
@@ -121,7 +121,7 @@ public PdaMenu()
             StationTimeButton.OnPressed += _ =>
             {
                 var stationTime = _gameTiming.CurTime.Subtract(_gameTicker.RoundStartTimeSpan);
-                _clipboard.SetText((stationTime.ToString("hh\\:mm\\:ss")));
+                _clipboard.SetText((stationTime.ToString("hh\\:mm\\:ss")) + " " + (DateTime.UtcNow.AddYears(1000).ToString("dd.MM.yyyy")));
             };
 
             StationAlertLevelInstructionsButton.OnPressed += _ =>
@@ -174,7 +174,8 @@ public void UpdateState(PdaUpdateState state)
             var stationTime = _gameTiming.CurTime.Subtract(_gameTicker.RoundStartTimeSpan);
 
             StationTimeLabel.SetMarkup(Loc.GetString("comp-pda-ui-station-time",
-                ("time", stationTime.ToString("hh\\:mm\\:ss"))));
+                ("time", stationTime.ToString("hh\\:mm\\:ss")),
+				 ("date", DateTime.UtcNow.AddYears(1000).ToString("dd.MM.yyyy"))));
 
             // Sunrise-start
             var remaining = TimeSpan.Zero;
@@ -377,7 +378,8 @@ protected override void Draw(DrawingHandleScreen handle)
             var stationTime = _gameTiming.CurTime.Subtract(_gameTicker.RoundStartTimeSpan);
 
             StationTimeLabel.SetMarkup(Loc.GetString("comp-pda-ui-station-time",
-                ("time", stationTime.ToString("hh\\:mm\\:ss"))));
+                ("time", stationTime.ToString("hh\\:mm\\:ss")),
+				("date", DateTime.UtcNow.AddYears(1000).ToString("dd.MM.yyyy"))));
 
             // Sunrise-start
             var remaining = TimeSpan.Zero;

diff --git a/Resources/Locale/en-US/pda/pda-component.ftl b/Resources/Locale/en-US/pda/pda-component.ftl
@@ -32,7 +32,7 @@ comp-pda-ui-station-alert-level = Alert Level: [color={ $color }]{ $level }[/col
 
 comp-pda-ui-station-alert-level-instructions = Instructions: [color=white]{ $instructions }[/color]
 
-comp-pda-ui-station-time = Shift duration: [color=white]{ $time }[/color]
+comp-pda-ui-station-time = The current time since the start of the shift: [color=white]{ $time } { $date }[/color]
 
 comp-pda-ui-eject-id-button = Eject ID
 

diff --git a/Resources/Locale/ru-RU/pda/pda-component.ftl b/Resources/Locale/ru-RU/pda/pda-component.ftl
@@ -17,7 +17,7 @@ comp-pda-ui-footer = Карманный Персональный Компьют
 comp-pda-ui-station = Станция: [color=white]{ $station }[/color]
 comp-pda-ui-station-alert-level = Уровень угрозы: [color={ $color }]{ $level }[/color]
 comp-pda-ui-station-alert-level-instructions = Инструкции: [color=white]{ $instructions }[/color]
-comp-pda-ui-station-time = Продолжительность смены: [color=white]{ $time }[/color]
+comp-pda-ui-station-time = Текущее время с начала смены: [color=white]{ $time } { $date }[/color]
 comp-pda-ui-eject-id-button = Извлечь ID
 comp-pda-ui-eject-pen-button = Извлечь ручку
 comp-pda-ui-ringtone-button-description = Измените рингтон вашего КПК