diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt index 2942c09bfbadaa8fa99e019895309cc7fb472e5a..4c06814bafe705811329c21953bd9f75e2361111 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelper.kt @@ -142,7 +142,7 @@ fun formatRiskContact(riskLevelScore: Int?, matchedKeysCount: Int?): String { } RiskLevelConstants.LOW_LEVEL_RISK -> { if (matchedKeysCount == 0) { - appContext.getString(R.string.risk_card_body_contact_low_risk) + appContext.getString(R.string.risk_card_body_contact) } else { resources.getQuantityString( R.plurals.risk_card_body_contact_value, diff --git a/Corona-Warn-App/src/main/res/values-bg/strings.xml b/Corona-Warn-App/src/main/res/values-bg/strings.xml index a1f3ce9a16f8b45652729d3a8118a22d402669b6..0e77b972ba7c4a35b683dead150fcc14cab0443b 100644 --- a/Corona-Warn-App/src/main/res/values-bg/strings.xml +++ b/Corona-Warn-App/src/main/res/values-bg/strings.xml @@ -135,8 +135,6 @@ <!-- XTXT: risk card - no contact yet --> <string name="risk_card_body_contact">"До момента нÑма излагане на риÑк"</string> - <!-- XTXT: risk card - no exposures with low risk --> - <string name="risk_card_body_contact_low_risk">"До момента нÑма излагане на ниÑък риÑк"</string> <!-- XTXT: risk card - number of contacts for one or more --> <plurals name="risk_card_body_contact_value"> <item quantity="one">"%1$s излагане на ниÑък риÑк"</item> diff --git a/Corona-Warn-App/src/main/res/values-de/strings.xml b/Corona-Warn-App/src/main/res/values-de/strings.xml index dcd6de0792094fc9a5577b699e59cc9ad792d218..0a2c78f5a291ccdfdf944d6cee1aeeb3ff479d6e 100644 --- a/Corona-Warn-App/src/main/res/values-de/strings.xml +++ b/Corona-Warn-App/src/main/res/values-de/strings.xml @@ -135,16 +135,14 @@ <!-- XTXT: risk card - no contact yet --> <string name="risk_card_body_contact">"Bisher keine Risiko-Begegnungen"</string> - <!-- XTXT: risk card - no exposures with low risk --> - <string name="risk_card_body_contact_low_risk">"Bisher keine Begegnungen mit niedrigem Risiko"</string> <!-- XTXT: risk card - number of contacts for one or more --> <plurals name="risk_card_body_contact_value"> - <item quantity="one">"%1$s Risiko-Begegnung mit niedrigem Risiko"</item> - <item quantity="other">"%1$s Risiko-Begegnungen mit niedrigem Risiko"</item> + <item quantity="one">"%1$s Begegnung mit niedrigem Risiko"</item> + <item quantity="other">"%1$s Begegnungen mit niedrigem Risiko"</item> <item quantity="zero">"Bisher keine Begegnungen mit niedrigem Risiko"</item> - <item quantity="two">"%1$s Risiko-Begegnungen mit niedrigem Risiko"</item> - <item quantity="few">"%1$s Risiko-Begegnungen mit niedrigem Risiko"</item> - <item quantity="many">"%1$s Risiko-Begegnungen mit niedrigem Risiko"</item> + <item quantity="two">"%1$s Begegnungen mit niedrigem Risiko"</item> + <item quantity="few">"%1$s Begegnungen mit niedrigem Risiko"</item> + <item quantity="many">"%1$s Begegnungen mit niedrigem Risiko"</item> </plurals> <!-- XTXT: risk card - number of contacts for one or more --> <plurals name="risk_card_body_contact_value_high_risk"> diff --git a/Corona-Warn-App/src/main/res/values-en/strings.xml b/Corona-Warn-App/src/main/res/values-en/strings.xml index c146b8aa881f4e272cb2224c908b57f9d6929c83..1cea318c8050ccf66aef881f190c159ee1ba8cca 100644 --- a/Corona-Warn-App/src/main/res/values-en/strings.xml +++ b/Corona-Warn-App/src/main/res/values-en/strings.xml @@ -135,8 +135,6 @@ <!-- XTXT: risk card - no contact yet --> <string name="risk_card_body_contact">"No exposure up to now"</string> - <!-- XTXT: risk card - no exposures with low risk --> - <string name="risk_card_body_contact_low_risk">"No exposure with low risk so far"</string> <!-- XTXT: risk card - number of contacts for one or more --> <plurals name="risk_card_body_contact_value"> <item quantity="one">"%1$s exposure with low risk"</item> diff --git a/Corona-Warn-App/src/main/res/values-pl/strings.xml b/Corona-Warn-App/src/main/res/values-pl/strings.xml index b3e9f2891ffb33bb326dadbf7fe88cbf299aafb9..ee8a348dc7fbb995706322514d4fb96a18dacab1 100644 --- a/Corona-Warn-App/src/main/res/values-pl/strings.xml +++ b/Corona-Warn-App/src/main/res/values-pl/strings.xml @@ -135,8 +135,6 @@ <!-- XTXT: risk card - no contact yet --> <string name="risk_card_body_contact">"Brak narażenia do tej pory"</string> - <!-- XTXT: risk card - no exposures with low risk --> - <string name="risk_card_body_contact_low_risk">"Brak narażenia z niskim ryzykiem do tej pory"</string> <!-- XTXT: risk card - number of contacts for one or more --> <plurals name="risk_card_body_contact_value"> <item quantity="one">"%1$s narażenie z niskim ryzykiem"</item> diff --git a/Corona-Warn-App/src/main/res/values-ro/strings.xml b/Corona-Warn-App/src/main/res/values-ro/strings.xml index 37fcbdc96308cee1b171109d92c1725113f59d13..a38d1fc6e6e39a509c0ffce0a13855905460cd66 100644 --- a/Corona-Warn-App/src/main/res/values-ro/strings.xml +++ b/Corona-Warn-App/src/main/res/values-ro/strings.xml @@ -135,8 +135,6 @@ <!-- XTXT: risk card - no contact yet --> <string name="risk_card_body_contact">"Nicio expunere până acum"</string> - <!-- XTXT: risk card - no exposures with low risk --> - <string name="risk_card_body_contact_low_risk">"Nicio expunere cu risc redus până acum"</string> <!-- XTXT: risk card - number of contacts for one or more --> <plurals name="risk_card_body_contact_value"> <item quantity="one">"%1$s expunere cu risc redus"</item> diff --git a/Corona-Warn-App/src/main/res/values-tr/strings.xml b/Corona-Warn-App/src/main/res/values-tr/strings.xml index bd2d1c01f20e46fb45137978b73cd393bb0ec25e..0b5195ad18370c52bcfc538eebe18a445c0743c9 100644 --- a/Corona-Warn-App/src/main/res/values-tr/strings.xml +++ b/Corona-Warn-App/src/main/res/values-tr/strings.xml @@ -135,8 +135,6 @@ <!-- XTXT: risk card - no contact yet --> <string name="risk_card_body_contact">"Åžu ana dek hiçbir maruz kalma yok"</string> - <!-- XTXT: risk card - no exposures with low risk --> - <string name="risk_card_body_contact_low_risk">"Åžu ana dek hiçbir düşük riskli maruz kalma yok"</string> <!-- XTXT: risk card - number of contacts for one or more --> <plurals name="risk_card_body_contact_value"> <item quantity="one">"%1$s kez düşük riskli maruz kalma"</item> diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml index 859d05a8b2f8ea0d9d35667cc4971057fcfac198..cba5c9c49562b24a7e70b14a8cf8cff2899ff816 100644 --- a/Corona-Warn-App/src/main/res/values/strings.xml +++ b/Corona-Warn-App/src/main/res/values/strings.xml @@ -137,8 +137,6 @@ <!-- XTXT: risk card - no contact yet --> <string name="risk_card_body_contact">"No exposure up to now"</string> - <!-- XTXT: risk card - no exposures with low risk --> - <string name="risk_card_body_contact_low_risk">"No exposure with low risk so far"</string> <!-- XTXT: risk card - number of contacts for one or more --> <plurals name="risk_card_body_contact_value"> <item quantity="one">"%1$s exposure with low risk"</item> diff --git a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelperTest.kt b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelperTest.kt index 2eea80e2d9b6964bdc5b772732a4e36702805630..46786d0d90d29ee08a82c9e88dbeeb2a9663ecc3 100644 --- a/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelperTest.kt +++ b/Corona-Warn-App/src/test/java/de/rki/coronawarnapp/util/formatter/FormatterRiskHelperTest.kt @@ -95,7 +95,6 @@ class FormatterRiskHelperTest { private fun formatRiskContactBase(iRiskLevelScore: Int?, iMatchedKeysCount: Int?, sValue: String) { every { context.getString(R.string.risk_card_body_contact) } returns R.string.risk_card_body_contact.toString() - every { context.getString(R.string.risk_card_body_contact_low_risk) } returns R.string.risk_card_body_contact_low_risk.toString() val result = formatRiskContact(riskLevelScore = iRiskLevelScore, matchedKeysCount = iMatchedKeysCount) assertThat( @@ -105,7 +104,6 @@ class FormatterRiskHelperTest { private fun formatRiskContactLastBase(iRiskLevelScore: Int?, iDaysSinceLastExposure: Int?, sValue: String) { every { context.getString(R.string.risk_card_body_contact) } returns R.string.risk_card_body_contact.toString() - every { context.getString(R.string.risk_card_body_contact_low_risk) } returns R.string.risk_card_body_contact_low_risk.toString() val result = formatRiskContactLast(riskLevelScore = iRiskLevelScore, daysSinceLastExposure = iDaysSinceLastExposure) @@ -584,7 +582,7 @@ class FormatterRiskHelperTest { formatRiskContactBase( iRiskLevelScore = RiskLevelConstants.LOW_LEVEL_RISK, iMatchedKeysCount = 0, - sValue = context.getString(R.string.risk_card_body_contact_low_risk) + sValue = context.getString(R.string.risk_card_body_contact) ) formatRiskContactBase( iRiskLevelScore = RiskLevelConstants.LOW_LEVEL_RISK,