Updated Bel-Air name

JSON/stops.json

@@ -2838,14 +2838,14 @@
             }
         ],
         "longitude": 6.143048,
-        "name": "Bel Air",
+        "name": "Bel-Air",
         "nameTransportAPI": "Genève, Bel-Air",
         "pricingZone": [
             10
         ],
         "sbbId": "8587387",
         "subTitle": "",
-        "title": "Bel Air"
+        "title": "Bel-Air"
     },
     {
         "appId": 647633,

JSON/stops.json.md5

@@ -1 +1 @@
-379ae024a06fca69fba72dd10a205249
+aebf0790ef709b917da31a41f7e5b00a

tpg offline/Disruptions/DisruptionsMonitoringTableViewController.swift

@@ -22,8 +22,11 @@ class DisruptionsMonitoringTableViewController: UITableViewController {
                 let alertController = UIAlertController(title: "Sorry".localized,
                                                         message: "You need to be connected to internet to manage disruptions monitoring.".localized,
                                                         preferredStyle: .alert)
-                alertController.addAction(UIAlertAction(title: "OK".localized, style: .default, handler: { (_) in
-                    self.navigationController?.popViewController(animated: true) }))
+                let action = UIAlertAction(title: "OK".localized, style: .default) { _ in
+                    print("AEE")
+                    self.navigationController?.popToRootViewController(animated: true)
+                }
+                alertController.addAction(action)
                 self.present(alertController, animated: true, completion: nil)
             }
         }
@@ -56,19 +59,21 @@ class DisruptionsMonitoringTableViewController: UITableViewController {
 
         if App.apnsToken == "" {
             let alertController = UIAlertController(title: "Sorry".localized, message: "We need your devices's unique identifier to send you notifications, even if the app is closed (except if the device is off). Check if notifications and background app refresh are allowed.".localized, preferredStyle: .alert)
-            alertController.addAction(UIAlertAction(title: "OK".localized, style: .default, handler: nil))
-            present(alertController, animated: true) {
-                self.navigationController?.popViewController(animated: true)
+            let action = UIAlertAction(title: "OK".localized, style: .default) { _ in
+                self.navigationController?.popToRootViewController(animated: true)
             }
+            alertController.addAction(action)
+            present(alertController, animated: true, completion: nil)
         }
 
         if firstOpeningOfDisruptionsMonitoring == true, App.apnsToken != "" {
             firstOpeningOfDisruptionsMonitoring = false
             let alertController = UIAlertController(title: "Disruptions monitoring".localized, message: "Here, you can choose when you want to monitor the lines you want. If a disruption occured during the monitoring period, we will send you a notification.".localized, preferredStyle: .alert)
-            alertController.addAction(UIAlertAction(title: "OK, thanks".localized, style: .default, handler: nil))
-            present(alertController, animated: true) {
-                self.navigationController?.popViewController(animated: true)
+            let action = UIAlertAction(title: "OK".localized, style: .default) { _ in
+                self.navigationController?.popToRootViewController(animated: true)
             }
+            alertController.addAction(action)
+            present(alertController, animated: true, completion: nil)
         }
 
         title = "Monitoring".localized

tpg offline/Project Requirements/fr.lproj/Localizable.strings

@@ -65,7 +65,7 @@
 "Line %@" = "Ligne %@";
 "Line %@ - %@" = "Ligne %@ - %@";
 "Lines" = "Lignes";
-"Lines history and moral and material support" = "Histoires des lignes et soutient moral et matériel";
+"Lines history and moral and material support" = "Histoires des lignes et soutien moral et matériel";
 "Loading" = "Chargement";
 "Map" = "Plan";
 "Maps" = "Plans";

tpg offline/Routes/RouteMapViewController.swift

@@ -18,6 +18,8 @@ class RouteMapViewController: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
+        guard let mapView = self.mapView else { return }
+
         mapView.delegate = self
         title = "Map".localized
 

tpg offline/Settings/NewFeaturesViewController.swift

@@ -34,7 +34,7 @@ class NewFeaturesViewController: UIViewController {
 
         features.append(Feature(image: #imageLiteral(resourceName: "wifi"), title: "Have you seen this logo?".localized, text: "The tpg have equipped 43 vehicles with Wi-Fi. They will be indicated by this logo in the departures, and, if you are on iOS 11 or higher, you can even connect to it by going into the details of a departure, then in Wi-Fi.".localized))
         features.append(Feature(image: #imageLiteral(resourceName: "moon"), title: "Dark Mode".localized, text: "Now dark mode is available without restarting the application.".localized))
-        features.append(Feature(image: #imageLiteral(resourceName: "filter"), title: "Filter".localized, text: "If you are lost in all these lines, you can now put some in favorites and filter them.".localized))
+        features.append(Feature(image: #imageLiteral(resourceName: "filter"), title: "Filter".localized, text: "If you are lost in all these lines, you can now put some lines in favorites and filter them.".localized))
         features.append(Feature(image: #imageLiteral(resourceName: "tick"), title: "Stability improvements".localized, text: "As always, this version improve stability and removes bugs.".localized))
 
         if let version = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String {