Merge pull request #1018 from cocoa-mhlw/feature/fix-qa-read-text

Fixed "Q&A" read text
cocoa-mhlw · May 24, 2022 · 8d50813 · 8d50813
2 parents 17dddb5 + 6054942
commit 8d50813
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 5 deletions.
diff --git a/Covid19Radar/Covid19Radar/Model/MainMenuModel.cs b/Covid19Radar/Covid19Radar/Model/MainMenuModel.cs
@@ -41,7 +41,7 @@ public string TextColor
  get => textColor;
  }
 
- public string ReadText => $"{Title} {AppResources.Button}";
+ public string ReadText { get; set; }
 
  protected virtual void OnPropertyChanged(string propertyName)
  {

diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs b/Covid19Radar/Covid19Radar/Resources/AppResources.Designer.cs
diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx
@@ -147,6 +147,10 @@
  <value>Q&amp;A</value>
  <comment>Q&amp;A</comment>
  </data>
+ <data name="HelpMenuPageMenuReadText" xml:space="preserve">
+ <value>きゅーあんどえー</value>
+ <comment>Q&amp;A</comment>
+ </data>
  <data name="HelpPage1Title" xml:space="preserve">
  <value>接触の記録方法</value>
  <comment>接触の記録方法</comment>

diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.resx
@@ -276,6 +276,10 @@
  <value>Q&amp;A</value>
  <comment>Q&amp;A</comment>
  </data>
+ <data name="HelpMenuPageMenuReadText" xml:space="preserve">
+ <value>Q&amp;A</value>
+ <comment>Q&amp;A</comment>
+ </data>
  <data name="HelpMenuPageLabel1" xml:space="preserve">
  <value>What is a 'close contact'?</value>
  <comment>どのようにして接触を記録していますか？</comment>

diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx
@@ -156,6 +156,10 @@
  <value>Q&amp;A</value>
  <comment>Q&amp;A</comment>
  </data>
+ <data name="HelpMenuPageMenuReadText" xml:space="preserve">
+ <value>Q&amp;A</value>
+ <comment>Q&amp;A</comment>
+ </data>
  <data name="HelpPage1Title" xml:space="preserve">
  <value>接触的记录方法</value>
  <comment>接触の記録方法</comment>

diff --git a/Covid19Radar/Covid19Radar/ViewModels/MenuPageViewModel.cs b/Covid19Radar/Covid19Radar/ViewModels/MenuPageViewModel.cs
@@ -39,7 +39,8 @@ public MenuPageViewModel(INavigationService navigationService) : base(navigation
  PageName = nameof(HomePage),
  Title = Resources.AppResources.HomePageTitle,
  IconColor = MenuIconColorDefault,
- TextColor = MenuTextColorDefault
+ TextColor = MenuTextColorDefault,
+ ReadText = $"{Resources.AppResources.HomePageTitle} {Resources.AppResources.Button}"
  });
 
  MenuItems.Add(new MainMenuModel()
@@ -48,7 +49,8 @@ public MenuPageViewModel(INavigationService navigationService) : base(navigation
  PageName = nameof(SettingsPage),
  Title = Resources.AppResources.SettingsPageTitle,
  IconColor = MenuIconColorDefault,
- TextColor = MenuTextColorDefault
+ TextColor = MenuTextColorDefault,
+ ReadText = $"{Resources.AppResources.SettingsPageTitle} {Resources.AppResources.Button}"
  });
 
  MenuItems.Add(new MainMenuModel()
@@ -57,15 +59,17 @@ public MenuPageViewModel(INavigationService navigationService) : base(navigation
  PageName = nameof(InqueryPage),
  Title = Resources.AppResources.InqueryPageTitle_Menu,
  IconColor = MenuIconColorDefault,
- TextColor = MenuTextColorDefault
+ TextColor = MenuTextColorDefault,
+ ReadText = $"{Resources.AppResources.InqueryPageTitle_Menu} {Resources.AppResources.Button}"
  });
  MenuItems.Add(new MainMenuModel()
  {
  Icon = "\uf0eb",
  PageName = nameof(HelpMenuPage),
  Title = Resources.AppResources.HelpMenuPageMenu,
  IconColor = MenuIconColorDefault,
- TextColor = MenuTextColorDefault
+ TextColor = MenuTextColorDefault,
+ ReadText = $"{Resources.AppResources.HelpMenuPageMenuReadText} {Resources.AppResources.Button}"
  });
 #if DEBUG
  MenuItems.Add(new MainMenuModel()