Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Days since installation strings (EXPOSRUEAPP-5170) #2464

Merged
merged 6 commits into from
Mar 4, 2021
Merged

Days since installation strings (EXPOSRUEAPP-5170) #2464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f79ed1f
Added new strings.
SamuraiKek Feb 25, 2021
2863b53
Merge branch 'release/1.15.x' into feature/5170-days-since-installati…
harambasicluka Mar 2, 2021
85cdd05
Reverted back to old string naming for other languages.
SamuraiKek Mar 3, 2021
71abbeb
Merge branch 'release/1.15.x' into feature/5170-days-since-installati…
SamuraiKek Mar 4, 2021
a6f09a8
Merge branch 'release/1.15.x' into feature/5170-days-since-installati…
ralfgehrer Mar 4, 2021
6f98c0a
Merge branch 'release/1.15.x' into feature/5170-days-since-installati…
ralfgehrer Mar 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Corona-Warn-App/src/main/java/de/rki/coronawarnapp/tracing/ui/TracingExplanationDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/de/rki/coronawarnapp/tracing/ui/details/items/periodlogged/PeriodLoggedBox.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion Corona-Warn-App/src/main/res/layout/tracing_details_item_periodlogged_view.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
10 changes: 8 additions & 2 deletions Corona-Warn-App/src/main/res/values-de/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand Down
8 changes: 7 additions & 1 deletion Corona-Warn-App/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>
Expand Down