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

Commit

Permalink
Merge pull request #928 from corona-warn-app/staging
Browse files Browse the repository at this point in the history
1.1.1
  • Loading branch information
inf2381 authored Jul 20, 2020
2 parents 9fb0719 + bf90140 commit 472abcf
Show file tree
Hide file tree
Showing 23 changed files with 467 additions and 93 deletions.
2 changes: 1 addition & 1 deletion cfg/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.7.0
1.1.1.3
37 changes: 27 additions & 10 deletions src/xcode/ENA/ENA.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,7 @@
B1B5A76024924B3D0029D5D7 /* FMDB in Frameworks */ = {isa = PBXBuildFile; productRef = B1B5A75F24924B3D0029D5D7 /* FMDB */; };
B1B9CF1F246ED2E8008F04F5 /* Sap_FilebucketTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1B9CF1E246ED2E8008F04F5 /* Sap_FilebucketTests.swift */; };
B1BD9E7E24898A2300BD3930 /* ExposureDetectionViewController+DynamicTableViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 714CD8662472885900F56450 /* ExposureDetectionViewController+DynamicTableViewModel.swift */; };
B1BFE27224BDE1D500C1181D /* HomeViewController+HowRiskDetectionWorks.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1BFE27124BDE1D500C1181D /* HomeViewController+HowRiskDetectionWorks.swift */; };
B1C6ECFF247F089E0066138F /* RiskImageItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51B5B415246DF13D00DC5D3E /* RiskImageItemView.swift */; };
B1C6ED00247F23730066138F /* NotificationName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51D420D324586DCA00AD70CA /* NotificationName.swift */; };
B1C7EE4424938E9E00F1F284 /* ExposureDetection_DidEndPrematurelyReason+ErrorHandling.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1C7EE4324938E9E00F1F284 /* ExposureDetection_DidEndPrematurelyReason+ErrorHandling.swift */; };
Expand Down Expand Up @@ -686,6 +687,7 @@
B1A9E70D246D73180024CC12 /* ExposureDetection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ExposureDetection.swift; sourceTree = "<group>"; };
B1A9E710246D782F0024CC12 /* SAPDownloadedPackage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SAPDownloadedPackage.swift; sourceTree = "<group>"; };
B1B9CF1E246ED2E8008F04F5 /* Sap_FilebucketTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Sap_FilebucketTests.swift; sourceTree = "<group>"; };
B1BFE27124BDE1D500C1181D /* HomeViewController+HowRiskDetectionWorks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "HomeViewController+HowRiskDetectionWorks.swift"; sourceTree = "<group>"; };
B1C7EE4324938E9E00F1F284 /* ExposureDetection_DidEndPrematurelyReason+ErrorHandling.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ExposureDetection_DidEndPrematurelyReason+ErrorHandling.swift"; sourceTree = "<group>"; };
B1C7EE4524938EB700F1F284 /* ExposureDetection_DidEndPrematurelyReason+ErrorHandlingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "ExposureDetection_DidEndPrematurelyReason+ErrorHandlingTests.swift"; sourceTree = "<group>"; };
B1C7EE472493D97000F1F284 /* RiskProvidingConfigurationManualTriggerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RiskProvidingConfigurationManualTriggerTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -749,6 +751,12 @@
EE70C23B245B09E900AC9B2F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
EE70C23C245B09E900AC9B2F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
EE92A33F245D96DA006B97B0 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = de; path = de.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
EEDD6DF524A4885200BC30D0 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = tr; path = tr.lproj/usage.html; sourceTree = "<group>"; };
EEDD6DF624A4885200BC30D0 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = tr; path = "tr.lproj/privacy-policy.html"; sourceTree = "<group>"; };
EEDD6DF724A4885D00BC30D0 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/LaunchScreen.strings; sourceTree = "<group>"; };
EEDD6DF824A4889D00BC30D0 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
EEDD6DF924A488A500BC30D0 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = "<group>"; };
EEDD6DFA24A488AD00BC30D0 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = tr; path = tr.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
EEF10679246EBF8B009DFB4E /* ResetViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ResetViewController.swift; sourceTree = "<group>"; };
F22C6E242492082B00712A6B /* DynamicTableViewSpaceCellTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DynamicTableViewSpaceCellTests.swift; sourceTree = "<group>"; };
F247572A24838AC8003E1FC5 /* DynamicTableViewControllerRowsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DynamicTableViewControllerRowsTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1098,6 +1106,7 @@
51CE1B2E245F5CFC002CF42A /* HomeViewController.swift */,
5111E7622460BB1500ED6498 /* HomeInteractor.swift */,
51CE1B5424604DD2002CF42A /* HomeLayout.swift */,
B1BFE27124BDE1D500C1181D /* HomeViewController+HowRiskDetectionWorks.swift */,
);
path = Home;
sourceTree = "<group>";
Expand Down Expand Up @@ -2112,6 +2121,7 @@
en,
Base,
de,
tr,
);
mainGroup = 85D759322457048F008175F0;
packageReferences = (
Expand Down Expand Up @@ -2332,6 +2342,7 @@
B11E619C246EE4E9004A056A /* UIFont+DynamicType.swift in Sources */,
71330E4524810A0500EB10F6 /* DynamicTableViewHeader.swift in Sources */,
0DF6BBB5248C04CF007E8B0C /* app_config_attenuation_duration.pb.swift in Sources */,
B1BFE27224BDE1D500C1181D /* HomeViewController+HowRiskDetectionWorks.swift in Sources */,
B1EAEC8B24711884003BE9A2 /* URLSession+Convenience.swift in Sources */,
7154EB4C247E862100A467FF /* ExposureDetectionLoadingCell.swift in Sources */,
A17366552484978A006BE209 /* OnboardingInfoViewControllerUtils.swift in Sources */,
Expand Down Expand Up @@ -2570,6 +2581,7 @@
children = (
13156CFE248C19D000AFC472 /* de */,
13156D00248CDECC00AFC472 /* en */,
EEDD6DF524A4885200BC30D0 /* tr */,
);
name = usage.html;
sourceTree = "<group>";
Expand All @@ -2579,6 +2591,7 @@
children = (
71F5418B248BEDBE006DB793 /* de */,
717D21EA248C072300D9717E /* en */,
EEDD6DF624A4885200BC30D0 /* tr */,
);
name = "privacy-policy.html";
sourceTree = "<group>";
Expand All @@ -2587,6 +2600,7 @@
isa = PBXVariantGroup;
children = (
85D7594D24570491008175F0 /* Base */,
EEDD6DF724A4885D00BC30D0 /* tr */,
);
name = LaunchScreen.storyboard;
sourceTree = "<group>";
Expand All @@ -2596,6 +2610,7 @@
children = (
EE269509248FCB0300BAE234 /* de */,
EE26950B248FCB1600BAE234 /* en */,
EEDD6DF824A4889D00BC30D0 /* tr */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
Expand All @@ -2605,6 +2620,7 @@
children = (
EE70C23B245B09E900AC9B2F /* de */,
EE70C23C245B09E900AC9B2F /* en */,
EEDD6DF924A488A500BC30D0 /* tr */,
);
name = Localizable.strings;
sourceTree = "<group>";
Expand All @@ -2614,6 +2630,7 @@
children = (
EE92A33F245D96DA006B97B0 /* de */,
514C0A09247AEEE200F235F6 /* en */,
EEDD6DFA24A488AD00BC30D0 /* tr */,
);
name = Localizable.stringsdict;
sourceTree = "<group>";
Expand Down Expand Up @@ -2693,7 +2710,7 @@
CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENACommunity.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 0;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = $IPHONE_APP_DEV_TEAM;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Expand All @@ -2709,7 +2726,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.7;
MARKETING_VERSION = 1.1.1;
OTHER_CFLAGS = (
"-DSQLITE_HAS_CODEC",
"-DSQLITE_TEMP_STORE=3",
Expand Down Expand Up @@ -2852,7 +2869,7 @@
CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENA.entitlements";
CODE_SIGN_IDENTITY = $IPHONE_APP_CODE_SIGN_IDENTITY;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 0;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = 523TP53AQF;
GCC_PREPROCESSOR_DEFINITIONS = "SQLITE_HAS_CODEC=1";
INFOPLIST_FILE = ENA/Resources/Info_Testflight.plist;
Expand All @@ -2863,7 +2880,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.7;
MARKETING_VERSION = 1.1.1;
OTHER_CFLAGS = (
"-DSQLITE_HAS_CODEC",
"-DSQLITE_TEMP_STORE=3",
Expand Down Expand Up @@ -3005,7 +3022,7 @@
CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENACommunity.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 0;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = $IPHONE_APP_DEV_TEAM;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Expand All @@ -3020,7 +3037,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.7;
MARKETING_VERSION = 1.1.1;
OTHER_CFLAGS = (
"-DSQLITE_HAS_CODEC",
"-DSQLITE_TEMP_STORE=3",
Expand Down Expand Up @@ -3224,7 +3241,7 @@
CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENATest.entitlements";
CODE_SIGN_IDENTITY = $IPHONE_APP_CODE_SIGN_IDENTITY;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 0;
CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = 523TP53AQF;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Expand All @@ -3239,7 +3256,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.7;
MARKETING_VERSION = 1.1.1;
OTHER_CFLAGS = (
"-DSQLITE_HAS_CODEC",
"-DSQLITE_TEMP_STORE=3",
Expand Down Expand Up @@ -3268,7 +3285,7 @@
CODE_SIGN_ENTITLEMENTS = "${PROJECT}/Resources/ENA.entitlements";
CODE_SIGN_IDENTITY = $IPHONE_APP_CODE_SIGN_IDENTITY;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 0;
CURRENT_PROJECT_VERSION = 3;
GCC_PREPROCESSOR_DEFINITIONS = "SQLITE_HAS_CODEC=1";
INFOPLIST_FILE = ENA/Resources/Info.plist;
IPHONE_APP_CODE_SIGN_IDENTITY = "iPhone Developer";
Expand All @@ -3278,7 +3295,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.7;
MARKETING_VERSION = 1.1.1;
OTHER_CFLAGS = (
"-DSQLITE_HAS_CODEC",
"-DSQLITE_TEMP_STORE=3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
language = "de"
region = "DE"
codeCoverageEnabled = "YES"
onlyGenerateCoverageForSpecifiedTargets = "YES">
<CodeCoverageTargets>
Expand Down Expand Up @@ -69,7 +71,6 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = "de"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
language = "de"
region = "DE"
codeCoverageEnabled = "YES"
onlyGenerateCoverageForSpecifiedTargets = "YES">
<CodeCoverageTargets>
Expand Down Expand Up @@ -55,6 +57,8 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = "de"
region = "DE"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
2 changes: 1 addition & 1 deletion src/xcode/ENA/ENA/Resources/Info_Debug.plist
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<string>de.rki.coronawarnapp-dev</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,49 @@

"ExposureDetection_Button_Refresh" = "Aktualisieren";

/* Active Tracing Section */
"ExposureDetection_ActiveTracingSection_Title" = "Ermittlungszeitraum";
"ExposureDetection_ActiveTracingSection_Subtitle" = "Dieser Zeitraum wird berücksichtigt";

/*
There are two paragraphs in this section. The first one just contains text…
*/
"ExposureDetection_ActiveTracingSection_Text_Paragraph0" = "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.";

/*
… the second paragraph contains two columns. On the left there is our active
tracing indicator. On the right column there is just text that explains what
the indicator shows.

Parameters:
- first: total number of relevant days (usually 14).
- second: the actual number of days with active tracing.
*/

"ExposureDetection_ActiveTracingSection_Text_Paragraph1" = "Für Ihre Risiko-Ermittlung wird nur der Zeitraum der letzten %1$u Tage betrachtet. In diesem Zeitraum war Ihre Risiko-Ermittlung für eine Gesamtdauer von %2$u Tagen aktiv. Ältere Tage werden automatisch gelöscht, da sie aus Sicht des Infektionsschutzes nicht mehr relevant sind.";

/* Exposure Detection Errors */
"ExposureDetectionError_Alert_Title" = "Fehler";

"ExposureDetectionError_Alert_Action_Details" = "Details";

"ExposureDetectionError_Alert_Message" = "Während der Risiko-Ermittlung ist ein Fehler aufgetreten.";

/*
How Risk Detection Works Alert.
First introduced due to EXPOSUREAPP-1738.
The alert only displays a single OK-button. We re-use the localized string
`Alert_ActionOk` for that.
*/

"How_Risk_Detection_Works_Alert_Title" = "Information zur Funktionsweise der Risiko-Ermittlung";

"How_Risk_Detection_Works_Alert_Message" = "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 nur der Zeitraum der letzten %1$u Tage betrachtet.
Ältere Tage werden automatisch gelöscht, da sie aus Sicht des Infektionsschutzes nicht mehr relevant sind.

Weitere Informationen finden Sie in den FAQ.";

/* Settings */
"Settings_StatusActive" = "An";

Expand Down Expand Up @@ -628,7 +664,8 @@
/* Home Low card */
"Home_Risk_Low_Title" = "Niedriges Risiko";

"Home_Risk_Low_SaveDays_Item_Title" = "%@ von %@ Tagen aktiv";
"Home_Risk_Low_SaveDays_Item_Title" = "Risiko-Ermittlung war für %1$u der letzten %2$u Tage aktiv";
"Home_Risk_Low_SaveDays_Item_Title__Permanently_Active" = "Risiko-Ermittlung dauerhaft aktiv";

"Home_Risk_Low_Button" = "Aktualisieren";

Expand Down Expand Up @@ -930,3 +967,11 @@

"ENATanInput_CharacterIndex" = "Zeichen %1$u von %2$u";

/*
Active Tracing Interval Formatting:
The following two entries are used together. If tracing was not active (almost) 14 days
during the last 14 days then `Active_Tracing_Interval_Partially_Active` is used – otherwise
`Active_Tracing_Interval_Partially_Active` will be used.
*/
"Active_Tracing_Interval_Partially_Active" = "Risiko-Ermittlung war für %1$u der letzten %2$u Tage aktiv";
"Active_Tracing_Interval_Permanently_Active" = "Risiko-Ermittlung dauerhaft aktiv";
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,50 @@

"ExposureDetection_Button_Refresh" = "Update";

/* Active Tracing Section */
"ExposureDetection_ActiveTracingSection_Title" = "Period logged";
"ExposureDetection_ActiveTracingSection_Subtitle" = "This period is included in the calculation";

/*
There are two paragraphs in this section. The first one just contains text…
*/
"ExposureDetection_ActiveTracingSection_Text_Paragraph0" = "Your risk of infection can be calculated only for periods during which exposure logging was active. The logging feature should therefore remain active permanently.";

/*
… the second paragraph contains two columns. On the left there is our active
tracing indicator. On the right column there is just text that explains what
the indicator shows.

Parameters:
- first: total number of relevant days (usually 14).
- second: the actual number of days with active tracing.
*/

"ExposureDetection_ActiveTracingSection_Text_Paragraph1" = "Exposure logging covers the last %1$u days. During this time, the logging feature on your device was active for %2$u days. The app automatically deletes older logs, as these are no longer relevant for infection prevention.";

/* Exposure Detection Errors */
"ExposureDetectionError_Alert_Title" = "Error";

"ExposureDetectionError_Alert_Action_Details" = "Details";

"ExposureDetectionError_Alert_Message" = "An error occurred during exposure logging.";


/*
How Risk Detection Works Alert.
First introduced due to EXPOSUREAPP-1738.
The alert only displays a single OK-button. We re-use the localized string
`Alert_ActionOk` for that.
*/

"How_Risk_Detection_Works_Alert_Title" = "Information about exposure logging functionality";

"How_Risk_Detection_Works_Alert_Message" = "Your risk of infection can be calculated only for periods during which exposure logging was active. The logging feature should therefore remain active permanently.
Exposure logging covers the last %1$u days.
The app automatically deletes older logs, as these are no longer relevant for infection prevention.

For further information, please see our FAQ page.";

/* Settings */
"Settings_StatusActive" = "On";

Expand Down Expand Up @@ -627,7 +664,8 @@
/* Home Low card */
"Home_Risk_Low_Title" = "Low Risk";

"Home_Risk_Low_SaveDays_Item_Title" = "%@ of %@ days saved";
"Home_Risk_Low_SaveDays_Item_Title" = "Risk detection was active for %u of %u days";
"Home_Risk_Low_SaveDays_Item_Title__Permanently_Active" = "Risk detection permanently active";

"Home_Risk_Low_Button" = "Update";

Expand Down Expand Up @@ -929,3 +967,11 @@

"ENATanInput_CharacterIndex" = "Character %1$u of %2$u";

/*
Active Tracing Interval Formatting:
The following two entries are used together. If tracing was not active (almost) 14 days
during the last 14 days then `Active_Tracing_Interval_Partially_Active` is used – otherwise
`Active_Tracing_Interval_Partially_Active` will be used.
*/
"Active_Tracing_Interval_Partially_Active" = "Exposure logging was active for %1$u of the last %2$u days.";
"Active_Tracing_Interval_Permanently_Active" = "Exposure logging permanently active";
Loading

0 comments on commit 472abcf

Please sign in to comment.