Added translation

Author: Yannick Weiss

Diff for: Alamofire-4.8.2/Alamofire.xcodeproj/project.pbxproj

@@ -248,6 +248,7 @@
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = F8111E2919A95C8B0040E7D1;
 			productRefGroup = F8111E3419A95C8B0040E7D1 /* Products */;

Diff for: MigrosUsage.xcodeproj/project.pbxproj

@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		AC99A474235359B20006DFD2 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = AC99A476235359B20006DFD2 /* InfoPlist.strings */; };
+		AC9A8625234F7D8100E04F6F /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = AC9A8627234F7D8100E04F6F /* Localizable.strings */; };
+		AC9A862F234F80D500E04F6F /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = AC9A8631234F80D500E04F6F /* InfoPlist.strings */; };
 		AC9EB8A822EF587A0010AD0F /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ACA93E7122EF3156001DC560 /* Alamofire.framework */; };
 		AC9EB8C622EF58F00010AD0F /* KeychainSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = AC9EB8B622EF58C90010AD0F /* KeychainSwift.framework */; };
 		AC9EB8D822EF66320010AD0F /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = AC9EB8D722EF66320010AD0F /* Images.xcassets */; };
@@ -90,12 +93,17 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		AC99A475235359B20006DFD2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		AC9A8622234F7B1A00E04F6F /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = "<group>"; };
+		AC9A8626234F7D8100E04F6F /* en */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; fileEncoding = 4; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
+		AC9A8628234F7D8700E04F6F /* de */ = {isa = PBXFileReference; explicitFileType = text.plist.strings; fileEncoding = 4; name = de; path = de.lproj/Localizable.strings; sourceTree = "<group>"; };
+		AC9A8632234F80D800E04F6F /* de */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		AC9A8633234F818500E04F6F /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		AC9EB8A922EF58C90010AD0F /* KeychainSwift.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = KeychainSwift.xcodeproj; path = "keychain-swift-master/KeychainSwift.xcodeproj"; sourceTree = "<group>"; };
 		AC9EB8D722EF66320010AD0F /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		ACA93E1B22EF2092001DC560 /* UsageWidget.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = UsageWidget.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		ACA93E1E22EF2092001DC560 /* TodayViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TodayViewController.swift; sourceTree = "<group>"; };
 		ACA93E2122EF2092001DC560 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/MainInterface.storyboard; sourceTree = "<group>"; };
-		ACA93E2322EF2092001DC560 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		ACA93E2A22EF2218001DC560 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		ACA93E2D22EF2E59001DC560 /* UsageWidget.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = UsageWidget.entitlements; sourceTree = "<group>"; };
 		ACA93E2E22EF2E67001DC560 /* MigrosUsage.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MigrosUsage.entitlements; sourceTree = "<group>"; };
@@ -144,10 +152,12 @@
 		ACA93E1D22EF2092001DC560 /* UsageWidget */ = {
 			isa = PBXGroup;
 			children = (
+				AC9A8633234F818500E04F6F /* Info.plist */,
 				ACA93E2D22EF2E59001DC560 /* UsageWidget.entitlements */,
 				ACA93E1E22EF2092001DC560 /* TodayViewController.swift */,
 				ACA93E2022EF2092001DC560 /* MainInterface.storyboard */,
-				ACA93E2322EF2092001DC560 /* Info.plist */,
+				AC9A8627234F7D8100E04F6F /* Localizable.strings */,
+				AC9A8631234F80D500E04F6F /* InfoPlist.strings */,
 			);
 			path = UsageWidget;
 			sourceTree = "<group>";
@@ -193,6 +203,7 @@
 				ACF18EF022ECC14300B2A751 /* Main.storyboard */,
 				ACF18EF522ECC14600B2A751 /* LaunchScreen.storyboard */,
 				ACF18EF822ECC14600B2A751 /* Info.plist */,
+				AC99A476235359B20006DFD2 /* InfoPlist.strings */,
 				AC9EB8D722EF66320010AD0F /* Images.xcassets */,
 			);
 			path = MigrosUsage;
