Merge pull request #282 from cocoa-mhlw/release_1_2_5

Release v1.2.5
cocoa-mhlw · Jul 15, 2021 · 2f62fcc · 2f62fcc
2 parents 730d8ea + 9cebac9
commit 2f62fcc
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 12 deletions.
diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.en.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.en.resx
@@ -941,7 +941,7 @@ Storage :</value>
  </data>
  <data name="HowToReceiveProcessingNumberPageDescription1" xml:space="preserve">
  <value>If you are contacted by a health center, please say that you would like to register positive test result using the Contact Confirmation Application.</value>
- <comment>保健所から連絡がありましたら「接触確認アプリでの陽性登録を希望」とお伝え下さい。</comment>
+ <comment>保健所から連絡がありましたら「接触確認アプリでの陽性登録を希望」とお伝えください。</comment>
  </data>
  <data name="HowToReceiveProcessingNumberPageDescription2" xml:space="preserve">
  <value>After that, you will receive an 8-digit processing number via SMS or email.</value>

diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.ja.resx
@@ -940,8 +940,8 @@
  <comment>処理番号の取得方法</comment>
  </data>
  <data name="HowToReceiveProcessingNumberPageDescription1" xml:space="preserve">
- <value>保健所から連絡がありましたら「接触確認アプリでの陽性登録を希望」とお伝え下さい。</value>
- <comment>保健所から連絡がありましたら「接触確認アプリでの陽性登録を希望」とお伝え下さい。</comment>
+ <value>保健所から連絡がありましたら「接触確認アプリでの陽性登録を希望」とお伝えください。</value>
+ <comment>保健所から連絡がありましたら「接触確認アプリでの陽性登録を希望」とお伝えください。</comment>
  </data>
  <data name="HowToReceiveProcessingNumberPageDescription2" xml:space="preserve">
  <value>SMSまたはメールにて8桁の処理番号が送られてきます。</value>

diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.resx
@@ -1046,7 +1046,7 @@ Storage :</value>
  </data>
  <data name="HowToReceiveProcessingNumberPageDescription1" xml:space="preserve">
  <value>If you are contacted by a health center, please say that you would like to register positive test result using the Contact Confirmation Application.</value>
- <comment>保健所から連絡がありましたら「接触確認アプリでの陽性登録を希望」とお伝え下さい。</comment>
+ <comment>保健所から連絡がありましたら「接触確認アプリでの陽性登録を希望」とお伝えください。</comment>
  </data>
  <data name="HowToReceiveProcessingNumberPageDescription2" xml:space="preserve">
  <value>After that, you will receive an 8-digit processing number via SMS or email.</value>

diff --git a/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx b/Covid19Radar/Covid19Radar/Resources/AppResources.zh-Hans.resx
@@ -943,7 +943,7 @@
  </data>
  <data name="HowToReceiveProcessingNumberPageDescription1" xml:space="preserve">
  <value>如果保健中心与您联系，请说明您想使用接触确认应用登记阳性检测结果。</value>
- <comment>保健所から連絡がありましたら「接触確認アプリでの陽性登録を希望」とお伝え下さい。</comment>
+ <comment>保健所から連絡がありましたら「接触確認アプリでの陽性登録を希望」とお伝えください。</comment>
  </data>
  <data name="HowToReceiveProcessingNumberPageDescription2" xml:space="preserve">
  <value>您将通过短信或电子邮件收到一个8位数的处理号码。</value>

diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/HowToReceiveProcessingNumberPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/HowToReceiveProcessingNumberPage.xaml
@@ -60,8 +60,12 @@
  </Grid>
  <Label
  AutomationProperties.IsInAccessibleTree="True"
- AutomationProperties.Name="{x:Static resources:AppResources.HowToReceiveProcessingNumberPageDescription3}"
  Style="{StaticResource DefaultLabel}">
+ <AutomationProperties.Name>
+ <OnPlatform x:TypeArguments="x:String">
+ <On Platform="iOS" Value="{x:Static resources:AppResources.HowToReceiveProcessingNumberPageDescription3}" />
+ </OnPlatform>
+ </AutomationProperties.Name>
  <Label.FormattedText>
  <FormattedString>
  <Span Text="{x:Static resources:AppResources.NoteSymbol}" />
