From 643df5cbad545726668aa23d2059e5922dc19e72 Mon Sep 17 00:00:00 2001
From: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Date: Thu, 11 Jun 2020 11:26:50 +0200
Subject: [PATCH] Translation: Update (#374)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* [INTERNAL] Translation delivery: commit by LX Lab
Change-Id: Ic0905f66e03544c549ee6bf0edde3707c528215c
* Translation branch update (#127)
* Implement submission done fragment (#20)
* Added submission done fragment (currently dangling in nav graph)
* fixed leftover javadoc
* Moved QR code scan and registration fragment to submission package (#21)
* Dependency Updates and Gradle Fixes (#34)
* Bump up Gradle to 4.0.0 / 6.1.1
* Bump up NDK
* Bump Up SQLite
* adapt circle config
* Fix #23: Typo in onboarding screen (#31)
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
* Submission UI Additions (#25)
* Moved camera permission check to dispatcher fragment
* Added illustrations for test result screen
* Updated result fragment to match new design
* Added constraints to status card
* Integrated submission result positive other warning fragment in ui flow
* Added submission done fragment to nav graph
Signed-off-by: Kolya Opahle <k.opahle@sap.com>
* Added ability to dialog helper to create dialog without negative button
* Switched from AlertDialog.Builder to DIalogHelper
* Enable diagnosis key upload to backend (#35)
* Moved camera permission check to dispatcher fragment
* Added illustrations for test result screen
* Updated result fragment to match new design
* Added constraints to status card
* Integrated submission result positive other warning fragment in ui flow
* add TAN fetching to the key submission transaction
* remove unneeded function
* Fix log message for fetching TAN
* Added submission done fragment to nav graph
Signed-off-by: Kolya Opahle <k.opahle@sap.com>
* Added ability to dialog helper to create dialog without negative button
* Switched from AlertDialog.Builder to DIalogHelper
* use actual TAN (authCode) for key submission
set the TAN in the corresponding header field
fixes #8
* request permission to retrieve diagnosis keys
* permission needs to be requested again after dialog has been presented to the users
* trigger transaction to retrieve TAN and upload keys
Co-authored-by: Kolya Opahle <k.opahle@sap.com>
* Removed ExposureNotificationIntentService, the functionality is handled by NotificationHelper (#40)
* Fixing tele tan registration (#45)
* Fixed teleTAN based device registration
Signed-off-by: Kolya Opahle <k.opahle@sap.com>
* allowed excluded tan chars for testing
Signed-off-by: Kolya Opahle <k.opahle@sap.com>
* Revert "allowed excluded tan chars for testing"
This reverts commit 253ede4ea9c8ba2b5e6dd324680eed0f8f7e74c1.
* Release/0.5.5 (#48)
* Release/0.5.5
* Hotfix for resetting Gradle Version (internal pipeline confirmation) (#52)
* Gradle Reset to 0.5.4 (#53)
* Release/0.5.5 (#48)
* Hotfix for resetting Gradle Version (internal pipeline confirmation) (#52)
* Minify and Shrink Disabled (#56)
* Release/0.5.5
* Gradle Reset to 0.5.4 (#53)
* Release/0.5.5 (#48)
* Hotfix for resetting Gradle Version (internal pipeline confirmation) (#52)
* Disable minify / shrink
* Dont obfuscate
* 0.5.6
* Update known issues and fixing typo in readme (#44)
* added strings wip to known issues
* updated readme
Co-authored-by: Muschko <marc.muschko@sap.com>
* Updated strings, introduced more details on app-information screens (#88)
* updated strings for risk card and risk card details; plural strings are todo when finalized
* updated more strings on main / details
* added comments
* added strings for information about, information technical hotline; changed technical hotline layout
* removed hotline test icon
* fixed build issues
* Cleanup pull_request_template.md (#54)
* Update pull_request_template.md
* Removed Link to Contribution Guidelines (added by Github on the right hand side, anyhow)
* Removed Link to issue #41 from title example (this has been linked quite a lot...)
* 0.5.6
* Fix typo
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: marcmuschko <marc.muschko@sap.com>
* Add Support for lower case characters in the teleTAN screen (#66)
* added support for lower case input in teleTan fragment
Signed-off-by: Kolya Opahle <k.opahle@sap.com>
* Removed notice of case insensitivity from temporary strings.xml
Signed-off-by: Kolya Opahle <k.opahle@sap.com>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
* Correct typos in architecture overview (#67)
Co-authored-by: marcmuschko <marc.muschko@sap.com>
* Bluetooth & connection card (#97)
* introduced settings navigation helper
* added connection and bluetooth stati to main and tracing settings
* moved strings
* removed unnecessary backgroundTint
Co-authored-by: marcmuschko <marc.muschko@sap.com>
* Fix typo in class documentation (#71)
* 0.5.6
* fix typo
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
Co-authored-by: marcmuschko <marc.muschko@sap.com>
* spelling fixes (#87)
* 0.5.6
* spelling fixes
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
Co-authored-by: klemens <ka7@github.com>
Co-authored-by: marcmuschko <marc.muschko@sap.com>
* Moves creation of notification channel to app startup (#32)
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
* Tracing start/stop fix due to missing handling inside tracing (#99)
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
* Switch the DB Password to use the KeyStore MasterKey (#98)
Signed-off-by: d067928 <jakob.moeller@sap.com>
* Shared prefs ktx shorthand (#38)
* closes #33
* Add Commit Flag to ensure synchronous consistent Updates to Disk
Signed-off-by: d067928 <jakob.moeller@sap.com>
* Add persistance of timestamp and whether user is allowed to submit keys (#74)
* Store timestamp of receiving registration token
* also reset this timestamp when deleting the registration token
* use correct timestamp for display of test time
* replace tracing activation time by test result reception time
* rename TAN request to match context
* set isAllowedToSubmitDiagnosisKeys properly
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
* set "enabled" for include_settings_switch_row in notifications settings, fixes wrong binding and removed clickable rows (#101)
Co-authored-by: marcmuschko <marc.muschko@sap.com>
* fix #82 (#94)
* fix #82
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
* Add ShareHelper (#85)
* Add ShareHelper
* Use ShareHelper in MainShareFragment
* Replace the current exposure status with a positive result card when test result is positive (#79)
* Made submission status card style more cross device friendly
Signed-off-by: Kolya Opahle <k.opahle@sap.com>
* Added the positive result submission status card
Signed-off-by: Kolya Opahle <k.opahle@sap.com>
* lint fix
* Updated main fragment documentation
* Added icon for sharing risk status
Signed-off-by: Kolya Opahle <k.opahle@sap.com>
* Updated positive result home screen card text and icons
Signed-off-by: Kolya Opahle <k.opahle@sap.com>
* Added loading indicator to test result fragment (#100)
Co-authored-by: marcmuschko <marc.muschko@sap.com>
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
* Adjusted onboarding flow, adjusted contribution file, small fixes in settings (#106)
* changed permission dialog logic for onboarding tracing fragment and onboarding notification fragment
* adjusted contributing file
* added settings notification handling to display value in settings overview
* fixed app crash during bluetooth settings navigation
* corrected wrong value from view model in tracing settings text
* Submission Contact Fragment & StepView Custom View (#102)
* - submission-contact fragment added
- StepEntry custom view added to unify various step entry views
- SimpleStepEntry as a simple implementation of a StepEntry with title and text added
* - apply naming conventions for ids
- use CallHelper to trigger a call
- access views using kotlinx.android.synthetic
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
* Notifications when risk value has changed between low and high. (#76)
* Notifications when risk value has changed between low and high.
* Notifications when risk value has changed between low and high.
Fixed wildcard imports.
* Fixed formatting, ktlint issue.
* app foreground/background checking. Notifications are not sent when app is in background
* update comments
* initialize foreground flag as false(valid for background threads before ui starts)
* comments
* included UNDERTERMINED as a low, for initialisation
* fixed icon
* fixed tests
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
* added onboarding strings (#109)
* disable colored output for ktlint (#105)
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
* Limit number of keys to be uploaded to server (#107)
* limit the number of keys to be uploaded to 14
* fix spaces
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
* Fix white space, informal language and spelling of Docker in Readme (#78)
* 0.5.6
* Fix spelling gonna and docker
* Add missing "to"
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
Co-authored-by: marcmuschko <marc.muschko@sap.com>
* Update build.gradle (#111)
* Build.Gradle Conflict Resolving (0.8.0) (#112)
* Minify and proguard fix (#113)
Commented out -dontobfuscate
* Circle progress bar (#96)
* circle progress bar impl
* ktlint format
* added new ui
* added circle to contact tracing without binding
* added binding and final icon
* added circle progress to risk card
* added comments
* changed default value for disableText
* adapted views order to designs
* removed testing value
Co-authored-by: Kirill <kirill.sergeev@sap.com>
* TracingStatusHelper unit test (#114)
* TracingStatusHelper unit test
* removed duplicate
* Prevent screenshot of the app for all activities (#108)
* Prevent screenshot of the app for all activities
* fix ktlint
* code smell fix
Co-authored-by: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
* Feature: Bluetooth callback (#115)
* bluetooth callback added
* bound bluetooth callback to the ui
Co-authored-by: Kirill <kirill.sergeev@sap.com>
* Added main overview page to main menu (#120)
* added overview fragment baseline
* main overview draft version completed with build fixes
* checked some final strings again
* Fixed screen orientation to portrait (#121)
* added restriction to portrait and reversed portrait orientation only
* suppress SourceLockedOrientationActivity lint error
* changed local config that a high match can be generated via QR code, integrated it with the UI (#125)
* Feature: Translation preparation (#126)
* renamed old strings and reordered
* app information strings translation tags
* updated translation tags for long texts
* added translation comments to strings
* fixed naming error
* removed empty comment
Co-authored-by: Muschko <marc.muschko@sap.com>
Co-authored-by: Kolya Opahle <k.opahle@sap.com>
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
Co-authored-by: Michael Keppler <bananeweizen@gmx.de>
Co-authored-by: Thomas Klingbeil <64434904+tklingbeil@users.noreply.github.com>
Co-authored-by: Hee Tatt Ooi <64406309+HeeTattSap@users.noreply.github.com>
Co-authored-by: Muschko <marc.muschko@sap.com>
Co-authored-by: Thomas Kowark <thomas.kowark@sap.com>
Co-authored-by: Robert Scheck <robert-scheck@users.noreply.github.com>
Co-authored-by: Volkmar Vogel <volkmar@vogel.app>
Co-authored-by: ka7 <ka7@la-evento.com>
Co-authored-by: klemens <ka7@github.com>
Co-authored-by: Tim Brüggenthies <tim.brueggenthies@outlook.de>
Co-authored-by: mseele <mseele@gmail.com>
Co-authored-by: Janik Steegmüller <janik.steegmueller@gmail.com>
Co-authored-by: Fabian-K <fabian.kajzar@sap.com>
Co-authored-by: Hee Tatt Ooi <hee.tatt.ooi@sap.com>
Co-authored-by: Matthias Küch <mail@matthias-kuech.de>
Co-authored-by: oemerb <66002424+oemerb@users.noreply.github.com>
Co-authored-by: AlexanderAlferov <64849422+AlexanderAlferov@users.noreply.github.com>
Co-authored-by: Kirill <kirill.sergeev@sap.com>
Co-authored-by: Philipp Woessner <64482866+pwoessner@users.noreply.github.com>
* [INTERNAL] Translation delivery: commit by LX Lab
Change-Id: Ic0905f66e03544c549ee6bf0edde3707c528215c
* Remove values-2Q
Signed-off-by: d067928 <jakob.moeller@sap.com>
* [INTERNAL] Translation delivery: commit by LX Lab
Change-Id: Idf52dece137fdc6e314ed752a8ef6b79b08683b0
* deleted 2Q
* [INTERNAL] Translation delivery: commit by LX Lab
Change-Id: I63afce1d7307c912b034728d8b78d437974f818d
* excluded translation from lint for dev
* fixed quickBuild errors
* [INTERNAL] Translation delivery: commit by LX Lab
Change-Id: I0b2e12f977b0a4bf37716d85e527d8d05168120f
* fixed local issues
* [INTERNAL] Translation delivery: commit by LX Lab
Change-Id: Ied4c086215e1392cb4ac061c9e82760f4757d5b2
* fixes
* resolved merge conflicts
Co-authored-by: service-tip-git <tmsatsls@gmail.com>
Co-authored-by: Kolya Opahle <k.opahle@sap.com>
Co-authored-by: Jakob Möller <jakob.moeller@sap.com>
Co-authored-by: Michael Keppler <bananeweizen@gmx.de>
Co-authored-by: Thomas Klingbeil <64434904+tklingbeil@users.noreply.github.com>
Co-authored-by: Hee Tatt Ooi <64406309+HeeTattSap@users.noreply.github.com>
Co-authored-by: Muschko <marc.muschko@sap.com>
Co-authored-by: Thomas Kowark <thomas.kowark@sap.com>
Co-authored-by: Robert Scheck <robert-scheck@users.noreply.github.com>
Co-authored-by: Volkmar Vogel <volkmar@vogel.app>
Co-authored-by: ka7 <ka7@la-evento.com>
Co-authored-by: klemens <ka7@github.com>
Co-authored-by: Tim Brüggenthies <tim.brueggenthies@outlook.de>
Co-authored-by: mseele <mseele@gmail.com>
Co-authored-by: Janik Steegmüller <janik.steegmueller@gmail.com>
Co-authored-by: Fabian-K <fabian.kajzar@sap.com>
Co-authored-by: Hee Tatt Ooi <hee.tatt.ooi@sap.com>
Co-authored-by: Matthias Küch <mail@matthias-kuech.de>
Co-authored-by: oemerb <66002424+oemerb@users.noreply.github.com>
Co-authored-by: AlexanderAlferov <64849422+AlexanderAlferov@users.noreply.github.com>
Co-authored-by: Kirill <kirill.sergeev@sap.com>
Co-authored-by: Philipp Woessner <64482866+pwoessner@users.noreply.github.com>
---
Corona-Warn-App/src/main/assets/terms_en.html | 4 ++--
Corona-Warn-App/src/main/res/values-de/strings.xml | 1 +
Corona-Warn-App/src/main/res/values-en/strings.xml | 6 +++---
.../util/formatter/FormatterRiskHelperTest.kt | 12 +++---------
4 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/Corona-Warn-App/src/main/assets/terms_en.html b/Corona-Warn-App/src/main/assets/terms_en.html
index 6f0be32a4..9b3867b6e 100644
--- a/Corona-Warn-App/src/main/assets/terms_en.html
+++ b/Corona-Warn-App/src/main/assets/terms_en.html
@@ -210,7 +210,7 @@
</p>
<p>
3. WHAT DO I DO IF I HAVE BEEN EXPOSED TO A CONFIRMED CASE?
-
+
</p>
<p>
If the App notifies you that you have been exposed to a confirmed case, you
@@ -246,7 +246,7 @@
</p>
<p>
4. THE APP DOES NOT PROTECT YOU AGAINST INFECTION
-
+
</p>
<p>
The App serves to disrupt chains of infection.
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 760d6177a..31a5e09ab 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -615,6 +615,7 @@
<string name="submission_qr_code_scan_permission_rationale_dialog_button_negative">"Nicht erlauben"</string>
<!-- QR Code Scan Invalid Dialog -->
+
<!-- XHED: Dialog headline for invalid QR code -->
<string name="submission_qr_code_scan_invalid_dialog_headline">"QR-Code nicht korrekt"</string>
<!-- YTXT: Dialog Body text for invalid QR code -->
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 0ca9cb29d..a558f301a 100644
--- a/Corona-Warn-App/src/main/res/values-en/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-en/strings.xml
@@ -167,7 +167,7 @@
<!-- XHED: risk card - loading headline, update is ongoing -->
<string name="risk_card_loading_headline">"Check is running..."</string>
<!-- XTXT: risk card - loading, data is downloaded and will be checked, this can take several minutes -->
- <string name="risk_card_loading_body">"Current data is being downloaded and checked.\nThis can take several minutes."</string>
+ <string name="risk_card_loading_body">"Current data is beinfgdownloaded and checked. This can take several minutes."</string>
<!-- ####################################
Main
@@ -615,6 +615,7 @@
<string name="submission_qr_code_scan_permission_rationale_dialog_button_negative">"Do Not Allow"</string>
<!-- QR Code Scan Invalid Dialog -->
+
<!-- XHED: Dialog headline for invalid QR code -->
<string name="submission_qr_code_scan_invalid_dialog_headline">"Incorrect QR code"</string>
<!-- YTXT: Dialog Body text for invalid QR code -->
@@ -731,7 +732,6 @@
<string name="submission_dispatcher_qr_card_text">"Register your test by scanning the QR code of your test document."</string>
<!-- XHED: Dialog headline for dispatcher QR prviacy dialog -->
<string name="submission_dispatcher_qr_privacy_dialog_headline">"Declaration of Consent"</string>
- <!-- YTXT: Dialog Body text for QR privacy dialog -->
<string name="submission_dispatcher_qr_privacy_dialog_body">"By tapping on “Acceptâ€, you consent to the App querying the status of your coronavirus test and displaying it in the App. This feature is available to you if you have received a QR code and have consented to your test result being transmitted to the App’s server system. As soon as the testing lab has stored your test result on the server, you will be able to see the result in the App. If you have enabled notifications, you will also receive a notification outside the App telling you that your test result has been received. However, for privacy reasons, the test result itself will only be displayed in the App. You can withdraw this consent at any time by deleting your test registration in the App. Withdrawing your consent will not affect the lawfulness of processing before its withdrawal. Further information can be found in the menu under “Data Privacy Informationâ€."</string>
<!-- XBUT: submission(dispatcher QR Dialog) - positive button (right) -->
<string name="submission_dispatcher_qr_privacy_dialog_button_positive">"Allow"</string>
@@ -883,7 +883,7 @@
</string-array>
<!-- ####################################
- Button Tooltips for Accessibility
+ Button Tooltips for Accessibility
###################################### -->
<!-- XACT: back button-->
<string name="button_back">"Back to previous page"</string>
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 20c154b99..3d595008e 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
@@ -57,10 +57,8 @@ class FormatterRiskHelperTest {
every { context.getString(R.string.risk_card_button_update) } returns R.string.risk_card_button_update.toString()
every { context.getString(R.string.risk_card_button_cooldown) } returns R.string.risk_card_button_cooldown.toString()
every { context.getColor(R.color.colorTextSemanticNeutral) } returns R.color.colorTextSemanticNeutral
-
}
-
private fun formatRiskLevelHeadlineBase(iRiskLevelScore: Int?, bIsRefreshing: Boolean?, sValue: String) {
val result = formatRiskLevelHeadline(riskLevelScore = iRiskLevelScore, isRefreshing = bIsRefreshing)
assertThat(
@@ -117,7 +115,8 @@ class FormatterRiskHelperTest {
private fun formatRiskActiveTracingDaysInRetentionPeriodBase(
iRiskLevelScore: Int?,
bShowDetails: Boolean,
- lActiveTracingDaysInRetentionPeriod: Long, sValue: String
+ lActiveTracingDaysInRetentionPeriod: Long,
+ sValue: String
) {
every { context.getString(R.string.risk_card_body_saved_days) } returns R.string.risk_card_body_saved_days.toString()
@@ -145,7 +144,6 @@ class FormatterRiskHelperTest {
} returns R.string.risk_card_body_time_fetched.toString()
every { context.getString(R.string.risk_card_body_not_yet_fetched) } returns R.string.risk_card_body_not_yet_fetched.toString()
-
val result = formatTimeFetched(
riskLevelScore = iRiskLevelScore,
riskLevelScoreLastSuccessfulCalculated = iRiskLevelScoreLastSuccessfulCalculated,
@@ -179,7 +177,6 @@ class FormatterRiskHelperTest {
every { context.getString(R.string.risk_details_information_body_low_risk) } returns R.string.risk_details_information_body_low_risk.toString()
every { context.getString(R.string.risk_details_information_body_unknown_risk) } returns R.string.risk_details_information_body_unknown_risk.toString()
-
val result = formatRiskDetailsRiskLevelBody(
riskLevelScore = iRiskLevelScore,
daysSinceLastExposure = iDaysSinceLastExposure
@@ -196,7 +193,6 @@ class FormatterRiskHelperTest {
every { context.getColorStateList(R.color.card_low) } returns colorStateList
every { context.getColorStateList(R.color.card_unknown) } returns colorStateList
-
val result = formatRiskColorStateList(riskLevelScore = iRiskLevelScore)
assertThat(
result, `is`(colorStateList)
@@ -489,7 +485,6 @@ class FormatterRiskHelperTest {
sValue = ""
)
-
formatRiskSavedRiskBase(
iRiskLevelScore = RiskLevelConstants.NO_CALCULATION_POSSIBLE_TRACING_OFF,
iRiskLevelScoreLastSuccessfulCalculated = RiskLevelConstants.LOW_LEVEL_RISK,
@@ -579,7 +574,6 @@ class FormatterRiskHelperTest {
)
)
-
formatRiskContactBase(
iRiskLevelScore = RiskLevelConstants.LOW_LEVEL_RISK,
iMatchedKeysCount = 0,
@@ -1524,4 +1518,4 @@ class FormatterRiskHelperTest {
fun cleanUp() {
unmockkAll()
}
-}
\ No newline at end of file
+}
--
GitLab