@@ -283,6 +294,7 @@
 			knownRegions = (
 				en,
 				Base,
+				de,
 			);
 			mainGroup = ACF18EE022ECC14300B2A751;
 			productRefGroup = ACF18EEA22ECC14300B2A751 /* Products */;
@@ -328,6 +340,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				ACA93E2222EF2092001DC560 /* MainInterface.storyboard in Resources */,
+				AC9A862F234F80D500E04F6F /* InfoPlist.strings in Resources */,
+				AC9A8625234F7D8100E04F6F /* Localizable.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -339,6 +353,7 @@
 				AC9EB8D822EF66320010AD0F /* Images.xcassets in Resources */,
 				ACF18EF722ECC14600B2A751 /* LaunchScreen.storyboard in Resources */,
 				ACF18EF222ECC14300B2A751 /* Main.storyboard in Resources */,
+				AC99A474235359B20006DFD2 /* InfoPlist.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -384,6 +399,31 @@
 /* End PBXTargetDependency section */
 
 /* Begin PBXVariantGroup section */
+		AC99A476235359B20006DFD2 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				AC99A475235359B20006DFD2 /* de */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		AC9A8627234F7D8100E04F6F /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				AC9A8626234F7D8100E04F6F /* en */,
+				AC9A8628234F7D8700E04F6F /* de */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
+		AC9A8631234F80D500E04F6F /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				AC9A8632234F80D800E04F6F /* de */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
 		ACA93E2022EF2092001DC560 /* MainInterface.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -396,6 +436,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				ACF18EF122ECC14300B2A751 /* Base */,
+				AC9A8622234F7B1A00E04F6F /* de */,
 			);
 			name = Main.storyboard;
 			sourceTree = "<group>";
@@ -457,6 +498,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -518,6 +560,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";

Diff for: MigrosUsage.xcodeproj/xcshareddata/xcschemes/UsageWidget.xcscheme

@@ -42,8 +42,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -53,14 +51,16 @@
             ReferencedContainer = "container:MigrosUsage.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = ""
       selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      language = "de"
       launchStyle = "0"
+      askForAppToLaunch = "Yes"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
@@ -78,17 +78,6 @@
             ReferencedContainer = "container:MigrosUsage.xcodeproj">
          </BuildableReference>
       </RemoteRunnable>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "ACA93E1A22EF2092001DC560"
-            BuildableName = "UsageWidget.appex"
-            BlueprintName = "UsageWidget"
-            ReferencedContainer = "container:MigrosUsage.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

Diff for: MigrosUsage/ViewController.swift

