diff --git a/Covid19Radar/Covid19Radar/Common/Utils.cs b/Covid19Radar/Covid19Radar/Common/Utils.cs index 3eb3040b1..1b16ed690 100644 --- a/Covid19Radar/Covid19Radar/Common/Utils.cs +++ b/Covid19Radar/Covid19Radar/Common/Utils.cs @@ -27,6 +27,11 @@ public static DateTime[] JstDateTimes(int days) return dateTimes; } + public static bool IsCurrentUICultureJaJp() + { + return "ja-JP".Equals(System.Globalization.CultureInfo.CurrentUICulture.Name); + } + #endregion } diff --git a/Covid19Radar/Covid19Radar/ViewModels/EndOfService/EndOfServiceNoticePageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/EndOfService/EndOfServiceNoticePageViewModel.cs index 6c69bd683..0b76bb51f 100644 --- a/Covid19Radar/Covid19Radar/ViewModels/EndOfService/EndOfServiceNoticePageViewModel.cs +++ b/Covid19Radar/Covid19Radar/ViewModels/EndOfService/EndOfServiceNoticePageViewModel.cs @@ -17,7 +17,7 @@ public class EndOfServiceNoticePageViewModel : ViewModelBase private readonly ILoggerService _loggerService; - private readonly long FullStopDateTime = TimeZoneInfo.ConvertTime(new DateTime(2023, 4, 1, 0, 0, 0), AppConstants.TIMEZONE_JST).ToUnixEpoch(); + private readonly long FullStopDateTime = TimeZoneInfo.ConvertTime(new DateTime(2022, 12, 31, 0, 0, 0), AppConstants.TIMEZONE_JST).ToUnixEpoch(); public EndOfServiceNoticePageViewModel( INavigationService navigationService, @@ -31,7 +31,7 @@ ILoggerService loggerService { _loggerService.StartMethod(); - if (FullStopDateTime <= Utils.JstNow().ToUnixEpoch()) + if (Utils.JstNow().ToUnixEpoch() <= FullStopDateTime && Utils.IsCurrentUICultureJaJp()) { await NavigationService.NavigateAsync(nameof(SurveyRequestPage)); }