New JSON format for en.json, temporarily removing es.json

JohnCoates · Feb 7, 2019 · 26eb394 · 26eb394
1 parent 0e79032
commit 26eb394
Show file tree

Hide file tree

Showing 7 changed files with 315 additions and 833 deletions.
diff --git a/Aerial.xcodeproj/project.pbxproj b/Aerial.xcodeproj/project.pbxproj
@@ -29,8 +29,6 @@
 		0369985E2196129C00E359D3 /* missingvideos.json in Resources */ = {isa = PBXBuildFile; fileRef = 0369985C2196103300E359D3 /* missingvideos.json */; };
 		03893CB3217749F0008E7125 /* ErrorLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03893CB2217749F0008E7125 /* ErrorLog.swift */; };
 		03893CB4217753AC008E7125 /* ErrorLog.swift in Sources */ = {isa = PBXBuildFile; fileRef = 03893CB2217749F0008E7125 /* ErrorLog.swift */; };
-		038F36AB220489BC000D17EB /* es.json in Resources */ = {isa = PBXBuildFile; fileRef = 038F36AA220489BC000D17EB /* es.json */; };
-		038F36AC220489BC000D17EB /* es.json in Resources */ = {isa = PBXBuildFile; fileRef = 038F36AA220489BC000D17EB /* es.json */; };
 		0393857A2175D4B80040B850 /* AVPlayerViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 039385792175D4B80040B850 /* AVPlayerViewExtension.swift */; };
 		0393857B2175D4B80040B850 /* AVPlayerViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 039385792175D4B80040B850 /* AVPlayerViewExtension.swift */; };
 		0393857C2175D4B80040B850 /* AVPlayerViewExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 039385792175D4B80040B850 /* AVPlayerViewExtension.swift */; };
@@ -106,7 +104,6 @@
 		03510C722185EF76008F74F2 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
 		0369985C2196103300E359D3 /* missingvideos.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = missingvideos.json; sourceTree = "<group>"; };
 		03893CB2217749F0008E7125 /* ErrorLog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorLog.swift; sourceTree = "<group>"; };
-		038F36AA220489BC000D17EB /* es.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = es.json; sourceTree = "<group>"; };
 		039385792175D4B80040B850 /* AVPlayerViewExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVPlayerViewExtension.swift; sourceTree = "<group>"; };
 		03958348217F4416008E8F9C /* Solar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Solar.swift; sourceTree = "<group>"; };
 		0395835121807D1F008E8F9C /* [email protected] */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "[email protected]"; sourceTree = "<group>"; };
@@ -187,7 +184,6 @@
 		033192DF217B77E90073B580 /* Community */ = {
 			isa = PBXGroup;
 			children = (
-				038F36AA220489BC000D17EB /* es.json */,
 				033192E0217B78240073B580 /* en.json */,
 				0369985C2196103300E359D3 /* missingvideos.json */,
 			);
@@ -505,7 +501,6 @@
 				033192E2217B78240073B580 /* en.json in Resources */,
 				FAC36F541BE1756D007F2A20 /* PreferencesWindow.xib in Resources */,
 				FAC36F4E1BE1756D007F2A20 /* icon-day.pdf in Resources */,
-				038F36AC220489BC000D17EB /* es.json in Resources */,
 				0369985E2196129C00E359D3 /* missingvideos.json in Resources */,
 				033D62B0216CAE2C00F3AF83 /* icon-night-dark.pdf in Resources */,
 				0395835621807D1F008E8F9C /* thumbnail.png in Resources */,
@@ -535,7 +530,6 @@
 				033D62AB216CADCD00F3AF83 /* icon-day-dark.pdf in Resources */,
 				0395835321807D1F008E8F9C /* [email protected] in Resources */,
 				0395835521807D1F008E8F9C /* thumbnail.png in Resources */,
-				038F36AB220489BC000D17EB /* es.json in Resources */,
 				033D62AF216CAE2C00F3AF83 /* icon-night-dark.pdf in Resources */,
 				0369985D2196103300E359D3 /* missingvideos.json in Resources */,
 				FAC36F4F1BE1756D007F2A20 /* icon-night.pdf in Resources */,

diff --git a/Aerial/App/Resources/Info.plist b/Aerial/App/Resources/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.4.7beta4</string>
+	<string>1.4.7test8</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/Aerial/Source/Controllers/PreferencesWindowController.swift b/Aerial/Source/Controllers/PreferencesWindowController.swift
@@ -244,13 +244,12 @@ final class PreferencesWindowController: NSWindowController, NSOutlineViewDataSo
 
     // MARK: - Lifecycle
 
-
     // swiftlint:disable:next cyclomatic_complexity
     override func awakeFromNib() {
         super.awakeFromNib()
         sparkleUpdater = SUUpdater.init(for: Bundle(for: PreferencesWindowController.self))
         //sparkleUpdater?.delegate = self
-        
+
         // tmp
         let tm = TimeManagement.sharedInstance
         debugLog("isonbattery")

diff --git a/Aerial/Source/Models/Cache/PoiStringProvider.swift b/Aerial/Source/Models/Cache/PoiStringProvider.swift
@@ -195,11 +195,11 @@ final class PoiStringProvider {
                 return
             }
 
-            let assets = batch["assets"] as! [NSDictionary]
-            for item in assets {
-                let id = item["id"] as! String
-                let name = item["name"] as! String
-                let poi = item["pointsOfInterest"] as? [String: String]
+            for item in batch {
+                let id = item.key as! String
+                let name = (item.value as! NSDictionary)["name"] as! String
+                let poi = (item.value as! NSDictionary)["pointsOfInterest"] as? [String: String]
+
                 communityStrings.append(CommunityStrings(id: id, name: name, poi: poi ?? [:]))
             }
         } catch {