diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/TracingExplanationDialog.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/TracingExplanationDialog.kt index 2909572598943ce83a8d403bfc3ec8733ff624ff..57882ac32fb73eaf3e24a6c047cde89e4f3b23c7 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/TracingExplanationDialog.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/TracingExplanationDialog.kt @@ -18,7 +18,7 @@ class TracingExplanationDialog @Inject constructor( context.getString(R.string.risk_details_information_body_period_logged) val infoPeriodLoggedAssessment = context.getString( - R.string.risk_details_information_body_period_logged_assessment, + R.string.risk_details_information_body_period_logged_assessment_under_14_days, activeTracingDaysInRetentionPeriod.toString() ) val infoFAQ = context.getString(R.string.risk_details_explanation_dialog_faq_body) diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/items/periodlogged/PeriodLoggedBox.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/items/periodlogged/PeriodLoggedBox.kt index e9556c86dc9c482ff0c0c0dc96dfaa814a1d0419..7f3fe0d2bd72fa9d602778711ba35d0467a370eb 100644 --- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/items/periodlogged/PeriodLoggedBox.kt +++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/details/items/periodlogged/PeriodLoggedBox.kt @@ -39,7 +39,7 @@ class PeriodLoggedBox( ) : DetailsItem { fun getRiskActiveTracingDaysInRetentionPeriodLogged(context: Context): String = context.getString( - R.string.risk_details_information_body_period_logged_assessment + R.string.risk_details_information_body_period_logged_assessment_under_14_days ).format(activeTracingDaysInRetentionPeriod) fun getProgressColor(context: Context) = when (tracingStatus) { diff --git a/Corona-Warn-App/src/main/res/layout/tracing_details_item_periodlogged_view.xml b/Corona-Warn-App/src/main/res/layout/tracing_details_item_periodlogged_view.xml index 657e2d1da2189d1d9556f2cad5af0e8d3ef2449e..49c161997833fc2f875238f312540e0aa715615b 100644 --- a/Corona-Warn-App/src/main/res/layout/tracing_details_item_periodlogged_view.xml +++ b/Corona-Warn-App/src/main/res/layout/tracing_details_item_periodlogged_view.xml @@ -99,7 +99,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/icon_background" app:layout_constraintTop_toTopOf="parent" - tools:text="@string/risk_details_information_body_period_logged_assessment" /> + tools:text="@string/risk_details_information_body_period_logged_assessment_under_14_days" /> </androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout> </layout> \ No newline at end of file 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 3b49582878397148677b060cb908239bbc329a3e..40b031ce48e8e839a147205ae1076a52f5dd3cd3 100644 --- a/Corona-Warn-App/src/main/res/values-de/strings.xml +++ b/Corona-Warn-App/src/main/res/values-de/strings.xml @@ -108,6 +108,8 @@ Risk Card ###################################### --> + <!-- XTXT: risk card - Days since installation if < 14 days --> + <string name="risk_card_body_days_since_installation">"Seit %s Tagen installiert"</string> <!-- XTXT: risk card - tracing active for x out of 14 days --> <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 --> @@ -346,8 +348,12 @@ <!-- XHED: risk details - infection period logged headling, below behaviors --> <string name="risk_details_subtitle_period_logged">"Dieser Zeitraum wird berücksichtigt."</string> <!-- XHED: risk details - infection period logged information body, below behaviors --> - <string name="risk_details_information_body_period_logged">"Die Berechnung des Infektionsrisikos kann nur für die Zeiträume erfolgen, an denen die Risiko-Ermittlung aktiv war. Die Risiko-Ermittlung sollte daher dauerhaft aktiv sein."</string> - <!-- XHED: risk details - infection period logged information body, below behaviors --> + <string name="risk_details_information_body_period_logged">"Die Berechnung des Infektionsrisikos kann nur für die Zeiträume erfolgen, an denen die Risiko-Ermittlung aktiv war. Die Risiko- Ermittlung sollte daher dauerhaft aktiv sein. Für Ihre Risiko-Ermittlung wird der Zeitraum der letzten 14 Tage betrachtet."</string> + <!-- XTXT: risk details - infection period logged information body, under 14 days --> + <string name="risk_details_information_body_period_logged_assessment_under_14_days">"Die Corona-Warn-App ist seit %s Tagen installiert. Das Infektionsrisiko wird für Zeiträume berechnet, in denen die Risiko-Ermittlung aktiv ist. Wenn Sie andere Personen getroffen haben und die Risiko-Ermittlung aktiv war, wird Ihr Infektions-Risiko berechnet."</string> + <!-- XTXT: risk details - infection period logged information body, over 14 days --> + <string name="risk_details_information_body_period_logged_assessment_over_14_days">"Wenn die Risiko-Ermittlung zu Zeiten in denen sie andere Personen getroffen haben aktiv war, kann die Berechnung des Infektionsrisikos für diesen Zeitraum erfolgen."</string> + <!-- XHED: risk details - infection period logged information body, below behaviors --> <!-- XTXT: risk details - infection period logged information body, under 14 days --> <string name="risk_details_information_body_period_logged_assessment">"Für Ihre Risiko-Ermittlung wird nur der Zeitraum der letzten 14 Tage betrachtet. In diesem Zeitraum war Ihre Risiko-Ermittlung für eine Gesamtdauer von %1$s Tagen aktiv. Ältere Tage werden automatisch gelöscht, da sie aus Sicht des Infektionsschutzes nicht mehr relevant sind."</string> <!-- XTXT: risk details - infection period days logged/14 --> <string name="risk_details_information_active_tracing_days_circle_progress">"%s/14"</string> diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml index 28ff6ecec8fb98681e84403ba26ccd37219bc17f..20e352f30ff72eaf6d717401a06add9b818022a5 100644 --- a/Corona-Warn-App/src/main/res/values/strings.xml +++ b/Corona-Warn-App/src/main/res/values/strings.xml @@ -118,6 +118,8 @@ Risk Card ###################################### --> + <!-- XTXT: risk card - Days since installation if < 14 days --> + <string name="risk_card_body_days_since_installation">"Seit %s Tagen installiert"</string> <!-- XTXT: risk card - tracing active for x out of 14 days --> <string name="risk_card_body_saved_days">"Exposure logging was active for %1$s of the past 14 days."</string> <!-- XTXT: risk card- tracing active for 14 out of 14 days --> @@ -357,7 +359,11 @@ <string name="risk_details_subtitle_period_logged">"This period is included in the calculation."</string> <!-- XHED: risk details - infection period logged information body, below behaviors --> <string name="risk_details_information_body_period_logged">"Your risk of infection can be calculated only for periods during which exposure logging was active. The logging feature should therefore remain active permanently."</string> - <!-- XHED: risk details - infection period logged information body, below behaviors --> + <!-- XTXT: risk details - infection period logged information body, under 14 days --> + <string name="risk_details_information_body_period_logged_assessment_under_14_days">"Exposure logging covers the past 14 days. During this time, the logging feature on your smartphone was active for %1$s days. The app automatically deletes older logs, as these are no longer relevant for infection prevention."</string> + <!-- XTXT: risk details - infection period logged information body, over 14 days --> + <string name="risk_details_information_body_period_logged_assessment_over_14_days">"Wenn die Risiko-Ermittlung zu Zeiten in denen sie andere Personen getroffen haben aktiv war, kann die Berechnung des Infektionsrisikos für diesen Zeitraum erfolgen."</string> + <!-- XHED: risk details - infection period logged information body, below behaviors --> <!-- XTXT: risk details - infection period logged information body, under 14 days --> <string name="risk_details_information_body_period_logged_assessment">"Exposure logging covers the past 14 days. During this time, the logging feature on your smartphone was active for %1$s days. The app automatically deletes older logs, as these are no longer relevant for infection prevention."</string> <!-- XTXT: risk details - infection period days logged/14 --> <string name="risk_details_information_active_tracing_days_circle_progress">"%s/14"</string>