@@ -14,7 +14,7 @@ class ViewController: UIViewController {
 	override func viewDidAppear(_ animated: Bool) {
 		let keychain = KeychainSwift()
 		if let _ = keychain.get("username") {
-			print("found username")
+			print("found username in Keychain")
 			return
 		}
 		print("username does not exist in keychain")

Diff for: MigrosUsage/de.lproj/InfoPlist.strings

@@ -0,0 +1,3 @@
+// InfoPlist.strings
+
+"CFBundleDisplayName" = "Migros Daten";

Diff for: MigrosUsage/de.lproj/Main.strings

@@ -0,0 +1,15 @@
+
+/* Class = "UILabel"; text = "Password"; ObjectID = "Egb-4q-qgc"; */
+"Egb-4q-qgc.text" = "Passwort";
+
+/* Class = "UIButton"; normalTitle = "Remove Credentials"; ObjectID = "FAM-8G-OgS"; */
+"FAM-8G-OgS.normalTitle" = "Konto enfternen";
+
+/* Class = "UIButton"; normalTitle = "Login"; ObjectID = "TiD-EJ-M6A"; */
+"TiD-EJ-M6A.normalTitle" = "Anmelden";
+
+/* Class = "UILabel"; text = "Username"; ObjectID = "iRu-Ci-mnz"; */
+"iRu-Ci-mnz.text" = "Benutzername";
+
+/* Class = "UILabel"; text = "You can add the Today Widget\n on the Spotlight screen."; ObjectID = "mxA-0w-nEz"; */
+"mxA-0w-nEz.text" = "Sie können das Today Widget hinzufügen.";

Diff for: README.md

@@ -4,6 +4,11 @@ I needed a way to check how much data left on my data plan.
 
 ![screenshot](screenshot.png)
 
+## TODO
+- [ ] Fix Widet on different font sizes (accessibility)
+- [ ] Fix incorrect error messages
+- [ ] Translate widget
+- [ ] Add instructions how to add widget https://support.apple.com/de-de/HT207122
 
 ## Notes on Today Widgets
 * Today Widget uses the Notifications icon

Diff for: UsageWidget/TodayViewController.swift

@@ -21,13 +21,14 @@ class TodayViewController: UIViewController, NCWidgetProviding {
 	}
 
 	func widgetPerformUpdate(completionHandler: (@escaping (NCUpdateResult) -> Void)) {
+		self.label.text = ""
 		spinner.startAnimating()
-		
+				
 		let keychain = KeychainSwift()
 		keychain.accessGroup = "NDJHDNKXD6.dev.yannick.MigrosUsage"
 
 		guard let username = keychain.get("username"), let password = keychain.get("password") else {
-			self.label.text = "Please provide credentials."
+			self.label.text = NSLocalizedString("Please provide credentials.", comment: "")
 			completionHandler(.failed)
 			return
 		}
@@ -74,11 +75,15 @@ class TodayViewController: UIViewController, NCWidgetProviding {
 							let interval = Calendar.current.dateInterval(of: .month, for: Date())!
 							let remainingDays = Calendar.current.dateComponents([.day], from: Date(), to: interval.end).day!
 
-							var l = "Used \(usedMB) of \(totalMB).\n"
+							let percentage = Int(round((usedFloat / totalFloat) * 100))
+							print(percentage)
+							//let l = String(format: "%d Notifications", percentage)
+							
+							var l = "\(percentage)% " // "Used \(usedMB) of \(totalMB).\n"
 							if remainingDays == 0 {
-								l = l + "\(remainingMB) remaining for today."
+								l = l + String(format: NSLocalizedString("usage-today", comment: ""), usedMB, totalMB, remainingMB)
 							} else {
-								l = l + "\(remainingMB) remaining for the next \(remainingDays) Days."
+								l = l + String(format: NSLocalizedString("usage-other", comment: ""), usedMB, totalMB, remainingMB, remainingDays)
 							}
 
 							DispatchQueue.main.async {
@@ -94,8 +99,6 @@ class TodayViewController: UIViewController, NCWidgetProviding {
 				}
 			}
 		}
-		
-		print("widgetPerformUpdate")
 	}
 
 	func extract(from: String, between: String, and: String) -> String {
@@ -108,5 +111,4 @@ class TodayViewController: UIViewController, NCWidgetProviding {
 		}
 		return ""
 	}
-	
 }

Diff for: UsageWidget/de.lproj/InfoPlist.strings

@@ -0,0 +1,3 @@
+// InfoPlist.strings
+
+"CFBundleDisplayName" = "Migros Daten";

Diff for: UsageWidget/de.lproj/Localizable.strings

@@ -0,0 +1,6 @@
+// Localizable.strings
+
+"Getting used data..." = "Hole infos...";
+"Please provide credentials." = "Bitte in der App anmelden.";
+"usage-today" = "gebraucht, %@ von %@. %@ übrig.";
+"usage-other" = "gebraucht, %@ von %@. %@ übrig für die nächsten %d Tage.";

Diff for: UsageWidget/en.lproj/InfoPlist.strings

@@ -0,0 +1,2 @@
+// InfoPlist.strings
+

Diff for: UsageWidget/en.lproj/Localizable.strings

@@ -0,0 +1,6 @@
+// Localizable.strings
+
+"Getting used data..." = "Getting used data...";
+"Please provide credentials." = "Please log-in in the app.";
+"usage-today" = "used %@ of %@. %@ remaining for today.";
+"usage-other" = "used %@ of %@. %@ remaining for the next %d Days.";