Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Отображение даты в КПК #47

Merged
merged 11 commits into from
Jun 8, 2024
Merged

Отображение даты в КПК #47

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
07448d0
Vulpkanin Lang Fix
Rinary1 Jun 5, 2024
9dd0ca9
Merge branch 'space-sunrise:master' into Vulpkanin
Rinary1 Jun 5, 2024
1557f5d
Merge branch 'space-sunrise:master' into Vulpkanin
Rinary1 Jun 5, 2024
0d7b37e
Merge branch 'space-sunrise:master' into master
Rinary1 Jun 7, 2024
9d02db2
Merge branch 'space-sunrise:master' into master
Rinary1 Jun 7, 2024
5ee5426
Date time add
Rinary1 Jun 8, 2024
c939f60
Time System
Rinary1 Jun 8, 2024
b3d37ac
Merge branch 'space-sunrise:master' into Date-In-Pda
Rinary1 Jun 8, 2024
804d008
Something fixes
Rinary1 Jun 8, 2024
7cb90ea
Merge branch 'Date-In-Pda' of https://github.com/Rinary1/space-sunris…
Rinary1 Jun 8, 2024
746ea75
Merge branch 'space-sunrise:master' into Date-In-Pda
Rinary1 Jun 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions Content.Client/PDA/PdaMenu.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 += _ =>
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/pda/pda-component.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Resources/Locale/ru-RU/pda/pda-component.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = Измените рингтон вашего КПК
Expand Down
Loading