From 385adeba092e2393981584b489720f549a1d6c1f Mon Sep 17 00:00:00 2001
From: Muschko <marc.muschko@sap.com>
Date: Fri, 10 Jul 2020 11:11:17 +0200
Subject: [PATCH] added text change in risk card
activeTracingDaysInRetentionPeriod and added turkish language tag to
information hotline
---
.../util/formatter/FormatterRiskHelper.kt | 26 ++++++++++++++-----
.../src/main/res/values-de/strings.xml | 6 +++--
.../src/main/res/values-en/strings.xml | 6 +++--
.../src/main/res/values/strings.xml | 6 +++--
4 files changed, 32 insertions(+), 12 deletions(-)
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 6d9907b14..88763152c 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
@@ -180,18 +180,32 @@ fun formatRiskActiveTracingDaysInRetentionPeriod(
return when (riskLevelScore) {
RiskLevelConstants.INCREASED_RISK -> {
if (showDetails) {
+ if (activeTracingDaysInRetentionPeriod < 14) {
+ appContext.getString(
+ R.string.risk_card_body_saved_days
+ )
+ .format(activeTracingDaysInRetentionPeriod)
+ } else {
+ appContext.getString(
+ R.string.risk_card_body_saved_days_full
+ )
+ }
+ } else {
+ ""
+ }
+ }
+ RiskLevelConstants.LOW_LEVEL_RISK ->
+ if (activeTracingDaysInRetentionPeriod < 14) {
appContext.getString(
R.string.risk_card_body_saved_days
)
.format(activeTracingDaysInRetentionPeriod)
} else {
- ""
+ appContext.getString(
+ R.string.risk_card_body_saved_days_full
+ )
}
- }
- RiskLevelConstants.LOW_LEVEL_RISK -> appContext.getString(
- R.string.risk_card_body_saved_days
- )
- .format(activeTracingDaysInRetentionPeriod)
+
else -> ""
}
}
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 3b257b5ed..daf237094 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -135,7 +135,9 @@
<item quantity="other">"%1$s Risiko-Begegnungen"</item>
</plurals>
<!-- XTXT: risk card - tracing active for x out of 14 days -->
- <string name="risk_card_body_saved_days">"%1$s von 14 Tagen aktiv"</string>
+ <string name="risk_card_body_saved_days">"Risiko-Ermittlung war für %1$s der letzten 14 Tage aktiv"</string>
+ <!-- XTXT: risk card- tracing active for 14 out of 14 days -->
+ <string name="risk_card_body_saved_days_full">"Risiko-Ermittlung dauerhaft aktiv"</string>
<!-- XTXT; risk card - no update done yet -->
<string name="risk_card_body_not_yet_fetched">"Begegnungen wurden noch nicht überprüft."</string>
<!-- XTXT: risk card - last successful update -->
@@ -555,7 +557,7 @@
<!-- XTXT: Body text for technical contact and hotline information page -->
<string name="information_contact_body_phone">"Unser Kundenservice ist für Sie da."</string>
<!-- YTXT: Body text for technical contact and hotline information page -->
- <string name="information_contact_body_open">"Sprachen: Deutsch, Englisch \nErreichbarkeit:"<xliff:g id="line_break">"\n"</xliff:g>"Mo - Sa: 07:00 - 22:00 Uhr"<xliff:g id="line_break">"\n(außer an bundesweiten Feiertagen)"</xliff:g><xliff:g id="line_break">"\nDer Anruf ist kostenfrei."</xliff:g></string>
+ <string name="information_contact_body_open">"Sprachen: Deutsch, Englisch, Türkisch\nErreichbarkeit:"<xliff:g id="line_break">"\n"</xliff:g>"Mo - Sa: 07:00 - 22:00 Uhr"<xliff:g id="line_break">"\n(außer an bundesweiten Feiertagen)"</xliff:g><xliff:g id="line_break">"\nDer Anruf ist kostenfrei."</xliff:g></string>
<!-- YTXT: Body text for technical contact and hotline information page -->
<string name="information_contact_body_other">"Für gesundheitliche Fragen wenden Sie sich bitte an Ihre Hausarztpraxis oder die Hotline des ärztlichen Bereitschaftsdienstes 116 117."</string>
<!-- XACT: describes illustration -->
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 6a17bd219..45a303d59 100644
--- a/Corona-Warn-App/src/main/res/values-en/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-en/strings.xml
@@ -135,7 +135,9 @@
<item quantity="other">"%1$s exposures"</item>
</plurals>
<!-- XTXT: risk card - tracing active for x out of 14 days -->
- <string name="risk_card_body_saved_days">"%1$s of 14 days active"</string>
+ <string name="risk_card_body_saved_days">"Exposure logging was active for %1$s of the last 14 days"</string>
+ <!-- XTXT: risk card- tracing active for 14 out of 14 days -->
+ <string name="risk_card_body_saved_days_full">Exposure logging permanently active</string>
<!-- XTXT; risk card - no update done yet -->
<string name="risk_card_body_not_yet_fetched">"Encounters have not yet been checked."</string>
<!-- XTXT: risk card - last successful update -->
@@ -555,7 +557,7 @@
<!-- XTXT: Body text for technical contact and hotline information page -->
<string name="information_contact_body_phone">"Our customer service is here to help."</string>
<!-- YTXT: Body text for technical contact and hotline information page -->
- <string name="information_contact_body_open">"Languages: German, English\nBusiness hours:"<xliff:g id="line_break">"\n"</xliff:g>"Monday to Saturday: 7am - 10pm"<xliff:g id="line_break">"\n(except national holidays)"</xliff:g><xliff:g id="line_break">"\nThe call is free of charge."</xliff:g></string>
+ <string name="information_contact_body_open">"Languages: German, English, Turkish\nBusiness hours:"<xliff:g id="line_break">"\n"</xliff:g>"Monday to Saturday: 7am - 10pm"<xliff:g id="line_break">"\n(except national holidays)"</xliff:g><xliff:g id="line_break">"\nThe call is free of charge."</xliff:g></string>
<!-- YTXT: Body text for technical contact and hotline information page -->
<string name="information_contact_body_other">"If you have any health-related questions, please contact your general practitioner or the hotline for the medical emergency service, telephone: +49 6251 / 708-1082, telefax: +49 116 / 78117."</string>
<!-- XACT: describes illustration -->
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 6a17bd219..45a303d59 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -135,7 +135,9 @@
<item quantity="other">"%1$s exposures"</item>
</plurals>
<!-- XTXT: risk card - tracing active for x out of 14 days -->
- <string name="risk_card_body_saved_days">"%1$s of 14 days active"</string>
+ <string name="risk_card_body_saved_days">"Exposure logging was active for %1$s of the last 14 days"</string>
+ <!-- XTXT: risk card- tracing active for 14 out of 14 days -->
+ <string name="risk_card_body_saved_days_full">Exposure logging permanently active</string>
<!-- XTXT; risk card - no update done yet -->
<string name="risk_card_body_not_yet_fetched">"Encounters have not yet been checked."</string>
<!-- XTXT: risk card - last successful update -->
@@ -555,7 +557,7 @@
<!-- XTXT: Body text for technical contact and hotline information page -->
<string name="information_contact_body_phone">"Our customer service is here to help."</string>
<!-- YTXT: Body text for technical contact and hotline information page -->
- <string name="information_contact_body_open">"Languages: German, English\nBusiness hours:"<xliff:g id="line_break">"\n"</xliff:g>"Monday to Saturday: 7am - 10pm"<xliff:g id="line_break">"\n(except national holidays)"</xliff:g><xliff:g id="line_break">"\nThe call is free of charge."</xliff:g></string>
+ <string name="information_contact_body_open">"Languages: German, English, Turkish\nBusiness hours:"<xliff:g id="line_break">"\n"</xliff:g>"Monday to Saturday: 7am - 10pm"<xliff:g id="line_break">"\n(except national holidays)"</xliff:g><xliff:g id="line_break">"\nThe call is free of charge."</xliff:g></string>
<!-- YTXT: Body text for technical contact and hotline information page -->
<string name="information_contact_body_other">"If you have any health-related questions, please contact your general practitioner or the hotline for the medical emergency service, telephone: +49 6251 / 708-1082, telefax: +49 116 / 78117."</string>
<!-- XACT: describes illustration -->
--
GitLab