Merge branch 'release/2.4.x' into release/2.5.x

# Conflicts:
#	Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/CovidCertificateDetailsFragment.kt

Corona-Warn-App/src/main/java/de/rki/coronawarnapp/covidcertificate/test/ui/details/CovidCertificateDetailsFragment.kt

@@ -18,8 +18,9 @@ import de.rki.coronawarnapp.ui.qrcode.fullscreen.QrCodeFullScreenFragmentArgs
 import de.rki.coronawarnapp.ui.view.onOffsetChange
 import de.rki.coronawarnapp.util.DialogHelper
 import de.rki.coronawarnapp.util.TimeAndDateExtensions.toDateOfBirthFormat
-import de.rki.coronawarnapp.util.TimeAndDateExtensions.toShortDayFormat
+import de.rki.coronawarnapp.util.TimeAndDateExtensions.toDayFormat
 import de.rki.coronawarnapp.util.TimeAndDateExtensions.toShortTimeFormat
+import de.rki.coronawarnapp.util.TimeAndDateExtensions.toUserTimeZone
 import de.rki.coronawarnapp.util.di.AutoInject
 import de.rki.coronawarnapp.util.ui.popBackStack
 import de.rki.coronawarnapp.util.ui.viewBinding
@@ -60,6 +61,8 @@ class CovidCertificateDetailsFragment : Fragment(R.layout.fragment_covid_certifi
     private fun FragmentCovidCertificateDetailsBinding.onCertificateReady(
         testCertificate: TestCertificate
     ) {
+        val testDateTime = testCertificate.sampleCollectedAt.toUserTimeZone()
+
         name.text = testCertificate.run { "$lastName, $firstName" }
         birthDate.text = testCertificate.dateOfBirth.toDateOfBirthFormat()
         diseaseType.text = testCertificate.targetName
@@ -67,8 +70,8 @@ class CovidCertificateDetailsFragment : Fragment(R.layout.fragment_covid_certifi
         testName.text = testCertificate.testName
         testManufacturer.text = testCertificate.testNameAndManufacturer
         testDate.text = "%s %s".format(
-            testCertificate.sampleCollectedAt.toShortDayFormat(),
-            testCertificate.sampleCollectedAt.toShortTimeFormat()
+            testDateTime.toDayFormat(),
+            testDateTime.toShortTimeFormat()
         )
         testResult.text = testCertificate.testResult
         testCenter.text = testCertificate.testCenter

Corona-Warn-App/src/main/res/values-bg/green_certificate_strings.xml

@@ -21,10 +21,10 @@
     <string name="request_gc_dialog_title">"Отмяна на регистрация"</string>
     <!-- XTXT: Request green certificate exit dialog message -->
     <string name="request_gc_dialog_message">"Ако отмените регистрацията на теста, няма да може да получите резултата от него в приложението."</string>
+    <!-- XBUT: Request green certificate exit dialog positive button -->
+    <string name="request_gc_dialog_positive_button">"Отказвам се от регистрацията"</string>
     <!-- XBUT: Request green certificate exit dialog negative button -->
-    <string name="request_gc_dialog_positive_button">"ОК"</string>
-    <!-- XBUT: Request green certificate exit dialog negative button -->
-    <string name="request_gc_dialog_negative_button">"Отказ"</string>
+    <string name="request_gc_dialog_negative_button">"Продължавам с регистрацията"</string>
     <!-- XTXT: Detail green certificate title -->
     <string name="detail_green_certificate_title">"Цифров COVID сертификат на ЕС за тестване"</string>
     <!-- XTXT: Detail green certificate test type -->
@@ -99,4 +99,8 @@
     <string name="test_certificate_error_label_refreshing">"Вашият сертификат се създава..."</string>
     <!-- XTXT: Test error card body refreshing -->
     <string name="test_certificate_error_refreshing_status">"Вашият сертификат се заявява. Това може да отнеме няколко минути..."</string>
+    <!-- XBUT: Text for invalid test certificate error button, linking to FAQ-->
+    <string name="test_certificate_error_invalid_labid_faq">"ЧЗВ за сертификати за извършен тест"</string>
+    <!-- XTXT: Explains user about test certificate: URL, has to be "translated" into english (relevant for all languages except german) - https://www.coronawarn.app/en/faq/#vac_cert_invalid -->
+    <string name="test_certificate_error_invalid_labid_faq_link">"https://www.coronawarn.app/en/faq/#test_cert"</string>
 </resources>
\ No newline at end of file

Corona-Warn-App/src/main/res/values-en/green_certificate_strings.xml

@@ -21,10 +21,10 @@
     <string name="request_gc_dialog_title">"Cancel Registration"</string>
     <!-- XTXT: Request green certificate exit dialog message -->
     <string name="request_gc_dialog_message">"If you cancel the test registration, you cannot receive your test result in the app."</string>
+    <!-- XBUT: Request green certificate exit dialog positive button -->
+    <string name="request_gc_dialog_positive_button">"Cancel Registration"</string>
     <!-- XBUT: Request green certificate exit dialog negative button -->
-    <string name="request_gc_dialog_positive_button">"OK"</string>
-    <!-- XBUT: Request green certificate exit dialog negative button -->
-    <string name="request_gc_dialog_negative_button">"Cancel"</string>
+    <string name="request_gc_dialog_negative_button">"Continue Registration"</string>
     <!-- XTXT: Detail green certificate title -->
     <string name="detail_green_certificate_title">"EU Digital COVID Test Certificate"</string>
     <!-- XTXT: Detail green certificate test type -->
@@ -99,4 +99,8 @@
     <string name="test_certificate_error_label_refreshing">"Your certificate is being created..."</string>
     <!-- XTXT: Test error card body refreshing -->
     <string name="test_certificate_error_refreshing_status">"Your certificate is being requested. This may take a few minutes..."</string>
+    <!-- XBUT: Text for invalid test certificate error button, linking to FAQ-->
+    <string name="test_certificate_error_invalid_labid_faq">"FAQ for Test Certificates"</string>
+    <!-- XTXT: Explains user about test certificate: URL, has to be "translated" into english (relevant for all languages except german) - https://www.coronawarn.app/en/faq/#vac_cert_invalid -->
+    <string name="test_certificate_error_invalid_labid_faq_link">"https://www.coronawarn.app/en/faq/#test_cert"</string>
 </resources>
\ No newline at end of file

Corona-Warn-App/src/main/res/values-pl/green_certificate_strings.xml

@@ -21,10 +21,10 @@
     <string name="request_gc_dialog_title">"Anuluj rejestrację"</string>
     <!-- XTXT: Request green certificate exit dialog message -->
     <string name="request_gc_dialog_message">"Anulowanie rejestracji testu uniemożliwi otrzymanie wyniku testu w aplikacji."</string>
+    <!-- XBUT: Request green certificate exit dialog positive button -->
+    <string name="request_gc_dialog_positive_button">"Anuluj rejestrację"</string>
     <!-- XBUT: Request green certificate exit dialog negative button -->
-    <string name="request_gc_dialog_positive_button">"OK"</string>
-    <!-- XBUT: Request green certificate exit dialog negative button -->
-    <string name="request_gc_dialog_negative_button">"Anuluj"</string>
+    <string name="request_gc_dialog_negative_button">"Kontynuuj rejestrację"</string>
     <!-- XTXT: Detail green certificate title -->
     <string name="detail_green_certificate_title">"Unijny cyfrowy certyfikat testu na COVID"</string>
     <!-- XTXT: Detail green certificate test type -->
@@ -99,4 +99,8 @@
     <string name="test_certificate_error_label_refreshing">"Certyfikat jest tworzony..."</string>
     <!-- XTXT: Test error card body refreshing -->
     <string name="test_certificate_error_refreshing_status">"Żądanie dotyczące certyfikatu jest przetwarzane. Może to potrwać kilka minut..."</string>
+    <!-- XBUT: Text for invalid test certificate error button, linking to FAQ-->
+    <string name="test_certificate_error_invalid_labid_faq">"Często zadawane pytania na temat certyfikatów testów"</string>
+    <!-- XTXT: Explains user about test certificate: URL, has to be "translated" into english (relevant for all languages except german) - https://www.coronawarn.app/en/faq/#vac_cert_invalid -->
+    <string name="test_certificate_error_invalid_labid_faq_link">"https://www.coronawarn.app/en/faq/#test_cert"</string>
 </resources>
\ No newline at end of file

Corona-Warn-App/src/main/res/values-ro/green_certificate_strings.xml

@@ -21,10 +21,10 @@
     <string name="request_gc_dialog_title">"Anulare înregistrare"</string>
     <!-- XTXT: Request green certificate exit dialog message -->
     <string name="request_gc_dialog_message">"Dacă anulați înregistrarea testului, nu puteți primi rezultatul testului dvs. în aplicație."</string>
+    <!-- XBUT: Request green certificate exit dialog positive button -->
+    <string name="request_gc_dialog_positive_button">"Anulare înregistrare"</string>
     <!-- XBUT: Request green certificate exit dialog negative button -->
-    <string name="request_gc_dialog_positive_button">"OK"</string>
-    <!-- XBUT: Request green certificate exit dialog negative button -->
-    <string name="request_gc_dialog_negative_button">"Anulare"</string>
+    <string name="request_gc_dialog_negative_button">"Continuare înregistrare"</string>
     <!-- XTXT: Detail green certificate title -->
     <string name="detail_green_certificate_title">"Certificat de test COVID digital UE"</string>
     <!-- XTXT: Detail green certificate test type -->
@@ -99,4 +99,8 @@
     <string name="test_certificate_error_label_refreshing">"Certificatul dvs. este în curs de creare..."</string>
     <!-- XTXT: Test error card body refreshing -->
     <string name="test_certificate_error_refreshing_status">"Certificatul dvs. este în curs de solicitare. Acest lucru poate dura câteva minute..."</string>
+    <!-- XBUT: Text for invalid test certificate error button, linking to FAQ-->
+    <string name="test_certificate_error_invalid_labid_faq">"Întrebări frecvente privind certificatele de test"</string>
+    <!-- XTXT: Explains user about test certificate: URL, has to be "translated" into english (relevant for all languages except german) - https://www.coronawarn.app/en/faq/#vac_cert_invalid -->
+    <string name="test_certificate_error_invalid_labid_faq_link">"https://www.coronawarn.app/en/faq/#test_cert"</string>
 </resources>
\ No newline at end of file

Corona-Warn-App/src/main/res/values-tr/green_certificate_strings.xml

@@ -21,10 +21,10 @@
     <string name="request_gc_dialog_title">"Kaydı İptal Et"</string>
     <!-- XTXT: Request green certificate exit dialog message -->
     <string name="request_gc_dialog_message">"Test kaydını iptal ederseniz test sonucunuzu uygulamaya alamazsınız."</string>
+    <!-- XBUT: Request green certificate exit dialog positive button -->
+    <string name="request_gc_dialog_positive_button">"Kaydı İptal Et"</string>
     <!-- XBUT: Request green certificate exit dialog negative button -->
-    <string name="request_gc_dialog_positive_button">"Tamam"</string>
-    <!-- XBUT: Request green certificate exit dialog negative button -->
-    <string name="request_gc_dialog_negative_button">"İptal Et"</string>
+    <string name="request_gc_dialog_negative_button">"Kayda Devam Et"</string>
     <!-- XTXT: Detail green certificate title -->
     <string name="detail_green_certificate_title">"AB Dijital COVID Test Sertifikası"</string>
     <!-- XTXT: Detail green certificate test type -->
@@ -99,4 +99,8 @@
     <string name="test_certificate_error_label_refreshing">"Sertifikanız oluşturuluyor..."</string>
     <!-- XTXT: Test error card body refreshing -->
     <string name="test_certificate_error_refreshing_status">"Sertifikanız talep ediliyor. Bu işlem birkaç dakika sürebilir..."</string>
+    <!-- XBUT: Text for invalid test certificate error button, linking to FAQ-->
+    <string name="test_certificate_error_invalid_labid_faq">"Test Sertifikaları için SSS"</string>
+    <!-- XTXT: Explains user about test certificate: URL, has to be "translated" into english (relevant for all languages except german) - https://www.coronawarn.app/en/faq/#vac_cert_invalid -->
+    <string name="test_certificate_error_invalid_labid_faq_link">"https://www.coronawarn.app/en/faq/#test_cert"</string>
 </resources>
\ No newline at end of file

Corona-Warn-App/src/main/res/values/green_certificate_strings.xml

@@ -22,10 +22,10 @@
     <string name="request_gc_dialog_title">"Cancel Registration"</string>
     <!-- XTXT: Request green certificate exit dialog message -->
     <string name="request_gc_dialog_message">"If you cancel the test registration, you cannot receive your test result in the app."</string>
+    <!-- XBUT: Request green certificate exit dialog positive button -->
+    <string name="request_gc_dialog_positive_button">"Cancel Registration"</string>
     <!-- XBUT: Request green certificate exit dialog negative button -->
-    <string name="request_gc_dialog_positive_button">"OK"</string>
-    <!-- XBUT: Request green certificate exit dialog negative button -->
-    <string name="request_gc_dialog_negative_button">"Cancel"</string>
+    <string name="request_gc_dialog_negative_button">"Continue Registration"</string>
     <!-- XTXT: Detail green certificate title -->
     <string name="detail_green_certificate_title">"EU Digital COVID Test Certificate"</string>
     <!-- XTXT: Detail green certificate test type -->
@@ -101,7 +101,7 @@
     <!-- XTXT: Test error card body refreshing -->
     <string name="test_certificate_error_refreshing_status">"Your certificate is being requested. This may take a few minutes..."</string>
     <!-- XBUT: Text for invalid test certificate error button, linking to FAQ-->
-    <string name="test_certificate_error_invalid_labid_faq"></string>
+    <string name="test_certificate_error_invalid_labid_faq">"FAQ for Test Certificates"</string>
     <!-- XTXT: Explains user about test certificate: URL, has to be "translated" into english (relevant for all languages except german) - https://www.coronawarn.app/en/faq/#vac_cert_invalid -->
-    <string name="test_certificate_error_invalid_labid_faq_link"></string>
+    <string name="test_certificate_error_invalid_labid_faq_link">"https://www.coronawarn.app/en/faq/#test_cert"</string>
 </resources>
\ No newline at end of file