Merge pull request #1481 from minvws/explo/4.10-part2

align missed consistencies

holder/src/main/java/nl/rijksoverheid/ctr/holder/your_events/utils/TestInfoScreenUtil.kt

@@ -103,19 +103,23 @@ class TestInfoScreenUtilImpl(
             "<br/>",
             createdLine(
                 resources.getString(R.string.your_test_result_explanation_description_test_type),
-                testType
+                testType,
+                isOptional = true
             ),
             createdLine(
                 resources.getString(R.string.your_test_result_explanation_description_test_name),
-                testName
+                testName,
+                isOptional = true
             ),
             createdLine(
                 resources.getString(R.string.your_test_result_explanation_description_test_date),
-                testDate
+                testDate,
+                isOptional = true
             ),
             createdLine(
                 resources.getString(R.string.your_test_result_explanation_description_test_result),
-                resources.getString(R.string.your_test_result_explanation_negative_test_result)
+                resources.getString(R.string.your_test_result_explanation_negative_test_result),
+                isOptional = true
             ),
             createdLine(
                 resources.getString(R.string.your_test_result_explanation_description_test_manufacturer),
@@ -124,7 +128,8 @@ class TestInfoScreenUtilImpl(
             ),
             createdLine(
                 resources.getString(R.string.your_test_result_explanation_description_test_location),
-                testLocation
+                testLocation,
+                isOptional = true
             ),
             createdLine(
                 resources.getString(R.string.holder_event_about_test_countrytestedin),
@@ -208,27 +213,33 @@ class TestInfoScreenUtilImpl(
             "<br/>",
             createdLine(
                 resources.getString(R.string.your_test_result_explanation_description_test_type),
-                testType
+                testType,
+                isOptional = true
             ),
             createdLine(
                 resources.getString(R.string.your_test_result_explanation_description_test_name),
-                testName
+                testName,
+                isOptional = true
             ),
             createdLine(
                 resources.getString(R.string.your_test_result_explanation_description_test_date),
-                testDate
+                testDate,
+                isOptional = true
             ),
             createdLine(
                 resources.getString(R.string.your_test_result_explanation_description_test_result),
-                resources.getString(R.string.your_test_result_explanation_positive_test_result)
+                resources.getString(R.string.your_test_result_explanation_positive_test_result),
+                isOptional = true
             ),
             createdLine(
                 resources.getString(R.string.your_test_result_explanation_description_test_manufacturer),
-                testManufacturer
+                testManufacturer,
+                isOptional = true
             ),
             createdLine(
                 resources.getString(R.string.your_test_result_explanation_description_test_location),
-                testLocation
+                testLocation,
+                isOptional = true
             ),
             createdLine(
                 resources.getString(R.string.holder_event_about_test_countrytestedin),

holder/src/main/res/values-en/strings.xml

@@ -902,7 +902,7 @@ Read more on <a href=\"https://www.government.nl/entry-pass-visitors-cc\">www.go
   <string name="holder_helpInfo_helpdesk">Helpdesk</string>
   <string name="holder_helpdesk_title">Helpdesk</string>
   <string name="holder_helpdesk_contact_title">Contact</string>
-  <string name="holder_helpdesk_contact_message"><![CDATA[If you have any questions or experience problems, you can contact the CoronaCheck helpdesk.<br/><br/><b>Call the helpdesk:</b><br />Op <a href=\"tel:0800-1421\">0800-1421</a> (free). Or, if you are calling from abroad: <a href=\"tel:+31707503720\">+31 70 750 37 20</a>.<br /> <br />Open from Monday till Friday, between 08.00 a.m. - 06.00 p.m.<br /><br /><b>Or send an e-mail to:</b><br /><a href=\"mailto:helpdesk@coronacheck.nl\">helpdesk@coronacheck.nl</a>]]></string>
+  <string name="holder_helpdesk_contact_message"><![CDATA[If you have any questions or experience problems, you can contact the CoronaCheck helpdesk.<br/><br/><b>Call the helpdesk:</b><br /><a href=\"tel:0800-1421\">0800-1421</a> (free). Or, if you are calling from abroad: <a href=\"tel:+31707503720\">+31 70 750 37 20</a>.<br /> <br />Open from Monday till Friday, between 08.00 a.m. - 06.00 p.m.<br /><br /><b>Or send an email to:</b><br /><a href=\"mailto:helpdesk@coronacheck.nl\">helpdesk@coronacheck.nl</a>]]></string>
   <string name="holder_helpdesk_support_title">Support</string>
   <string name="holder_helpdesk_appVersion">App version:</string>
   <string name="holder_helpdesk_configuration">Configuration:</string>

holder/src/main/res/values/strings.xml

@@ -130,7 +130,7 @@
   <string name="no_negative_test_result_description"><![CDATA[Er is geen negatieve testuitslag beschikbaar.]]></string>
   <string name="test_result_not_known_title">Testuitslag nog niet bekend</string>
   <string name="test_result_not_known_description"><![CDATA[Probeer het later nog eens.<br/><br/>Neem voor vragen contact op met jouw testlocatie.]]></string>
-  <string name="about_this_app_description"><![CDATA[Met de CoronaCheck app kun je aantonen dat je gevaccineerd, negatief getest, of hersteld van corona bent. Je kunt een digitaal coronabewijs maken van je vaccinatie(s), maar ook van een positieve of negatieve testuitslag.<br/><br/>Je bewijs heeft een QR-code. Die kan gescand worden voor toegang tot plekken of activiteiten, of om mee te reizen.]]></string>
+  <string name="about_this_app_description"><![CDATA[Met de CoronaCheck-app kun je aantonen dat je gevaccineerd, negatief getest, of hersteld van corona bent. Je kunt een digitaal coronabewijs maken van je vaccinatie(s), maar ook van een positieve of negatieve testuitslag.<br/><br/>Je bewijs heeft een QR-code. Die kan gescand worden voor toegang tot plekken of activiteiten, of om mee te reizen.]]></string>
   <string name="test_result_already_signed_title">Testuitslag is al opgehaald</string>
   <string name="test_result_already_signed_description"><![CDATA[Je testuitslag is al opgehaald. Ook is er al een QR-code van gemaakt.<br\><br\> Klopt dit niet? Neem dan contact op met de testlocatie.]]></string>
   <string name="item_test_result_expired"><![CDATA[Je QR-code is verlopen.<br/><br/>Laat je opnieuw testen.]]></string>
@@ -161,7 +161,7 @@
   <string name="personal_details_month_okt">OKT</string>
   <string name="personal_details_month_nov">NOV</string>
   <string name="personal_details_month_dec">DEC</string>
-  <string name="app_version">App versie: %1$s (%2$s)</string>
+  <string name="app_version">App-versie: %1$s (%2$s)</string>
   <string name="config_version">Configuratie %1$s, %2$s</string>
   <string name="my_overview_existing_qr_title">Laat QR-code zien bij ingang</string>
   <string name="my_overview_existing_qr_date">Geldig tot %1$s</string>
@@ -256,7 +256,7 @@
   <string name="qr_explanation_description_eu_test_birth_date">Geboortedatum / Date of birth*:</string>
   <string name="qr_explanation_description_eu_test_disease">Ziekteverwekker / Disease targeted:</string>
   <string name="qr_explanation_description_eu_test_test_type">Type test / Type of test:</string>
-  <string name="qr_explanation_description_eu_test_test_name">Test naam / Test name:</string>
+  <string name="qr_explanation_description_eu_test_test_name">Testnaam / Test name:</string>
   <string name="qr_explanation_description_eu_test_test_date">Testdatum / Test date:</string>
   <string name="qr_explanation_description_eu_test_test_result">Testuitslag / Test result:</string>
   <string name="qr_explanation_description_eu_test_test_centre">Testlocatie / Test location:</string>
@@ -905,7 +905,7 @@ Lees meer op <a href=\"https://www.rijksoverheid.nl/ctb-bezoekers-cc\">www.rijks
   <string name="holder_helpdesk_contact_title">Contact</string>
   <string name="holder_helpdesk_contact_message"><![CDATA[Bij vragen of problemen kun je contact opnemen met de CoronaCheck helpdesk.<br/><br/><b>Bel de helpdesk:</b><br />Op <a href=\"tel:0800-1421\">0800-1421</a> (gratis). Of als je vanuit het buitenland belt: <a href=\"tel:+31707503720\">+31 70 750 37 20</a>.<br /> <br />Telefonisch bereikbaar van maandag t/m vrijdag 08:00 - 18:00 uur.<br /><br /><b>Of stuur een e-mail naar:</b><br /><a href=\"mailto:helpdesk@coronacheck.nl\">helpdesk@coronacheck.nl</a>]]></string>
   <string name="holder_helpdesk_support_title">Ondersteuning</string>
-  <string name="holder_helpdesk_appVersion">App versie:</string>
+  <string name="holder_helpdesk_appVersion">App-versie:</string>
   <string name="holder_helpdesk_configuration">Configuratie:</string>
   <string name="holder_helpInfo_title">Hulp &amp; Informatie</string>
   <string name="appstatus_launchError_button">Sluit de app</string>