@@ -71,8 +75,12 @@
  </Label>
  <Label
  AutomationProperties.IsInAccessibleTree="True"
- AutomationProperties.Name="{x:Static resources:AppResources.HowToReceiveProcessingNumberPageDescription4}"
  Style="{StaticResource DefaultLabel}">
+ <AutomationProperties.Name>
+ <OnPlatform x:TypeArguments="x:String">
+ <On Platform="iOS" Value="{x:Static resources:AppResources.HowToReceiveProcessingNumberPageDescription4}" />
+ </OnPlatform>
+ </AutomationProperties.Name>
  <Label.FormattedText>
  <FormattedString>
  <Span Text="{x:Static resources:AppResources.NoteSymbol}" />

diff --git a/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml b/Covid19Radar/Covid19Radar/Views/HomePage/NotifyOtherPage.xaml
@@ -59,7 +59,8 @@
  BackgroundColor="White"
  CornerRadius="5"
  HasShadow="False">
- <controls:CustomDatePicker MaximumDate="{x:Static x:DateTime.Now}"
+ <controls:CustomDatePicker AutomationProperties.IsInAccessibleTree="{Binding IsVisibleWithSymptomsLayout}"
+ MaximumDate="{x:Static x:DateTime.Now}"
  BackgroundColor="White"
  Format="d"
  Date="{Binding DiagnosisDate}"/>
@@ -84,7 +85,8 @@
  BackgroundColor="White"
  CornerRadius="5"
  HasShadow="False">
- <controls:CustomDatePicker MaximumDate="{x:Static x:DateTime.Now}"
+ <controls:CustomDatePicker AutomationProperties.IsInAccessibleTree="{Binding IsVisibleNoSymptomsLayout}"
+ MaximumDate="{x:Static x:DateTime.Now}"
  BackgroundColor="White"
  Format="d"
  Date="{Binding DiagnosisDate}"/>

diff --git a/Covid19Radar/Covid19Radar/Views/Tutorial/TutorialPage4.xaml b/Covid19Radar/Covid19Radar/Views/Tutorial/TutorialPage4.xaml
@@ -55,6 +55,7 @@
  <Button
  AutomationId="EnableButton"
  AutomationProperties.IsInAccessibleTree="True"
+ AutomationProperties.Name="{x:Static resources:AppResources.TutorialPage4Button1}"
  Command="{Binding Path=OnClickEnable}"
  Style="{StaticResource DefaultButton}"
  Text="{x:Static resources:AppResources.TutorialPage4Button1}" />
@@ -63,6 +64,7 @@
  Margin="0,10,0,0"
  AutomationId="DisableButton"
  AutomationProperties.IsInAccessibleTree="True"
+ AutomationProperties.Name="{x:Static resources:AppResources.TutorialPage4Button2}"
  Command="{Binding Path=OnClickDisable}"
  Style="{StaticResource DefaultButtonGrayedOut}"
  Text="{x:Static resources:AppResources.TutorialPage4Button2}" />

diff --git a/src/Covid19Radar.Api/TemporaryExposureKeysApi.cs b/src/Covid19Radar.Api/TemporaryExposureKeysApi.cs
@@ -1,4 +1,4 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
@@ -39,7 +39,6 @@ ILogger<TemporaryExposureKeysApi> logger
  ValidationServerService = validationServerService;
  }
 
- [FunctionName(nameof(TemporaryExposureKeysApi))]
  public async Task<IActionResult> RunAsync(
  [HttpTrigger(AuthorizationLevel.Function, "get", Route = "TemporaryExposureKeys")] HttpRequest req)
  {
@@ -64,7 +63,6 @@ public async Task<IActionResult> RunAsync(
  return new OkObjectResult(result);
  }
 
- [FunctionName(nameof(TemporaryExposureKeysApi) + "WithRegion")]
  public async Task<IActionResult> RunWithRegionAsync(
  [HttpTrigger(AuthorizationLevel.Function, "get", Route = "TemporaryExposureKeys/{region}")] HttpRequest req,
  string region)