passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sort pool groups by localized country/area

This commit is contained in:
Davide De Rosa 2019-04-09 19:10:05 +02:00
parent 20fb1b248f
commit bce7442ad1
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Passepartout/Sources/Services/PoolGroup.swift
View File

@ -30,12 +30,22 @@ public struct PoolGroup: Hashable, Comparable, CustomStringConvertible {
public let area: String? public let area: String?
private var id: String { private let id: String
private let localizedId: String
public init(country: String, area: String?) {
self.country = country
self.area = area
var id = country var id = country
var localizedId = Utils.localizedCountry(country)
if let area = area { if let area = area {
id += area id += area
localizedId += area
} }
return id self.id = id
self.localizedId = localizedId
} }
public func contains(_ pool: Pool) -> Bool { public func contains(_ pool: Pool) -> Bool {
@ -51,7 +61,7 @@ public struct PoolGroup: Hashable, Comparable, CustomStringConvertible {
// MARK: Comparable // MARK: Comparable
public static func <(lhs: PoolGroup, rhs: PoolGroup) -> Bool { public static func <(lhs: PoolGroup, rhs: PoolGroup) -> Bool {
return lhs.id < rhs.id return lhs.localizedId < rhs.localizedId
} }
// MARK: CustomStringConvertible // MARK: CustomStringConvertible