build 6

Author: ik2wxx

CanZE/CanZE.xcodeproj/project.pbxproj

@@ -505,6 +505,7 @@
 			);
 			inputPaths = (
 				"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Resources/DWARF/${TARGET_NAME}",
+				"$(SRCROOT)/$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)",
 			);
 			outputFileListPaths = (
 			);
@@ -823,8 +824,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = CanZE/CanZE.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = USQU9Q295J;
 				INFOPLIST_FILE = "$(SRCROOT)/CanZE/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -833,6 +835,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = lu.fisch.canze;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
@@ -845,8 +848,9 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = CanZE/CanZE.entitlements;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = USQU9Q295J;
 				INFOPLIST_FILE = "$(SRCROOT)/CanZE/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -855,6 +859,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = lu.fisch.canze;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};

CanZE/CanZE/AllDataViewController.swift

@@ -97,7 +97,7 @@ class AllDataViewController: CanZeViewController {
     override func startQueue() {
         if !Globals.shared.deviceIsConnected || !Globals.shared.deviceIsInitialized {
             DispatchQueue.main.async { [self] in
-                view.makeToast("_device not connected")
+                view.makeToast(NSLocalizedString_("Device not connected", comment: ""))
             }
             return
         }

CanZE/CanZE/AppDelegate.swift

@@ -29,5 +29,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         #endif
 
         return true
+        
     }
 }

CanZE/CanZE/AuxBatteryViewController.swift

@@ -62,14 +62,14 @@ class AuxBatteryViewController: CanZeViewController {
         textDcLoad.text = "-"
         label_vehiclestate.text = NSLocalizedString_("label_vehiclestate", comment: "")
         text_vehicle_state.text = "-"
-        label_VoltageUnderLoad.text = NSLocalizedString_("label_VoltageLoad", comment: "")
+        label_VoltageUnderLoad.text = NSLocalizedString_("Voltage under load", comment: "")
         textVoltageUnderLoad.text = "-"
-        label_CurrentUnderLoad.text = NSLocalizedString_("label_CurrentUnderLoad", comment: "")
+        label_CurrentUnderLoad.text = NSLocalizedString_("Current under load", comment: "")
         textCurrentUnderLoad.text = "-"
         label_AuxStatus.text = NSLocalizedString_("label_AuxStatus", comment: "")
         textAuxStatus.text = "-"
 
-        lblGraphTitle.text = "_Voltage, Vehicle state"
+        lblGraphTitle.text = NSLocalizedString_("Voltage, Vehicle state", comment: "")
         lblVoltage.text = "-"
         lblVehicleState.text = "-"
 
@@ -113,7 +113,7 @@ class AuxBatteryViewController: CanZeViewController {
     override func startQueue() {
         if !Globals.shared.deviceIsConnected || !Globals.shared.deviceIsInitialized {
             DispatchQueue.main.async { [self] in
-                view.makeToast("_device not connected")
+                view.makeToast(NSLocalizedString_("Device not connected", comment: ""))
             }
             return
         }

CanZE/CanZE/Base.lproj/Main.storyboard

@@ -67,7 +67,7 @@ class BatteryViewController: CanZeViewController {
         lblGraph_CellVoltages_title.text = NSLocalizedString_("graph_CellVoltages", comment: "")
         lblGraph_ModuleTemperatures_title.text = NSLocalizedString_("graph_ModuleTemperatures", comment: "")
 
-        lblBatterySerial.text = "Serial:"
+        lblBatterySerial.text = "\(NSLocalizedString_("Serial", comment: "")):"
 
         initSocChart()
         initVoltChart()
@@ -146,7 +146,7 @@ class BatteryViewController: CanZeViewController {
     override func startQueue() {
         if !Globals.shared.deviceIsConnected || !Globals.shared.deviceIsInitialized {
             DispatchQueue.main.async { [self] in
-                view.makeToast("_device not connected")
+                view.makeToast(NSLocalizedString_("Device not connected", comment: ""))
             }
             return
         }
@@ -217,7 +217,7 @@ class BatteryViewController: CanZeViewController {
                 }
             case Sid.BatterySerial:
                 if strVal != nil {
-                    lblBatterySerial.text = "Serial: \(strVal!)"
+                    lblBatterySerial.text = "\(NSLocalizedString_("Serial", comment: "")): \(strVal!)"
                 }
             default:
                 if let f = Fields.getInstance.fieldsBySid[sid!] {

CanZE/CanZE/BatteryViewController.swift

@@ -139,7 +139,7 @@ class BrakingViewController: CanZeViewController {
     override func startQueue() {
         if !Globals.shared.deviceIsConnected || !Globals.shared.deviceIsInitialized {
             DispatchQueue.main.async { [self] in
-                view.makeToast("_device not connected")
+                view.makeToast(NSLocalizedString_("Device not connected", comment: ""))
             }
             return
         }

CanZE/CanZE/BrakingViewController.swift

@@ -218,6 +218,9 @@ class CanZeViewController: UIViewController {
 
     func NSLocalizedString_(_ key: String, comment: String) -> String {
         var v = NSLocalizedString(key, comment: "")
+        if v == key {
+            debug("manca traduzione ? \(key)")
+        }
         v = v.replacingOccurrences(of: "u0020", with: " ")
         while v.contains("\\'") {
             v = v.replacingOccurrences(of: "\\'", with: "'")