diff --git a/AvH Plan.xcodeproj/project.pbxproj b/AvH Plan.xcodeproj/project.pbxproj index 267e78f..afc203f 100644 --- a/AvH Plan.xcodeproj/project.pbxproj +++ b/AvH Plan.xcodeproj/project.pbxproj @@ -58,7 +58,6 @@ 589FBD2CE6A9C73CD9B81441 /* Pods-AvH PlanUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AvH PlanUITests.release.xcconfig"; path = "Target Support Files/Pods-AvH PlanUITests/Pods-AvH PlanUITests.release.xcconfig"; sourceTree = ""; }; 74EDE3D8134812AB76BEB988 /* Pods_AvH_PlanUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AvH_PlanUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 7605BB0678C9E27A1D3E9DAA /* Pods_AvH_Plan.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AvH_Plan.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - A920726022E5BAD8001B3D46 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = ""; }; A957A74F22DDC15500E0A2ED /* MenuViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuViewCell.swift; sourceTree = ""; }; A957A75022DDC15500E0A2ED /* MenuViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MenuViewCell.xib; sourceTree = ""; }; A958A92322DF5388007052B0 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; @@ -77,6 +76,7 @@ A96133A32299867A00B541D4 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; A96D4CC722DDE01A006BAB34 /* GeneralPlanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralPlanViewController.swift; sourceTree = ""; }; A96D4CC922DDE184006BAB34 /* PersonalPlanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonalPlanViewController.swift; sourceTree = ""; }; + A989B31122F58D4700353714 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/Main.strings; sourceTree = ""; }; A996BFF322E05AAB00E7BE42 /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Base; path = Base.lproj/Info.plist; sourceTree = ""; }; A996BFFC22E05AAB00E7BE42 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; A996BFFD22E05AAB00E7BE42 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = ""; }; @@ -523,7 +523,7 @@ isa = PBXVariantGroup; children = ( A96133862299867400B541D4 /* Base */, - A920726022E5BAD8001B3D46 /* de */, + A989B31122F58D4700353714 /* de */, ); name = Main.storyboard; sourceTree = ""; diff --git a/AvH Plan/Base.lproj/Main.storyboard b/AvH Plan/Base.lproj/Main.storyboard index a45a8dd..5caacbb 100644 --- a/AvH Plan/Base.lproj/Main.storyboard +++ b/AvH Plan/Base.lproj/Main.storyboard @@ -100,7 +100,7 @@ - + @@ -131,7 +131,7 @@ - + @@ -322,11 +322,11 @@ - + - + @@ -406,6 +406,6 @@ - + diff --git a/AvH Plan/DataFetcher.swift b/AvH Plan/DataFetcher.swift index 58dc01f..505f162 100644 --- a/AvH Plan/DataFetcher.swift +++ b/AvH Plan/DataFetcher.swift @@ -34,8 +34,8 @@ class DataFetcher { func doAsync(do task: String, completionHandler: @escaping (_ substitutions: [Any]) -> ()) { DispatchQueue(label: "work-queue").async { - let foodUrl = "https://djd4rkn355.github.io/food.html" - let url = "https://djd4rkn355.github.io/subst.html" + let foodUrl = "https://djd4rkn355.github.io/food_test.html" + let url = "https://djd4rkn355.github.io/subst_test.html" Alamofire.request(url).responseString { response in if let html = response.result.value { Alamofire.request(foodUrl).responseString { response in diff --git a/AvH Plan/de.lproj/Main.strings b/AvH Plan/de.lproj/Main.strings index f8ae3aa..092587a 100644 --- a/AvH Plan/de.lproj/Main.strings +++ b/AvH Plan/de.lproj/Main.strings @@ -1,4 +1,3 @@ - /* Class = "UITabBarController"; title = "AvH Plan"; ObjectID = "49e-Tb-3d3"; */ "49e-Tb-3d3.title" = "AvH-Plan"; @@ -11,15 +10,9 @@ /* Class = "UILabel"; text = "Label"; ObjectID = "6H8-lj-boN"; */ "6H8-lj-boN.text" = "Label"; -/* Class = "UINavigationItem"; title = "Personal Plan"; ObjectID = "8j4-CR-EDO"; */ -"8j4-CR-EDO.title" = "Dein Plan"; - /* Class = "UINavigationItem"; title = "Customize"; ObjectID = "9Pf-pB-wLS"; */ "9Pf-pB-wLS.title" = "Anpassen"; -/* Class = "UINavigationItem"; title = "Information"; ObjectID = "9lv-eD-jS6"; */ -"9lv-eD-jS6.title" = "Informationen"; - /* Class = "UIViewController"; title = "AvH Plan"; ObjectID = "9pv-A4-QxB"; */ "9pv-A4-QxB.title" = "AvH-Plan"; @@ -30,9 +23,9 @@ "HYG-gj-KYl.title" = "Title"; /* Class = "UITabBarItem"; title = "Menu"; ObjectID = "IfX-2p-YWq"; */ -"IfX-2p-YWq.title" = "Speiseplan"; +"IfX-2p-YWq.title" = "Menü"; -/* Class = "UIBarButtonItem"; title = "Done"; ObjectID = "PWA-cp-z6o"; */ +/* Class = "UIBarButtonItem"; title = "Save"; ObjectID = "PWA-cp-z6o"; */ "PWA-cp-z6o.title" = "Speichern"; /* Class = "UITextField"; accessibilityHint = "Name"; ObjectID = "TpM-Mz-EpI"; */ @@ -41,14 +34,11 @@ /* Class = "UITextField"; placeholder = "Your name"; ObjectID = "TpM-Mz-EpI"; */ "TpM-Mz-EpI.placeholder" = "Dein Name"; -/* Class = "UIBarButtonItem"; title = "Done"; ObjectID = "ZI8-Ec-yYU"; */ +/* Class = "UIBarButtonItem"; title = "Save"; ObjectID = "ZI8-Ec-yYU"; */ "ZI8-Ec-yYU.title" = "Speichern"; -/* Class = "UITabBarItem"; title = "Plan"; ObjectID = "acW-dT-cKf"; */ -"acW-dT-cKf.title" = "Plan"; - -/* Class = "UINavigationItem"; title = "AvH Plan"; ObjectID = "b1q-oE-Z8h"; */ -"b1q-oE-Z8h.title" = "AvH-Plan"; +/* Class = "UITabBarItem"; title = "General"; ObjectID = "acW-dT-cKf"; */ +"acW-dT-cKf.title" = "Allgemein"; /* Class = "UITextField"; accessibilityHint = "Classes"; ObjectID = "bCV-w1-hVY"; */ "bCV-w1-hVY.accessibilityHint" = "Klassen"; @@ -56,20 +46,15 @@ /* Class = "UITextField"; placeholder = "Your classes"; ObjectID = "bCV-w1-hVY"; */ "bCV-w1-hVY.placeholder" = "Deine Klassen"; +/* Class = "UIBarButtonItem"; title = "Customize"; ObjectID = "bae-uC-OAx"; */ +"bae-uC-OAx.title" = "Anpassen"; + /* Class = "UITabBarItem"; title = "Personal"; ObjectID = "cPa-gy-q4n"; */ "cPa-gy-q4n.title" = "Persönlich"; /* Class = "UILabel"; text = "Default plan"; ObjectID = "hkV-XP-jXe"; */ "hkV-XP-jXe.text" = "Standardplan"; -/* Class = "UIBarButtonItem"; title = "Customize"; ObjectID = "iH8-LX-SKF"; */ -"iH8-LX-SKF.title" = "Anpassen"; - -"meV-sG-wBX.title" = "Anpassen"; - -/* Class = "UINavigationItem"; title = "Food Menu"; ObjectID = "mFX-6q-tAs"; */ -"mFX-6q-tAs.title" = "Speiseplan"; - /* Class = "UISegmentedControl"; omP-RH-Hlh.segmentTitles[0] = "General"; ObjectID = "omP-RH-Hlh"; */ "omP-RH-Hlh.segmentTitles[0]" = "Allgemein"; @@ -79,6 +64,5 @@ /* Class = "UILabel"; text = "Custom colours"; ObjectID = "rks-gf-AM4"; */ "rks-gf-AM4.text" = "Benutzerdefinierte Farben"; -"bae-uC-OAx.text" = "Anpassen"; - -"zsF-Jh-U3n.text" = "Anpassen"; +/* Class = "UIBarButtonItem"; title = "Customize"; ObjectID = "zsF-Jh-U3n"; */ +"zsF-Jh-U3n.title" = "Anpassen";