Kaynağa Gözat

1.修改iOS Apex Drivers国际化。

Pen Li 7 yıl önce
ebeveyn
işleme
df2cea9e68
40 değiştirilmiş dosya ile 1055 ekleme ve 126 silme
  1. 143 36
      Redant Drivers/Apex And Drivers.xcodeproj/project.pbxproj
  2. 69 0
      Redant Drivers/Apex And Drivers/Base.lproj/Localizable.strings
  3. 4 4
      Redant Drivers/Apex And Drivers/Detail/Action Selection/RADetailActionSelectionViewController+TableDelegate.m
  4. 0 0
      Redant Drivers/Apex And Drivers/Detail/Base.lproj/Detail.storyboard
  5. 6 6
      Redant Drivers/Apex And Drivers/Detail/RAOrderDetailViewController+TableViewDataSource.m
  6. 1 1
      Redant Drivers/Apex And Drivers/Detail/RAOrderDetailViewController.m
  7. 36 0
      Redant Drivers/Apex And Drivers/Detail/en.lproj/Detail.strings
  8. 36 0
      Redant Drivers/Apex And Drivers/Detail/zh-Hans.lproj/Detail.strings
  9. 0 0
      Redant Drivers/Apex And Drivers/Filter/Base.lproj/orderFilter.storyboard
  10. 12 0
      Redant Drivers/Apex And Drivers/Filter/en.lproj/orderFilter.strings
  11. 12 0
      Redant Drivers/Apex And Drivers/Filter/zh-Hans.lproj/orderFilter.strings
  12. 16 40
      Redant Drivers/Apex And Drivers/Home/Base.lproj/Home.storyboard
  13. 0 0
      Redant Drivers/Apex And Drivers/Home/Base.lproj/HomeHeader.xib
  14. 1 1
      Redant Drivers/Apex And Drivers/Home/More/RAHomeMoreViewController.m
  15. 1 1
      Redant Drivers/Apex And Drivers/Home/RAHomeHeaderView.m
  16. 17 18
      Redant Drivers/Apex And Drivers/Home/RAHomeViewController.m
  17. 60 0
      Redant Drivers/Apex And Drivers/Home/en.lproj/Home.strings
  18. 36 0
      Redant Drivers/Apex And Drivers/Home/en.lproj/HomeHeader.strings
  19. 60 0
      Redant Drivers/Apex And Drivers/Home/zh-Hans.lproj/Home.strings
  20. 36 0
      Redant Drivers/Apex And Drivers/Home/zh-Hans.lproj/HomeHeader.strings
  21. 0 0
      Redant Drivers/Apex And Drivers/Login/Base.lproj/Login.storyboard
  22. 6 6
      Redant Drivers/Apex And Drivers/Login/LoginViewController.m
  23. 36 0
      Redant Drivers/Apex And Drivers/Login/en.lproj/Login.strings
  24. 36 0
      Redant Drivers/Apex And Drivers/Login/zh-Hans.lproj/Login.strings
  25. 0 0
      Redant Drivers/Apex And Drivers/Message/Base.lproj/message.storyboard
  26. 12 0
      Redant Drivers/Apex And Drivers/Message/en.lproj/message.strings
  27. 12 0
      Redant Drivers/Apex And Drivers/Message/zh-Hans.lproj/message.strings
  28. 4 4
      Redant Drivers/Apex And Drivers/PhotoPreView/RAPhotoPreviewController.m
  29. 4 4
      Redant Drivers/Apex And Drivers/RANavigationController.m
  30. 0 0
      Redant Drivers/Apex And Drivers/Setting/Base.lproj/setting.storyboard
  31. 57 0
      Redant Drivers/Apex And Drivers/Setting/en.lproj/setting.strings
  32. 57 0
      Redant Drivers/Apex And Drivers/Setting/zh-Hans.lproj/setting.strings
  33. 0 0
      Redant Drivers/Apex And Drivers/Update/Base.lproj/Edit.storyboard
  34. 5 5
      Redant Drivers/Apex And Drivers/Update/RAOrderEditViewController.m
  35. 51 0
      Redant Drivers/Apex And Drivers/Update/en.lproj/Edit.strings
  36. 51 0
      Redant Drivers/Apex And Drivers/Update/zh-Hans.lproj/Edit.strings
  37. 88 0
      Redant Drivers/Apex And Drivers/en.lproj/Localizable.strings
  38. 1 0
      Redant Drivers/Apex And Drivers/zh-Hans.lproj/LaunchScreen.strings
  39. 88 0
      Redant Drivers/Apex And Drivers/zh-Hans.lproj/Localizable.strings
  40. 1 0
      Redant Drivers/Apex And Drivers/zh-Hans.lproj/Main.strings

+ 143 - 36
Redant Drivers/Apex And Drivers.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		4205FD4420C0F2C000DB42B4 /* Login.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4205FD4320C0F2C000DB42B4 /* Login.storyboard */; };
 		4205FD4820C0F33500DB42B4 /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4205FD4720C0F33500DB42B4 /* LoginViewController.m */; };
 		4205FD4B20C0F4C400DB42B4 /* RetrievePasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4205FD4A20C0F4C300DB42B4 /* RetrievePasswordViewController.m */; };
 		4205FD5320C0F50C00DB42B4 /* JLCustomerAlertController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4205FD4E20C0F50C00DB42B4 /* JLCustomerAlertController.m */; };
@@ -16,13 +15,11 @@
 		4205FD5820C0F6F100DB42B4 /* RAConvertor.m in Sources */ = {isa = PBXBuildFile; fileRef = 4205FD5720C0F6F100DB42B4 /* RAConvertor.m */; };
 		4205FD5C20C1316200DB42B4 /* RABaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4205FD5B20C1316200DB42B4 /* RABaseViewController.m */; };
 		4205FD6120C135CF00DB42B4 /* RAHomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4205FD6020C135CF00DB42B4 /* RAHomeViewController.m */; };
-		4205FD6320C136F900DB42B4 /* Home.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4205FD6220C136F900DB42B4 /* Home.storyboard */; };
 		4205FD6620C13BF400DB42B4 /* RAOrderCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4205FD6520C13BF400DB42B4 /* RAOrderCell.m */; };
 		4205FD6C20C13E0700DB42B4 /* RAHomeViewController+HomeTableDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4205FD6B20C13E0700DB42B4 /* RAHomeViewController+HomeTableDelegate.m */; };
 		4205FD6F20C13E2700DB42B4 /* RAHomeViewController+HomeTableDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4205FD6E20C13E2700DB42B4 /* RAHomeViewController+HomeTableDataSource.m */; };
 		4205FD7220C1465400DB42B4 /* RAHomeOrderModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4205FD7120C1465400DB42B4 /* RAHomeOrderModel.m */; };
 		420D11022133E02800149B37 /* RAOrderFilterViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 420D11012133E02800149B37 /* RAOrderFilterViewController.m */; };
-		420D11042133E03A00149B37 /* orderFilter.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 420D11032133E03A00149B37 /* orderFilter.storyboard */; };
 		420D11092133EE5D00149B37 /* RAOrderFilterSectionModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 420D11082133EE5D00149B37 /* RAOrderFilterSectionModel.m */; };
 		420D110C2133EED100149B37 /* RAOrderFilterStatusModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 420D110B2133EED100149B37 /* RAOrderFilterStatusModel.m */; };
 		420D110F2133EEE300149B37 /* RAOrderFilterInputModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 420D110E2133EEE300149B37 /* RAOrderFilterInputModel.m */; };
@@ -39,7 +36,6 @@
 		421C417921719F8100835447 /* RALoginBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = 421C417821719F8100835447 /* RALoginBackgroundView.m */; };
 		421C43ED217EEF0600D80B82 /* RAReachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 421C43EC217EEF0600D80B82 /* RAReachability.m */; };
 		422B06BC21743ABE003DA2DA /* NSData+RAImageType.m in Sources */ = {isa = PBXBuildFile; fileRef = 422B06BB21743ABE003DA2DA /* NSData+RAImageType.m */; };
-		422BD95C213CE0F300DF8E89 /* HomeHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = 422BD95B213CE0F300DF8E89 /* HomeHeader.xib */; };
 		422BD95F213CE2E600DF8E89 /* RABadgeNumberView.m in Sources */ = {isa = PBXBuildFile; fileRef = 422BD95E213CE2E600DF8E89 /* RABadgeNumberView.m */; };
 		422DA1C02134FA7D0021BD70 /* RAPresentationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 422DA1BF2134FA7D0021BD70 /* RAPresentationController.m */; };
 		4235FA9A213E0CE9000B6672 /* RADetailMapCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4235FA99213E0CE9000B6672 /* RADetailMapCell.m */; };
@@ -81,7 +77,6 @@
 		4255EC6E20C4E29B00E5DA24 /* RADetailActionSelectionCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4255EC6D20C4E29B00E5DA24 /* RADetailActionSelectionCell.m */; };
 		4255EC7120C4E2EC00E5DA24 /* RADetailActionSelectionModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 4255EC7020C4E2EC00E5DA24 /* RADetailActionSelectionModel.m */; };
 		4255EC7420C5096400E5DA24 /* RAOrderEditViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4255EC7320C5096400E5DA24 /* RAOrderEditViewController.m */; };
-		4255EC7620C5097200E5DA24 /* Edit.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 4255EC7520C5097200E5DA24 /* Edit.storyboard */; };
 		4255EC7920C511E400E5DA24 /* RAOrderEditViewController+TableDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4255EC7820C511E400E5DA24 /* RAOrderEditViewController+TableDataSource.m */; };
 		4255EC7C20C511F000E5DA24 /* RAOrderEditViewController+TableDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4255EC7B20C511F000E5DA24 /* RAOrderEditViewController+TableDelegate.m */; };
 		4255EC8020C518E300E5DA24 /* RAEditScanInputCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4255EC7F20C518E300E5DA24 /* RAEditScanInputCell.m */; };
@@ -114,7 +109,6 @@
 		425B97E220C7BC4A00B35713 /* RAUploadListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 425B97E120C7BC4A00B35713 /* RAUploadListViewController.m */; };
 		425B97E520C7BD3800B35713 /* UIView+Toast.m in Sources */ = {isa = PBXBuildFile; fileRef = 425B97E320C7BD3800B35713 /* UIView+Toast.m */; };
 		425B97E820C7BF4000B35713 /* ApexDriverUploadListVC.m in Sources */ = {isa = PBXBuildFile; fileRef = 425B97E720C7BF4000B35713 /* ApexDriverUploadListVC.m */; };
-		425B97EA20C7BF4E00B35713 /* Upload.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 425B97E920C7BF4E00B35713 /* Upload.storyboard */; };
 		425B97ED20C7C35C00B35713 /* ApexDriverUploadCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 425B97EC20C7C35C00B35713 /* ApexDriverUploadCell.m */; };
 		425F1B6C2138F0470031B2C7 /* RANavigationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 425F1B6B2138F0470031B2C7 /* RANavigationController.m */; };
 		4280034120C0F146004D4F50 /* AESCrypt.m in Sources */ = {isa = PBXBuildFile; fileRef = 4280033920C0F145004D4F50 /* AESCrypt.m */; };
@@ -140,11 +134,8 @@
 		42D187802140BACC00C822C0 /* RAEditRequiredAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D1877F2140BACC00C822C0 /* RAEditRequiredAlert.m */; };
 		42D7B0762147945C0046FE89 /* RASettingViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D7B0752147945C0046FE89 /* RASettingViewController.m */; };
 		42D7B0792147946D0046FE89 /* RAMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D7B0782147946D0046FE89 /* RAMessageViewController.m */; };
-		42D7B07B2147949B0046FE89 /* setting.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42D7B07A2147949B0046FE89 /* setting.storyboard */; };
-		42D7B07D2147953D0046FE89 /* message.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42D7B07C2147953D0046FE89 /* message.storyboard */; };
 		42D8B8A320C2253E001C125F /* fake_order_list.json in Resources */ = {isa = PBXBuildFile; fileRef = 42D8B8A220C2253E001C125F /* fake_order_list.json */; };
 		42D8B8A820C23DD9001C125F /* RAOrderDetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D8B8A720C23DD9001C125F /* RAOrderDetailViewController.m */; };
-		42D8B8AA20C23DF0001C125F /* Detail.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42D8B8A920C23DF0001C125F /* Detail.storyboard */; };
 		42D8B8AE20C245D5001C125F /* RADetailSingleLineCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D8B8AD20C245D5001C125F /* RADetailSingleLineCell.m */; };
 		42D8B8B120C2462D001C125F /* RADetailMultLineCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D8B8B020C2462D001C125F /* RADetailMultLineCell.m */; };
 		42D8B8B420C2463D001C125F /* RADetailLocationCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42D8B8B320C2463D001C125F /* RADetailLocationCell.m */; };
@@ -165,6 +156,15 @@
 		42DCCC3B218155620027A5BB /* RAEditDateModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 42DCCC3A218155620027A5BB /* RAEditDateModel.m */; };
 		42DCCC44218166110027A5BB /* RAEditDateCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42DCCC43218166110027A5BB /* RAEditDateCell.m */; };
 		42DCCC4A21818D2F0027A5BB /* date.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42DCCC4921818D2F0027A5BB /* date.storyboard */; };
+		42DCCC4F2181AA4C0027A5BB /* Login.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42DCCC512181AA4C0027A5BB /* Login.storyboard */; };
+		42DCCC562181AB7C0027A5BB /* Home.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42DCCC582181AB7C0027A5BB /* Home.storyboard */; };
+		42DCCC5D2181AECF0027A5BB /* HomeHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = 42DCCC5F2181AECF0027A5BB /* HomeHeader.xib */; };
+		42DCCC642181AFAD0027A5BB /* setting.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42DCCC662181AFAD0027A5BB /* setting.storyboard */; };
+		42DCCC6B2181B0F50027A5BB /* message.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42DCCC6D2181B0F50027A5BB /* message.storyboard */; };
+		42DCCC722181B13E0027A5BB /* orderFilter.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42DCCC742181B13E0027A5BB /* orderFilter.storyboard */; };
+		42DCCC792181B18A0027A5BB /* Detail.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42DCCC7B2181B18A0027A5BB /* Detail.storyboard */; };
+		42DCCC802181B1D60027A5BB /* Edit.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42DCCC822181B1D60027A5BB /* Edit.storyboard */; };
+		42DCCC902181B2F10027A5BB /* Upload.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42DCCC8F2181B2F10027A5BB /* Upload.storyboard */; };
 		42DFE265213F80AF000213C2 /* RAEmptyDataView.m in Sources */ = {isa = PBXBuildFile; fileRef = 42DFE262213F80AF000213C2 /* RAEmptyDataView.m */; };
 		42DFE266213F80AF000213C2 /* UIScrollView+Empty.m in Sources */ = {isa = PBXBuildFile; fileRef = 42DFE264213F80AF000213C2 /* UIScrollView+Empty.m */; };
 		42DFE26A213F821E000213C2 /* RAEmptyView.m in Sources */ = {isa = PBXBuildFile; fileRef = 42DFE269213F821E000213C2 /* RAEmptyView.m */; };
@@ -198,7 +198,6 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		4205FD4320C0F2C000DB42B4 /* Login.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Login.storyboard; sourceTree = "<group>"; };
 		4205FD4620C0F33500DB42B4 /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
 		4205FD4720C0F33500DB42B4 /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
 		4205FD4920C0F4C300DB42B4 /* RetrievePasswordViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RetrievePasswordViewController.h; sourceTree = "<group>"; };
@@ -215,7 +214,6 @@
 		4205FD5B20C1316200DB42B4 /* RABaseViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RABaseViewController.m; sourceTree = "<group>"; };
 		4205FD5F20C135CF00DB42B4 /* RAHomeViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAHomeViewController.h; sourceTree = "<group>"; };
 		4205FD6020C135CF00DB42B4 /* RAHomeViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAHomeViewController.m; sourceTree = "<group>"; };
-		4205FD6220C136F900DB42B4 /* Home.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Home.storyboard; sourceTree = "<group>"; };
 		4205FD6420C13BF400DB42B4 /* RAOrderCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAOrderCell.h; sourceTree = "<group>"; };
 		4205FD6520C13BF400DB42B4 /* RAOrderCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAOrderCell.m; sourceTree = "<group>"; };
 		4205FD6A20C13E0700DB42B4 /* RAHomeViewController+HomeTableDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RAHomeViewController+HomeTableDelegate.h"; sourceTree = "<group>"; };
@@ -226,7 +224,6 @@
 		4205FD7120C1465400DB42B4 /* RAHomeOrderModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAHomeOrderModel.m; sourceTree = "<group>"; };
 		420D11002133E02800149B37 /* RAOrderFilterViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAOrderFilterViewController.h; sourceTree = "<group>"; };
 		420D11012133E02800149B37 /* RAOrderFilterViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAOrderFilterViewController.m; sourceTree = "<group>"; };
-		420D11032133E03A00149B37 /* orderFilter.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = orderFilter.storyboard; sourceTree = "<group>"; };
 		420D11072133EE5D00149B37 /* RAOrderFilterSectionModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAOrderFilterSectionModel.h; sourceTree = "<group>"; };
 		420D11082133EE5D00149B37 /* RAOrderFilterSectionModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAOrderFilterSectionModel.m; sourceTree = "<group>"; };
 		420D110A2133EED100149B37 /* RAOrderFilterStatusModel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAOrderFilterStatusModel.h; sourceTree = "<group>"; };
@@ -258,7 +255,6 @@
 		421C43EC217EEF0600D80B82 /* RAReachability.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = RAReachability.m; path = ../../common/RAReachability.m; sourceTree = "<group>"; };
 		422B06BA21743ABE003DA2DA /* NSData+RAImageType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSData+RAImageType.h"; sourceTree = "<group>"; };
 		422B06BB21743ABE003DA2DA /* NSData+RAImageType.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSData+RAImageType.m"; sourceTree = "<group>"; };
-		422BD95B213CE0F300DF8E89 /* HomeHeader.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HomeHeader.xib; sourceTree = "<group>"; };
 		422BD95D213CE2E600DF8E89 /* RABadgeNumberView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RABadgeNumberView.h; sourceTree = "<group>"; };
 		422BD95E213CE2E600DF8E89 /* RABadgeNumberView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RABadgeNumberView.m; sourceTree = "<group>"; };
 		422DA1BE2134FA7D0021BD70 /* RAPresentationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAPresentationController.h; sourceTree = "<group>"; };
@@ -339,7 +335,6 @@
 		4255EC7020C4E2EC00E5DA24 /* RADetailActionSelectionModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RADetailActionSelectionModel.m; sourceTree = "<group>"; };
 		4255EC7220C5096400E5DA24 /* RAOrderEditViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAOrderEditViewController.h; sourceTree = "<group>"; };
 		4255EC7320C5096400E5DA24 /* RAOrderEditViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAOrderEditViewController.m; sourceTree = "<group>"; };
-		4255EC7520C5097200E5DA24 /* Edit.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Edit.storyboard; sourceTree = "<group>"; };
 		4255EC7720C511E400E5DA24 /* RAOrderEditViewController+TableDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RAOrderEditViewController+TableDataSource.h"; sourceTree = "<group>"; };
 		4255EC7820C511E400E5DA24 /* RAOrderEditViewController+TableDataSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "RAOrderEditViewController+TableDataSource.m"; sourceTree = "<group>"; };
 		4255EC7A20C511F000E5DA24 /* RAOrderEditViewController+TableDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RAOrderEditViewController+TableDelegate.h"; sourceTree = "<group>"; };
@@ -402,7 +397,6 @@
 		425B97E420C7BD3800B35713 /* UIView+Toast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIView+Toast.h"; path = "../../common/customUI/UIView+Toast.h"; sourceTree = "<group>"; };
 		425B97E620C7BF4000B35713 /* ApexDriverUploadListVC.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ApexDriverUploadListVC.h; sourceTree = "<group>"; };
 		425B97E720C7BF4000B35713 /* ApexDriverUploadListVC.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ApexDriverUploadListVC.m; sourceTree = "<group>"; };
-		425B97E920C7BF4E00B35713 /* Upload.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Upload.storyboard; sourceTree = "<group>"; };
 		425B97EB20C7C35C00B35713 /* ApexDriverUploadCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ApexDriverUploadCell.h; sourceTree = "<group>"; };
 		425B97EC20C7C35C00B35713 /* ApexDriverUploadCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ApexDriverUploadCell.m; sourceTree = "<group>"; };
 		425F1B6A2138F0470031B2C7 /* RANavigationController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RANavigationController.h; sourceTree = "<group>"; };
@@ -452,12 +446,9 @@
 		42D7B0752147945C0046FE89 /* RASettingViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RASettingViewController.m; sourceTree = "<group>"; };
 		42D7B0772147946D0046FE89 /* RAMessageViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAMessageViewController.h; sourceTree = "<group>"; };
 		42D7B0782147946D0046FE89 /* RAMessageViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAMessageViewController.m; sourceTree = "<group>"; };
-		42D7B07A2147949B0046FE89 /* setting.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = setting.storyboard; sourceTree = "<group>"; };
-		42D7B07C2147953D0046FE89 /* message.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = message.storyboard; sourceTree = "<group>"; };
 		42D8B8A220C2253E001C125F /* fake_order_list.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = fake_order_list.json; sourceTree = "<group>"; };
 		42D8B8A620C23DD9001C125F /* RAOrderDetailViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAOrderDetailViewController.h; sourceTree = "<group>"; };
 		42D8B8A720C23DD9001C125F /* RAOrderDetailViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAOrderDetailViewController.m; sourceTree = "<group>"; };
-		42D8B8A920C23DF0001C125F /* Detail.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Detail.storyboard; sourceTree = "<group>"; };
 		42D8B8AC20C245D5001C125F /* RADetailSingleLineCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RADetailSingleLineCell.h; sourceTree = "<group>"; };
 		42D8B8AD20C245D5001C125F /* RADetailSingleLineCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RADetailSingleLineCell.m; sourceTree = "<group>"; };
 		42D8B8AF20C2462D001C125F /* RADetailMultLineCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RADetailMultLineCell.h; sourceTree = "<group>"; };
@@ -496,6 +487,35 @@
 		42DCCC42218166110027A5BB /* RAEditDateCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAEditDateCell.h; sourceTree = "<group>"; };
 		42DCCC43218166110027A5BB /* RAEditDateCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAEditDateCell.m; sourceTree = "<group>"; };
 		42DCCC4921818D2F0027A5BB /* date.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = date.storyboard; sourceTree = "<group>"; };
+		42DCCC4B2181A6470027A5BB /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Main.strings"; sourceTree = "<group>"; };
+		42DCCC4C2181A6470027A5BB /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
+		42DCCC4D2181A6470027A5BB /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		42DCCC4E2181A8130027A5BB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
+		42DCCC502181AA4C0027A5BB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Login.storyboard; sourceTree = "<group>"; };
+		42DCCC532181AA4F0027A5BB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Login.strings; sourceTree = "<group>"; };
+		42DCCC552181AA510027A5BB /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Login.strings"; sourceTree = "<group>"; };
+		42DCCC572181AB7C0027A5BB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Home.storyboard; sourceTree = "<group>"; };
+		42DCCC5A2181AB7E0027A5BB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Home.strings; sourceTree = "<group>"; };
+		42DCCC5C2181AB7F0027A5BB /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Home.strings"; sourceTree = "<group>"; };
+		42DCCC5E2181AECF0027A5BB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/HomeHeader.xib; sourceTree = "<group>"; };
+		42DCCC612181AED10027A5BB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/HomeHeader.strings; sourceTree = "<group>"; };
+		42DCCC632181AED30027A5BB /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/HomeHeader.strings"; sourceTree = "<group>"; };
+		42DCCC652181AFAD0027A5BB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/setting.storyboard; sourceTree = "<group>"; };
+		42DCCC682181AFB00027A5BB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/setting.strings; sourceTree = "<group>"; };
+		42DCCC6A2181AFB20027A5BB /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/setting.strings"; sourceTree = "<group>"; };
+		42DCCC6C2181B0F50027A5BB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/message.storyboard; sourceTree = "<group>"; };
+		42DCCC6F2181B0F70027A5BB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/message.strings; sourceTree = "<group>"; };
+		42DCCC712181B0F90027A5BB /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/message.strings"; sourceTree = "<group>"; };
+		42DCCC732181B13E0027A5BB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/orderFilter.storyboard; sourceTree = "<group>"; };
+		42DCCC762181B1400027A5BB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/orderFilter.strings; sourceTree = "<group>"; };
+		42DCCC782181B1410027A5BB /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/orderFilter.strings"; sourceTree = "<group>"; };
+		42DCCC7A2181B18A0027A5BB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Detail.storyboard; sourceTree = "<group>"; };
+		42DCCC7D2181B18E0027A5BB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Detail.strings; sourceTree = "<group>"; };
+		42DCCC7F2181B18F0027A5BB /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Detail.strings"; sourceTree = "<group>"; };
+		42DCCC812181B1D60027A5BB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Edit.storyboard; sourceTree = "<group>"; };
+		42DCCC842181B1D90027A5BB /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Edit.strings; sourceTree = "<group>"; };
+		42DCCC862181B1DB0027A5BB /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Edit.strings"; sourceTree = "<group>"; };
+		42DCCC8F2181B2F10027A5BB /* Upload.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = Upload.storyboard; sourceTree = "<group>"; };
 		42DFE261213F80AF000213C2 /* RAEmptyDataView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAEmptyDataView.h; sourceTree = "<group>"; };
 		42DFE262213F80AF000213C2 /* RAEmptyDataView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RAEmptyDataView.m; sourceTree = "<group>"; };
 		42DFE263213F80AF000213C2 /* UIScrollView+Empty.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIScrollView+Empty.h"; sourceTree = "<group>"; };
@@ -546,7 +566,7 @@
 			children = (
 				4205FD4920C0F4C300DB42B4 /* RetrievePasswordViewController.h */,
 				4205FD4A20C0F4C300DB42B4 /* RetrievePasswordViewController.m */,
-				4205FD4320C0F2C000DB42B4 /* Login.storyboard */,
+				42DCCC512181AA4C0027A5BB /* Login.storyboard */,
 				4205FD4620C0F33500DB42B4 /* LoginViewController.h */,
 				4205FD4720C0F33500DB42B4 /* LoginViewController.m */,
 				421C417721719F8100835447 /* RALoginBackgroundView.h */,
@@ -602,12 +622,12 @@
 				4205FD6B20C13E0700DB42B4 /* RAHomeViewController+HomeTableDelegate.m */,
 				4205FD6D20C13E2700DB42B4 /* RAHomeViewController+HomeTableDataSource.h */,
 				4205FD6E20C13E2700DB42B4 /* RAHomeViewController+HomeTableDataSource.m */,
-				4205FD6220C136F900DB42B4 /* Home.storyboard */,
+				42DCCC582181AB7C0027A5BB /* Home.storyboard */,
 				4205FD6420C13BF400DB42B4 /* RAOrderCell.h */,
 				4205FD6520C13BF400DB42B4 /* RAOrderCell.m */,
 				4205FD7020C1465400DB42B4 /* RAHomeOrderModel.h */,
 				4205FD7120C1465400DB42B4 /* RAHomeOrderModel.m */,
-				422BD95B213CE0F300DF8E89 /* HomeHeader.xib */,
+				42DCCC5F2181AECF0027A5BB /* HomeHeader.xib */,
 				42DFE26D213FC1B7000213C2 /* RAHomeSectionHeaderView.h */,
 				42DFE26E213FC1B7000213C2 /* RAHomeSectionHeaderView.m */,
 				423EFD1C21465BE00091BAEB /* RAHomeHeaderView.h */,
@@ -627,7 +647,7 @@
 				420D11252133F7E200149B37 /* RAOrderFilterViewController+DataSource.m */,
 				420D11272133F7F600149B37 /* RAOrderFilterViewController+TableDelegate.h */,
 				420D11282133F7F600149B37 /* RAOrderFilterViewController+TableDelegate.m */,
-				420D11032133E03A00149B37 /* orderFilter.storyboard */,
+				42DCCC742181B13E0027A5BB /* orderFilter.storyboard */,
 			);
 			path = Filter;
 			sourceTree = "<group>";
@@ -936,11 +956,11 @@
 		425B97D220C7B7E100B35713 /* Upload */ = {
 			isa = PBXGroup;
 			children = (
+				42DCCC8F2181B2F10027A5BB /* Upload.storyboard */,
 				425B97E020C7BC4A00B35713 /* RAUploadListViewController.h */,
 				425B97E120C7BC4A00B35713 /* RAUploadListViewController.m */,
 				425B97E620C7BF4000B35713 /* ApexDriverUploadListVC.h */,
 				425B97E720C7BF4000B35713 /* ApexDriverUploadListVC.m */,
-				425B97E920C7BF4E00B35713 /* Upload.storyboard */,
 				425B97EB20C7C35C00B35713 /* ApexDriverUploadCell.h */,
 				425B97EC20C7C35C00B35713 /* ApexDriverUploadCell.m */,
 			);
@@ -1052,7 +1072,7 @@
 				4259598B2148FD8200F7DD41 /* RASettingViewController+TableDataSource.m */,
 				4259598D2148FD9200F7DD41 /* RASettingViewController+TableDelegate.h */,
 				4259598E2148FD9200F7DD41 /* RASettingViewController+TableDelegate.m */,
-				42D7B07A2147949B0046FE89 /* setting.storyboard */,
+				42DCCC662181AFAD0027A5BB /* setting.storyboard */,
 			);
 			path = Setting;
 			sourceTree = "<group>";
@@ -1068,7 +1088,7 @@
 				42F624E4214BA4A100B1F012 /* RAMessageViewController+DataSource.m */,
 				42F624E6214BA4AF00B1F012 /* RAMessageViewController+Delegate.h */,
 				42F624E7214BA4AF00B1F012 /* RAMessageViewController+Delegate.m */,
-				42D7B07C2147953D0046FE89 /* message.storyboard */,
+				42DCCC6D2181B0F50027A5BB /* message.storyboard */,
 			);
 			path = Message;
 			sourceTree = "<group>";
@@ -1093,7 +1113,7 @@
 				42D8B8AB20C245A9001C125F /* Cell */,
 				42D8B8A620C23DD9001C125F /* RAOrderDetailViewController.h */,
 				42D8B8A720C23DD9001C125F /* RAOrderDetailViewController.m */,
-				42D8B8A920C23DF0001C125F /* Detail.storyboard */,
+				42DCCC7B2181B18A0027A5BB /* Detail.storyboard */,
 				42D8B8D920C279AA001C125F /* RAOrderDetailViewController+TableViewDataSource.h */,
 				42D8B8DA20C279AA001C125F /* RAOrderDetailViewController+TableViewDataSource.m */,
 				42D8B8DC20C279BA001C125F /* RAOrderDetailViewController+TableViewDelegate.h */,
@@ -1108,7 +1128,7 @@
 				42D1877D2140BA7000C822C0 /* RequiredAlertVC */,
 				4255EC9020C526E600E5DA24 /* Model */,
 				4255EC7D20C518B000E5DA24 /* Cell */,
-				4255EC7520C5097200E5DA24 /* Edit.storyboard */,
+				42DCCC822181B1D60027A5BB /* Edit.storyboard */,
 				4255EC7220C5096400E5DA24 /* RAOrderEditViewController.h */,
 				4255EC7320C5096400E5DA24 /* RAOrderEditViewController.m */,
 				4255EC7720C511E400E5DA24 /* RAOrderEditViewController+TableDataSource.h */,
@@ -1360,6 +1380,7 @@
 			knownRegions = (
 				en,
 				Base,
+				"zh-Hans",
 			);
 			mainGroup = 71EAA32520B9571B002F003C;
 			productRefGroup = 71EAA32F20B9571B002F003C /* Products */;
@@ -1378,26 +1399,26 @@
 			files = (
 				71EAA33E20B95720002F003C /* LaunchScreen.storyboard in Resources */,
 				420D112B2133F98600149B37 /* fake_order_filter.json in Resources */,
-				42D7B07D2147953D0046FE89 /* message.storyboard in Resources */,
-				422BD95C213CE0F300DF8E89 /* HomeHeader.xib in Resources */,
+				42DCCC6B2181B0F50027A5BB /* message.storyboard in Resources */,
+				42DCCC5D2181AECF0027A5BB /* HomeHeader.xib in Resources */,
 				4235FAAB213E255D000B6672 /* signature.storyboard in Resources */,
-				42D7B07B2147949B0046FE89 /* setting.storyboard in Resources */,
+				42DCCC642181AFAD0027A5BB /* setting.storyboard in Resources */,
 				42D8B8A320C2253E001C125F /* fake_order_list.json in Resources */,
-				420D11042133E03A00149B37 /* orderFilter.storyboard in Resources */,
+				42DCCC722181B13E0027A5BB /* orderFilter.storyboard in Resources */,
 				424204E420C65827005AEED9 /* Camera.storyboard in Resources */,
 				42D8B8E020C28755001C125F /* fake_order_detail.json in Resources */,
 				71EAA33B20B95720002F003C /* Assets.xcassets in Resources */,
-				42D8B8AA20C23DF0001C125F /* Detail.storyboard in Resources */,
+				42DCCC792181B18A0027A5BB /* Detail.storyboard in Resources */,
 				4255EC8F20C5260400E5DA24 /* fake_order_edit.json in Resources */,
 				424204DE20C6156E005AEED9 /* QRCode.storyboard in Resources */,
 				424204F020C66D2D005AEED9 /* PhotoPreview.storyboard in Resources */,
 				429CF61C20E0E32E00CE8DAD /* Localizable.strings in Resources */,
 				42810FF320E4CE1200315156 /* fake_more_order.json in Resources */,
 				4280034220C0F146004D4F50 /* LICENSE in Resources */,
-				425B97EA20C7BF4E00B35713 /* Upload.storyboard in Resources */,
-				4255EC7620C5097200E5DA24 /* Edit.storyboard in Resources */,
-				4205FD6320C136F900DB42B4 /* Home.storyboard in Resources */,
-				4205FD4420C0F2C000DB42B4 /* Login.storyboard in Resources */,
+				42DCCC802181B1D60027A5BB /* Edit.storyboard in Resources */,
+				42DCCC902181B2F10027A5BB /* Upload.storyboard in Resources */,
+				42DCCC562181AB7C0027A5BB /* Home.storyboard in Resources */,
+				42DCCC4F2181AA4C0027A5BB /* Login.storyboard in Resources */,
 				42595995214905E400F7DD41 /* setting.json in Resources */,
 				4235FAB8213E581E000B6672 /* Signature.xcassets in Resources */,
 				42DCCC4A21818D2F0027A5BB /* date.storyboard in Resources */,
@@ -1571,14 +1592,97 @@
 			isa = PBXVariantGroup;
 			children = (
 				429CF61F20E0E35D00CE8DAD /* Base */,
+				42DCCC4D2181A6470027A5BB /* zh-Hans */,
+				42DCCC4E2181A8130027A5BB /* en */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";
 		};
+		42DCCC512181AA4C0027A5BB /* Login.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				42DCCC502181AA4C0027A5BB /* Base */,
+				42DCCC532181AA4F0027A5BB /* en */,
+				42DCCC552181AA510027A5BB /* zh-Hans */,
+			);
+			name = Login.storyboard;
+			sourceTree = "<group>";
+		};
+		42DCCC582181AB7C0027A5BB /* Home.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				42DCCC572181AB7C0027A5BB /* Base */,
+				42DCCC5A2181AB7E0027A5BB /* en */,
+				42DCCC5C2181AB7F0027A5BB /* zh-Hans */,
+			);
+			name = Home.storyboard;
+			sourceTree = "<group>";
+		};
+		42DCCC5F2181AECF0027A5BB /* HomeHeader.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				42DCCC5E2181AECF0027A5BB /* Base */,
+				42DCCC612181AED10027A5BB /* en */,
+				42DCCC632181AED30027A5BB /* zh-Hans */,
+			);
+			name = HomeHeader.xib;
+			sourceTree = "<group>";
+		};
+		42DCCC662181AFAD0027A5BB /* setting.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				42DCCC652181AFAD0027A5BB /* Base */,
+				42DCCC682181AFB00027A5BB /* en */,
+				42DCCC6A2181AFB20027A5BB /* zh-Hans */,
+			);
+			name = setting.storyboard;
+			sourceTree = "<group>";
+		};
+		42DCCC6D2181B0F50027A5BB /* message.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				42DCCC6C2181B0F50027A5BB /* Base */,
+				42DCCC6F2181B0F70027A5BB /* en */,
+				42DCCC712181B0F90027A5BB /* zh-Hans */,
+			);
+			name = message.storyboard;
+			sourceTree = "<group>";
+		};
+		42DCCC742181B13E0027A5BB /* orderFilter.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				42DCCC732181B13E0027A5BB /* Base */,
+				42DCCC762181B1400027A5BB /* en */,
+				42DCCC782181B1410027A5BB /* zh-Hans */,
+			);
+			name = orderFilter.storyboard;
+			sourceTree = "<group>";
+		};
+		42DCCC7B2181B18A0027A5BB /* Detail.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				42DCCC7A2181B18A0027A5BB /* Base */,
+				42DCCC7D2181B18E0027A5BB /* en */,
+				42DCCC7F2181B18F0027A5BB /* zh-Hans */,
+			);
+			name = Detail.storyboard;
+			sourceTree = "<group>";
+		};
+		42DCCC822181B1D60027A5BB /* Edit.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				42DCCC812181B1D60027A5BB /* Base */,
+				42DCCC842181B1D90027A5BB /* en */,
+				42DCCC862181B1DB0027A5BB /* zh-Hans */,
+			);
+			name = Edit.storyboard;
+			sourceTree = "<group>";
+		};
 		71EAA33720B9571B002F003C /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
 				71EAA33820B9571B002F003C /* Base */,
+				42DCCC4B2181A6470027A5BB /* zh-Hans */,
 			);
 			name = Main.storyboard;
 			sourceTree = "<group>";
@@ -1587,6 +1691,7 @@
 			isa = PBXVariantGroup;
 			children = (
 				71EAA33D20B95720002F003C /* Base */,
+				42DCCC4C2181A6470027A5BB /* zh-Hans */,
 			);
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";
@@ -1598,6 +1703,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
@@ -1656,6 +1762,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";

+ 69 - 0
Redant Drivers/Apex And Drivers/Base.lproj/Localizable.strings

@@ -5,6 +5,9 @@
   Created by Jack on 2018/6/25.
   Copyright © 2018年 USAI. All rights reserved.
 */
+
+CFBundleDisplayName="Apex & Drivers";
+
 "alert_title_retrieve_success"="Retrieve successfully!!";
 "alert_msg_email_sent"="Email has been sent.";
 "ok"="Ok";
@@ -16,3 +19,69 @@
 "net_error"="Network error, can not access server.";
 "auth_error"="Can not login, user or password may not correct.";
 "ver_low"="Current App version is too low, please update.";
+
+/**
+ NavigatonVC
+ */
+"Message" = "Message";
+"Cancel" = "Cancel";
+"Ok" = "Ok";
+"%@ status changed,view detail?" = "%@ status changed,view detail?";
+
+/**
+ UploadList
+ */
+"Upload List" = "Upload List";
+"Clear" = "Clear";
+"Upload list is empty." = "Upload list is empty.";
+"Clear upload list" = "Clear upload list";
+"Are you sure remove all error/finish task?" = "Are you sure remove all error/finish task?";
+"NO" = "NO";
+"YES" = "YES";
+"Restart" = "Restart";
+"Current Network is not WiFi" = "Current Network is not WiFi";
+"Remove" = "Remove";
+
+/**
+ Photo Preview
+ */
+"delete" = "delete";
+"Are you sure you want to delete it" = "Are you sure you want to delete it";
+
+/**
+ Update
+ */
+"Update" = "Update";
+"Warning" = "Warning";
+"please complete missing field:\n%@" = "please complete missing field:\n%@";
+
+/**
+ Detail
+ */
+"Apple Map" = "Apple Map";
+"Google Map" = "Google Map";
+"the %@ is not done,are you sure to update %@ now?" = "the %@ is not done,are you sure to update %@ now?";
+
+/**
+ Home
+ */
+"New Order" = "New Order";
+"Processing Order" = "Processing Order";
+"Finished Order" = "Finished Order";
+"are you sure to change status to %@" = "are you sure to change status to %@";
+"Unavailable" = "Unavailable";
+"Available" = "Available";
+" and notification permissions" = " and notification permissions";
+" notification permissions" = " notification permissions";
+" location permissions" = " location permissions";
+"you should open" = "you should open";
+
+/**
+ Login
+ */
+"Allow" = "Allow";
+"Always ask" = "Always ask";
+"Reject" = "Reject";
+"Apex & Drivers need background send location" = "Apex & Drivers need background send location";
+"Login" = "Login";
+"ver:%@.A%@" = "ver:%@.A%@";

+ 4 - 4
Redant Drivers/Apex And Drivers/Detail/Action Selection/RADetailActionSelectionViewController+TableDelegate.m

@@ -23,14 +23,14 @@
         
         RADetailActionSelectionModel *currentModel = [self.actions objectAtIndex:0];
         
-        NSString *msg = [NSString stringWithFormat:@"the %@ is not done,are you sure to update %@ now?",currentModel.actionTitle,model.actionTitle];
+        NSString *msg = [NSString localizedStringWithFormat:NSLocalizedString(@"the %@ is not done,are you sure to update %@ now?", nil),currentModel.actionTitle,model.actionTitle];
         
-        UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"Warning" message:msg preferredStyle:UIAlertControllerStyleAlert];
-        UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Warning", nil) message:msg preferredStyle:UIAlertControllerStyleAlert];
+        UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
             
         }];
         
-        UIAlertAction *sureAction = [UIAlertAction actionWithTitle:@"YES" style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
+        UIAlertAction *sureAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"YES", nil) style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
             [self dismissForAction:model];
         }];
         

+ 0 - 0
Redant Drivers/Apex And Drivers/Detail/Detail.storyboard → Redant Drivers/Apex And Drivers/Detail/Base.lproj/Detail.storyboard


+ 6 - 6
Redant Drivers/Apex And Drivers/Detail/RAOrderDetailViewController+TableViewDataSource.m

@@ -175,7 +175,7 @@
     
     if ([[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"comgooglemaps://"]]) {
 
-        UIAlertAction *googleMapAction = [UIAlertAction actionWithTitle:@"Google Map" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        UIAlertAction *googleMapAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Google Map", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
 
             NSString *urlString = [[NSString stringWithFormat:@"comgooglemaps://?q=%@&directionsmode=driving",model.street]
                                    stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLQueryAllowedCharacterSet]];
@@ -191,7 +191,7 @@
         [alertVC addAction:googleMapAction];
     }
     
-    UIAlertAction *appleMapAction = [UIAlertAction actionWithTitle:@"Apple Map" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+    UIAlertAction *appleMapAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Apple Map", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         
         MKMapItem *currentLocation = [MKMapItem mapItemForCurrentLocation];
 //        MKMapItem *toLocation = [[MKMapItem alloc] initWithPlacemark:[[MKPlacemark alloc] initWithCoordinate:CLLocationCoordinate2DMake(37.782652, -122.410126) addressDictionary:nil]];
@@ -208,7 +208,7 @@
     }];
     [alertVC addAction:appleMapAction];
     
-    UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
+    UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil) style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
         
     }];
     [alertVC addAction:cancelAction];
@@ -223,10 +223,10 @@
     if (model.alert) {
         
         UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:model.alertTitle message:model.alertMsg preferredStyle:UIAlertControllerStyleAlert];
-        UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
             
         }];
-        UIAlertAction *yesAction = [UIAlertAction actionWithTitle:@"YES" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        UIAlertAction *yesAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"YES", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
             [self handleActionForModel:model withSubCell:subCell];
         }];
         
@@ -337,7 +337,7 @@
                 } else {
                     // process error
                     NSString *msg = [json objectForKey:@"err_msg"];
-                    [strongSelf showAlertTilte:@"Warning" message:msg];
+                    [strongSelf showAlertTilte:NSLocalizedString(@"Warning", nil) message:msg];
                 }
             }
             

+ 1 - 1
Redant Drivers/Apex And Drivers/Detail/RAOrderDetailViewController.m

@@ -235,7 +235,7 @@
                     // process error
                     NSString *msg = [json objectForKey:@"err_msg"];
 //                    [strongSelf showAlert:msg];
-                    [strongSelf showAlertTilte:@"Warning" message:msg];
+                    [strongSelf showAlertTilte:NSLocalizedString(@"Warning", nil) message:msg];
                 }
             }
             weakSelf.loading = NO;

+ 36 - 0
Redant Drivers/Apex And Drivers/Detail/en.lproj/Detail.strings

@@ -0,0 +1,36 @@
+
+/* Class = "UITextView"; text = "AFS1234568978964"; ObjectID = "339-2d-d83"; */
+"339-2d-d83.text" = "AFS1234568978964";
+
+/* Class = "UITextView"; text = "TRANS PACIFIC CONTAINER SERVICE\nBERTH 30 2800 7TH ST\nOAKLAND,CA"; ObjectID = "5BM-ek-pkN"; */
+"5BM-ek-pkN.text" = "TRANS PACIFIC CONTAINER SERVICE\nBERTH 30 2800 7TH ST\nOAKLAND,CA";
+
+/* Class = "UIButton"; normalTitle = "Accept"; ObjectID = "5xB-Fx-vYR"; */
+"5xB-Fx-vYR.normalTitle" = "Accept";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "DSZ-Hp-4ld"; */
+"DSZ-Hp-4ld.text" = "Label";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "ErT-qT-9u6"; */
+"ErT-qT-9u6.text" = "Label";
+
+/* Class = "UILabel"; text = "Order ID"; ObjectID = "IcX-EB-asg"; */
+"IcX-EB-asg.text" = "Order ID";
+
+/* Class = "UITextView"; text = "TRANS PACIFIC CONTAINER SERVICE\nBERTH 30 2800 7TH ST\nOAKLAND,CA"; ObjectID = "LUn-5q-wvP"; */
+"LUn-5q-wvP.text" = "TRANS PACIFIC CONTAINER SERVICE\nBERTH 30 2800 7TH ST\nOAKLAND,CA";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "M6V-ez-t4d"; */
+"M6V-ez-t4d.text" = "Label";
+
+/* Class = "UITextView"; text = "DEMURRAGE LFD\nTERMINAL PICKUP APPT\nDELIVERY  APPT(setup wiwhse)\nPICKUP ON"; ObjectID = "j9q-8m-bG1"; */
+"j9q-8m-bG1.text" = "DEMURRAGE LFD\nTERMINAL PICKUP APPT\nDELIVERY  APPT(setup wiwhse)\nPICKUP ON";
+
+/* Class = "UILabel"; text = "Pick Up"; ObjectID = "off-5x-hpV"; */
+"off-5x-hpV.text" = "Pick Up";
+
+/* Class = "UIViewController"; title = "Order Detail"; ObjectID = "wYu-98-b8c"; */
+"wYu-98-b8c.title" = "Order Detail";
+
+/* Class = "UILabel"; text = "Pick Up"; ObjectID = "xB6-BK-ueh"; */
+"xB6-BK-ueh.text" = "Pick Up";

+ 36 - 0
Redant Drivers/Apex And Drivers/Detail/zh-Hans.lproj/Detail.strings

@@ -0,0 +1,36 @@
+
+/* Class = "UITextView"; text = "AFS1234568978964"; ObjectID = "339-2d-d83"; */
+"339-2d-d83.text" = "AFS1234568978964";
+
+/* Class = "UITextView"; text = "TRANS PACIFIC CONTAINER SERVICE\nBERTH 30 2800 7TH ST\nOAKLAND,CA"; ObjectID = "5BM-ek-pkN"; */
+"5BM-ek-pkN.text" = "TRANS PACIFIC CONTAINER SERVICE\nBERTH 30 2800 7TH ST\nOAKLAND,CA";
+
+/* Class = "UIButton"; normalTitle = "Accept"; ObjectID = "5xB-Fx-vYR"; */
+"5xB-Fx-vYR.normalTitle" = "Accept";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "DSZ-Hp-4ld"; */
+"DSZ-Hp-4ld.text" = "Label";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "ErT-qT-9u6"; */
+"ErT-qT-9u6.text" = "Label";
+
+/* Class = "UILabel"; text = "Order ID"; ObjectID = "IcX-EB-asg"; */
+"IcX-EB-asg.text" = "Order ID";
+
+/* Class = "UITextView"; text = "TRANS PACIFIC CONTAINER SERVICE\nBERTH 30 2800 7TH ST\nOAKLAND,CA"; ObjectID = "LUn-5q-wvP"; */
+"LUn-5q-wvP.text" = "TRANS PACIFIC CONTAINER SERVICE\nBERTH 30 2800 7TH ST\nOAKLAND,CA";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "M6V-ez-t4d"; */
+"M6V-ez-t4d.text" = "Label";
+
+/* Class = "UITextView"; text = "DEMURRAGE LFD\nTERMINAL PICKUP APPT\nDELIVERY  APPT(setup wiwhse)\nPICKUP ON"; ObjectID = "j9q-8m-bG1"; */
+"j9q-8m-bG1.text" = "DEMURRAGE LFD\nTERMINAL PICKUP APPT\nDELIVERY  APPT(setup wiwhse)\nPICKUP ON";
+
+/* Class = "UILabel"; text = "Pick Up"; ObjectID = "off-5x-hpV"; */
+"off-5x-hpV.text" = "Pick Up";
+
+/* Class = "UIViewController"; title = "Order Detail"; ObjectID = "wYu-98-b8c"; */
+"wYu-98-b8c.title" = "订单详情";
+
+/* Class = "UILabel"; text = "Pick Up"; ObjectID = "xB6-BK-ueh"; */
+"xB6-BK-ueh.text" = "Pick Up";

+ 0 - 0
Redant Drivers/Apex And Drivers/Filter/orderFilter.storyboard → Redant Drivers/Apex And Drivers/Filter/Base.lproj/orderFilter.storyboard


+ 12 - 0
Redant Drivers/Apex And Drivers/Filter/en.lproj/orderFilter.strings

@@ -0,0 +1,12 @@
+
+/* Class = "UIButton"; normalTitle = "Search"; ObjectID = "7Rj-Wx-DTQ"; */
+"7Rj-Wx-DTQ.normalTitle" = "Search";
+
+/* Class = "UIButton"; normalTitle = "To"; ObjectID = "89y-vM-rg0"; */
+"89y-vM-rg0.normalTitle" = "To";
+
+/* Class = "UIButton"; normalTitle = "From"; ObjectID = "Qyi-QK-7XW"; */
+"Qyi-QK-7XW.normalTitle" = "From";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "Y6T-Kp-z23"; */
+"Y6T-Kp-z23.text" = "Label";

+ 12 - 0
Redant Drivers/Apex And Drivers/Filter/zh-Hans.lproj/orderFilter.strings

@@ -0,0 +1,12 @@
+
+/* Class = "UIButton"; normalTitle = "Search"; ObjectID = "7Rj-Wx-DTQ"; */
+"7Rj-Wx-DTQ.normalTitle" = "搜索";
+
+/* Class = "UIButton"; normalTitle = "To"; ObjectID = "89y-vM-rg0"; */
+"89y-vM-rg0.normalTitle" = "结束日期";
+
+/* Class = "UIButton"; normalTitle = "From"; ObjectID = "Qyi-QK-7XW"; */
+"Qyi-QK-7XW.normalTitle" = "开始日期";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "Y6T-Kp-z23"; */
+"Y6T-Kp-z23.text" = "Label";

+ 16 - 40
Redant Drivers/Apex And Drivers/Home/Home.storyboard → Redant Drivers/Apex And Drivers/Home/Base.lproj/Home.storyboard

@@ -52,61 +52,49 @@
                                                             <rect key="frame" x="65" y="34" width="295" height="96"/>
                                                             <subviews>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5/30/2018" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="89d-EX-Krm">
-                                                                    <rect key="frame" x="40" y="69" width="255" height="17"/>
+                                                                    <rect key="frame" x="40" y="69" width="67" height="17"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AFS180530001200" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZZd-1e-a8S">
-                                                                    <rect key="frame" x="72.5" y="0.0" width="222.5" height="17"/>
+                                                                    <rect key="frame" x="72.5" y="0.0" width="125" height="17"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Order No.:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LR1-3j-ccn">
                                                                     <rect key="frame" x="0.0" y="0.0" width="67.5" height="17"/>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="width" constant="67.5" id="IvA-Il-Mqr"/>
-                                                                    </constraints>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Container No.:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="u11-fA-GhG">
                                                                     <rect key="frame" x="0.0" y="22" width="93" height="17"/>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="width" constant="93" id="R8R-j3-Dyr"/>
-                                                                    </constraints>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Pick Up" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Utf-Vm-dJV">
-                                                                    <rect key="frame" x="81.5" y="44" width="213.5" height="17"/>
+                                                                    <rect key="frame" x="81.5" y="44" width="50" height="17"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Date:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KA0-85-9AI">
                                                                     <rect key="frame" x="0.0" y="69" width="35" height="17"/>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="width" constant="35" id="MrT-gb-mPk"/>
-                                                                    </constraints>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TCNU6432476" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ODR-wu-t8u">
-                                                                    <rect key="frame" x="98" y="22" width="197" height="17"/>
+                                                                    <rect key="frame" x="98" y="22" width="98.5" height="17"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Order Type:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NOq-3t-C3T">
                                                                     <rect key="frame" x="0.0" y="44" width="76.5" height="17"/>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="width" constant="76.5" id="WTH-5X-MQE"/>
-                                                                    </constraints>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
@@ -119,19 +107,19 @@
                                                                 <constraint firstItem="KA0-85-9AI" firstAttribute="leading" secondItem="NOq-3t-C3T" secondAttribute="leading" id="7Yw-02-DIX"/>
                                                                 <constraint firstItem="89d-EX-Krm" firstAttribute="centerY" secondItem="KA0-85-9AI" secondAttribute="centerY" id="D4b-WU-0cF"/>
                                                                 <constraint firstItem="u11-fA-GhG" firstAttribute="top" secondItem="LR1-3j-ccn" secondAttribute="bottom" constant="5" id="Ef8-0U-Uuw"/>
+                                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="89d-EX-Krm" secondAttribute="trailing" id="Eh6-LN-3k8"/>
                                                                 <constraint firstItem="ODR-wu-t8u" firstAttribute="centerY" secondItem="u11-fA-GhG" secondAttribute="centerY" id="M8l-JP-Tnv"/>
                                                                 <constraint firstItem="89d-EX-Krm" firstAttribute="leading" secondItem="KA0-85-9AI" secondAttribute="trailing" constant="5" id="Nca-by-zST"/>
                                                                 <constraint firstItem="u11-fA-GhG" firstAttribute="leading" secondItem="LR1-3j-ccn" secondAttribute="leading" id="NrT-iy-oq4"/>
                                                                 <constraint firstItem="Utf-Vm-dJV" firstAttribute="centerY" secondItem="NOq-3t-C3T" secondAttribute="centerY" id="OYF-8T-RWt"/>
                                                                 <constraint firstItem="LR1-3j-ccn" firstAttribute="top" secondItem="0oy-zO-2fZ" secondAttribute="top" id="Tso-pR-fvU"/>
                                                                 <constraint firstItem="NOq-3t-C3T" firstAttribute="top" secondItem="u11-fA-GhG" secondAttribute="bottom" constant="5" id="X97-Qa-oFA"/>
+                                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="ODR-wu-t8u" secondAttribute="trailing" id="XMv-LB-ym1"/>
                                                                 <constraint firstItem="ZZd-1e-a8S" firstAttribute="leading" secondItem="LR1-3j-ccn" secondAttribute="trailing" constant="5" id="f7b-mK-l0a"/>
-                                                                <constraint firstAttribute="trailing" secondItem="ZZd-1e-a8S" secondAttribute="trailing" id="fZQ-md-DKc"/>
-                                                                <constraint firstAttribute="trailing" secondItem="Utf-Vm-dJV" secondAttribute="trailing" id="iCJ-y6-OgK"/>
-                                                                <constraint firstAttribute="trailing" secondItem="ODR-wu-t8u" secondAttribute="trailing" id="o0N-5l-zT6"/>
+                                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="ZZd-1e-a8S" secondAttribute="trailing" id="hFH-ZA-vnV"/>
                                                                 <constraint firstItem="ODR-wu-t8u" firstAttribute="leading" secondItem="u11-fA-GhG" secondAttribute="trailing" constant="5" id="og9-QM-rLE"/>
                                                                 <constraint firstItem="Utf-Vm-dJV" firstAttribute="leading" secondItem="NOq-3t-C3T" secondAttribute="trailing" constant="5" id="rC0-aX-f7h"/>
-                                                                <constraint firstAttribute="trailing" secondItem="89d-EX-Krm" secondAttribute="trailing" id="ujL-u0-85e"/>
+                                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Utf-Vm-dJV" secondAttribute="trailing" id="tfX-Oa-0r3"/>
                                                                 <constraint firstItem="NOq-3t-C3T" firstAttribute="leading" secondItem="u11-fA-GhG" secondAttribute="leading" id="vJA-GJ-7co"/>
                                                                 <constraint firstItem="LR1-3j-ccn" firstAttribute="leading" secondItem="0oy-zO-2fZ" secondAttribute="leading" id="wXZ-Kd-16P"/>
                                                             </constraints>
@@ -255,61 +243,49 @@
                                                             <rect key="frame" x="65" y="34" width="295" height="96"/>
                                                             <subviews>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5/30/2018" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z8k-hS-sOz">
-                                                                    <rect key="frame" x="40" y="69" width="255" height="17"/>
+                                                                    <rect key="frame" x="40" y="69" width="67" height="17"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="AFS180530001200" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hNu-AY-bfS">
-                                                                    <rect key="frame" x="72.5" y="0.0" width="222.5" height="17"/>
+                                                                    <rect key="frame" x="72.5" y="0.0" width="125" height="17"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Order No.:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NwP-AP-5zX">
                                                                     <rect key="frame" x="0.0" y="0.0" width="67.5" height="17"/>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="width" constant="67.5" id="oJK-gi-e2D"/>
-                                                                    </constraints>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Container No.:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yb1-KB-PDL">
                                                                     <rect key="frame" x="0.0" y="22" width="93" height="17"/>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="width" constant="93" id="SJc-mf-6Zm"/>
-                                                                    </constraints>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Pick Up" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="1vU-Ly-MVu">
-                                                                    <rect key="frame" x="81.5" y="44" width="213.5" height="17"/>
+                                                                    <rect key="frame" x="81.5" y="44" width="50" height="17"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Date:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hZL-d6-pXB">
                                                                     <rect key="frame" x="0.0" y="69" width="35" height="17"/>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="width" constant="35" id="F8N-4w-b8K"/>
-                                                                    </constraints>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="TCNU6432476" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kd7-FH-8p2">
-                                                                    <rect key="frame" x="98" y="22" width="197" height="17"/>
+                                                                    <rect key="frame" x="98" y="22" width="98.5" height="17"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Order Type:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FLu-57-E2d">
                                                                     <rect key="frame" x="0.0" y="44" width="76.5" height="17"/>
-                                                                    <constraints>
-                                                                        <constraint firstAttribute="width" constant="76.5" id="gvd-Xg-iLW"/>
-                                                                    </constraints>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <nil key="textColor"/>
                                                                     <nil key="highlightedColor"/>
@@ -319,18 +295,18 @@
                                                             <constraints>
                                                                 <constraint firstItem="hNu-AY-bfS" firstAttribute="leading" secondItem="NwP-AP-5zX" secondAttribute="trailing" constant="5" id="2M1-1N-RWo"/>
                                                                 <constraint firstItem="Z8k-hS-sOz" firstAttribute="centerY" secondItem="hZL-d6-pXB" secondAttribute="centerY" id="4MG-Bk-SRS"/>
-                                                                <constraint firstAttribute="trailing" secondItem="1vU-Ly-MVu" secondAttribute="trailing" id="6Q7-sQ-Ikl"/>
-                                                                <constraint firstAttribute="trailing" secondItem="Kd7-FH-8p2" secondAttribute="trailing" id="K7O-ze-ncq"/>
+                                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="1vU-Ly-MVu" secondAttribute="trailing" id="6Q7-sQ-Ikl"/>
+                                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Kd7-FH-8p2" secondAttribute="trailing" id="K7O-ze-ncq"/>
                                                                 <constraint firstItem="NwP-AP-5zX" firstAttribute="leading" secondItem="iT9-Mg-UwI" secondAttribute="leading" id="TPG-zR-W6W"/>
                                                                 <constraint firstItem="hNu-AY-bfS" firstAttribute="centerY" secondItem="NwP-AP-5zX" secondAttribute="centerY" id="atC-Mc-OOG"/>
                                                                 <constraint firstItem="FLu-57-E2d" firstAttribute="top" secondItem="Yb1-KB-PDL" secondAttribute="bottom" constant="5" id="bng-Aq-2rH"/>
                                                                 <constraint firstItem="Z8k-hS-sOz" firstAttribute="leading" secondItem="hZL-d6-pXB" secondAttribute="trailing" constant="5" id="cLL-Pn-D3i"/>
                                                                 <constraint firstItem="NwP-AP-5zX" firstAttribute="top" secondItem="iT9-Mg-UwI" secondAttribute="top" id="cjh-fB-Lht"/>
-                                                                <constraint firstAttribute="trailing" secondItem="hNu-AY-bfS" secondAttribute="trailing" id="gC7-XZ-BAV"/>
+                                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="hNu-AY-bfS" secondAttribute="trailing" id="gC7-XZ-BAV"/>
                                                                 <constraint firstItem="Yb1-KB-PDL" firstAttribute="leading" secondItem="NwP-AP-5zX" secondAttribute="leading" id="hwV-pI-p5t"/>
                                                                 <constraint firstItem="Kd7-FH-8p2" firstAttribute="centerY" secondItem="Yb1-KB-PDL" secondAttribute="centerY" id="jWq-fh-DVG"/>
                                                                 <constraint firstItem="hZL-d6-pXB" firstAttribute="top" secondItem="FLu-57-E2d" secondAttribute="bottom" constant="8" id="kR1-R1-zlJ"/>
-                                                                <constraint firstAttribute="trailing" secondItem="Z8k-hS-sOz" secondAttribute="trailing" id="pUh-NT-AZf"/>
+                                                                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Z8k-hS-sOz" secondAttribute="trailing" id="pUh-NT-AZf"/>
                                                                 <constraint firstItem="1vU-Ly-MVu" firstAttribute="centerY" secondItem="FLu-57-E2d" secondAttribute="centerY" id="rES-Xz-BEd"/>
                                                                 <constraint firstItem="Kd7-FH-8p2" firstAttribute="leading" secondItem="Yb1-KB-PDL" secondAttribute="trailing" constant="5" id="ra1-Xf-cyr"/>
                                                                 <constraint firstItem="FLu-57-E2d" firstAttribute="leading" secondItem="Yb1-KB-PDL" secondAttribute="leading" id="stZ-rq-Sen"/>

+ 0 - 0
Redant Drivers/Apex And Drivers/Home/HomeHeader.xib → Redant Drivers/Apex And Drivers/Home/Base.lproj/HomeHeader.xib


+ 1 - 1
Redant Drivers/Apex And Drivers/Home/More/RAHomeMoreViewController.m

@@ -238,7 +238,7 @@ typedef enum {
                     // process error
                     NSString *msg = [json objectForKey:@"err_msg"];
 //                    [strongSelf showAlert:msg];
-                    [strongSelf showAlertTilte:@"Warning" message:msg];
+                    [strongSelf showAlertTilte:NSLocalizedString(@"Warning", nil) message:msg];
                 }
             }
             

+ 1 - 1
Redant Drivers/Apex And Drivers/Home/RAHomeHeaderView.m

@@ -103,7 +103,7 @@
 - (void)setAvailabel:(BOOL)availabel {
     _availabel = availabel;
     self.availableBtn.selected = !_availabel;
-    self.availableTitleLabel.text = _availabel ? @"Available" : @"Unavailable";
+    self.availableTitleLabel.text = _availabel ? NSLocalizedString(@"Available", nil) : NSLocalizedString(@"Unavailable", nil);
 }
 
 - (void)setExistNewMessage:(BOOL)existNewMessage {

+ 17 - 18
Redant Drivers/Apex And Drivers/Home/RAHomeViewController.m

@@ -197,29 +197,29 @@
         
         if (!enableLocation | !enableRemoteNotification) {
             
-            NSMutableString *msg = [NSMutableString stringWithString:@"you should open"];
+            NSMutableString *msg = [NSMutableString stringWithString:NSLocalizedString(@"you should open", nil)];
             
             if (!enableLocation) {
-                [msg appendString:@" location permissions"];
+                [msg appendString:NSLocalizedString(@" location permissions", nil)];
             }
             
             if (!enableRemoteNotification) {
                 
                 if (!enableLocation) {
-                    [msg appendString:@" and notification permissions"];
+                    [msg appendString:NSLocalizedString(@" and notification permissions", nil)];
                 } else {
-                    [msg appendString:@" notification permissions"];
+                    [msg appendString:NSLocalizedString(@" notification permissions", nil)];
                 }
             }
             
             dispatch_async(dispatch_get_main_queue(), ^{
                 
-                UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"Warning" message:msg preferredStyle:UIAlertControllerStyleAlert];
-                UIAlertAction *okAction = [UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+                UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Warning", nil) message:msg preferredStyle:UIAlertControllerStyleAlert];
+                UIAlertAction *okAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Ok", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
                     
                     NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
-                    if ([[UIApplication sharedApplication]canOpenURL:url]) {
-                        [[UIApplication sharedApplication]openURL:url];
+                    if ([[UIApplication sharedApplication] canOpenURL:url]) {
+                        [[UIApplication sharedApplication] openURL:url];
                     }
                 }];
                 
@@ -354,7 +354,6 @@
     dispatch_async(dispatch_get_global_queue(0, 0), ^{
        
         NSDictionary *json = [RADataProvider requestOrderList];
-        NSLog(@"home load data");
         
         dispatch_async(dispatch_get_main_queue(), ^{
             
@@ -424,7 +423,7 @@
                     // process error
                     NSString *msg = [json objectForKey:@"err_msg"];
 //                    [strongSelf showAlert:msg];
-                    [strongSelf showAlertTilte:@"Warning" message:msg];
+                    [strongSelf showAlertTilte:NSLocalizedString(@"Warning", nil) message:msg];
                 }
             }
             
@@ -461,7 +460,7 @@
             } else {
                 
                 NSString *msg = [json objectForKey:@"err_msg"];
-                [weakSelf showAlertTilte:@"Warning" message:msg];
+                [weakSelf showAlertTilte:NSLocalizedString(@"Warning", nil) message:msg];
             }
         });
         
@@ -535,14 +534,14 @@
 
 - (void)availableClick:(UIButton *)sender {
     
-    NSString *msg = [NSString stringWithFormat:@"are you sure to change status to %@",self.headerView.availabel ? @"Unavailable" : @"Available"];
-    UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"Warning" message:msg preferredStyle:UIAlertControllerStyleAlert];
+    NSString *msg = [NSString localizedStringWithFormat:NSLocalizedString(@"are you sure to change status to %@", nil),self.headerView.availabel ? NSLocalizedString(@"Unavailable", nil) : NSLocalizedString(@"Available", nil)];
+    UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Warning", nil) message:msg preferredStyle:UIAlertControllerStyleAlert];
     
-    UIAlertAction *yesAction = [UIAlertAction actionWithTitle:@"Yes" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+    UIAlertAction *yesAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"YES", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         [self updateDriverAvailable:!self.headerView.availabel];
     }];
     
-    UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+    UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         
     }];
     
@@ -560,17 +559,17 @@
 
 - (void)newOrderClick:(id)sender {
     
-    [self showMoreControllerWithTitle:@"New Order" Type:RAOrderStatusNew];
+    [self showMoreControllerWithTitle:NSLocalizedString(@"New Order", nil) Type:RAOrderStatusNew];
 }
 
 - (void)processingOrderClick:(id)sender {
     
-    [self showMoreControllerWithTitle:@"Processing Order" Type:RAOrderStatusProcessing];
+    [self showMoreControllerWithTitle:NSLocalizedString(@"Processing Order", nil) Type:RAOrderStatusProcessing];
 }
 
 - (void)finishedOrderClick:(id)sender {
     
-    [self showMoreControllerWithTitle:@"Finished Order" Type:RAOrderStatusFinish];
+    [self showMoreControllerWithTitle:NSLocalizedString(@"Finished Order", nil) Type:RAOrderStatusFinish];
 }
 
 @end

+ 60 - 0
Redant Drivers/Apex And Drivers/Home/en.lproj/Home.strings

@@ -0,0 +1,60 @@
+
+/* Class = "UILabel"; text = "Pick Up"; ObjectID = "1vU-Ly-MVu"; */
+"1vU-Ly-MVu.text" = "Pick Up";
+
+/* Class = "UILabel"; text = "Pickup Order New"; ObjectID = "6qD-i1-tev"; */
+"6qD-i1-tev.text" = "Pickup Order New";
+
+/* Class = "UILabel"; text = "5/30/2018"; ObjectID = "89d-EX-Krm"; */
+"89d-EX-Krm.text" = "5/30/2018";
+
+/* Class = "UILabel"; text = "Order Type:"; ObjectID = "FLu-57-E2d"; */
+"FLu-57-E2d.text" = "Order Type:";
+
+/* Class = "UILabel"; text = "Date:"; ObjectID = "KA0-85-9AI"; */
+"KA0-85-9AI.text" = "Date:";
+
+/* Class = "UILabel"; text = "TCNU6432476"; ObjectID = "Kd7-FH-8p2"; */
+"Kd7-FH-8p2.text" = "TCNU6432476";
+
+/* Class = "UILabel"; text = "Order No.:"; ObjectID = "LR1-3j-ccn"; */
+"LR1-3j-ccn.text" = "Order No.:";
+
+/* Class = "UILabel"; text = "Order Type:"; ObjectID = "NOq-3t-C3T"; */
+"NOq-3t-C3T.text" = "Order Type:";
+
+/* Class = "UILabel"; text = "0"; ObjectID = "NTn-LM-Gkv"; */
+"NTn-LM-Gkv.text" = "0";
+
+/* Class = "UILabel"; text = "Order No.:"; ObjectID = "NwP-AP-5zX"; */
+"NwP-AP-5zX.text" = "Order No.:";
+
+/* Class = "UILabel"; text = "TCNU6432476"; ObjectID = "ODR-wu-t8u"; */
+"ODR-wu-t8u.text" = "TCNU6432476";
+
+/* Class = "UILabel"; text = "Pick Up"; ObjectID = "Utf-Vm-dJV"; */
+"Utf-Vm-dJV.text" = "Pick Up";
+
+/* Class = "UILabel"; text = "Container No.:"; ObjectID = "Yb1-KB-PDL"; */
+"Yb1-KB-PDL.text" = "Container No.:";
+
+/* Class = "UILabel"; text = "5/30/2018"; ObjectID = "Z8k-hS-sOz"; */
+"Z8k-hS-sOz.text" = "5/30/2018";
+
+/* Class = "UILabel"; text = "AFS180530001200"; ObjectID = "ZZd-1e-a8S"; */
+"ZZd-1e-a8S.text" = "AFS180530001200";
+
+/* Class = "UIViewController"; title = "Apex & Driver"; ObjectID = "aAb-fo-i8m"; */
+"aAb-fo-i8m.title" = "Apex & Driver";
+
+/* Class = "UILabel"; text = "AFS180530001200"; ObjectID = "hNu-AY-bfS"; */
+"hNu-AY-bfS.text" = "AFS180530001200";
+
+/* Class = "UILabel"; text = "Date:"; ObjectID = "hZL-d6-pXB"; */
+"hZL-d6-pXB.text" = "Date:";
+
+/* Class = "UILabel"; text = "Container No.:"; ObjectID = "u11-fA-GhG"; */
+"u11-fA-GhG.text" = "Container No.:";
+
+/* Class = "UILabel"; text = "Pickup Order New"; ObjectID = "y2j-9I-xL6"; */
+"y2j-9I-xL6.text" = "Pickup Order New";

+ 36 - 0
Redant Drivers/Apex And Drivers/Home/en.lproj/HomeHeader.strings

@@ -0,0 +1,36 @@
+
+/* Class = "UILabel"; text = "Available"; ObjectID = "Hae-rx-iyX"; */
+"Hae-rx-iyX.text" = "Available";
+
+/* Class = "UIButton"; normalTitle = "More"; ObjectID = "J4X-Vt-JUe"; */
+"J4X-Vt-JUe.normalTitle" = "More";
+
+/* Class = "UILabel"; text = "Setting"; ObjectID = "JIY-pR-ykw"; */
+"JIY-pR-ykw.text" = "Setting";
+
+/* Class = "UILabel"; text = "Message"; ObjectID = "T2T-ct-zc2"; */
+"T2T-ct-zc2.text" = "Message";
+
+/* Class = "UILabel"; text = "121"; ObjectID = "U0M-Uc-xWZ"; */
+"U0M-Uc-xWZ.text" = "121";
+
+/* Class = "UILabel"; text = "5555"; ObjectID = "apL-NL-f18"; */
+"apL-NL-f18.text" = "5555";
+
+/* Class = "UILabel"; text = "Processing"; ObjectID = "ebH-bD-mco"; */
+"ebH-bD-mco.text" = "Processing";
+
+/* Class = "UILabel"; text = "New"; ObjectID = "hNz-uM-4Kh"; */
+"hNz-uM-4Kh.text" = "New";
+
+/* Class = "UILabel"; text = "Sign Out"; ObjectID = "moB-91-AOW"; */
+"moB-91-AOW.text" = "Sign Out";
+
+/* Class = "UILabel"; text = "132"; ObjectID = "vBo-bi-6Qy"; */
+"vBo-bi-6Qy.text" = "132";
+
+/* Class = "UILabel"; text = "Finished"; ObjectID = "xea-9I-xck"; */
+"xea-9I-xck.text" = "Finished";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "zid-Ks-zO5"; */
+"zid-Ks-zO5.text" = "Label";

+ 60 - 0
Redant Drivers/Apex And Drivers/Home/zh-Hans.lproj/Home.strings

@@ -0,0 +1,60 @@
+
+/* Class = "UILabel"; text = "Pick Up"; ObjectID = "1vU-Ly-MVu"; */
+"1vU-Ly-MVu.text" = "Pick Up";
+
+/* Class = "UILabel"; text = "Pickup Order New"; ObjectID = "6qD-i1-tev"; */
+"6qD-i1-tev.text" = "Pickup Order New";
+
+/* Class = "UILabel"; text = "5/30/2018"; ObjectID = "89d-EX-Krm"; */
+"89d-EX-Krm.text" = "5/30/2018";
+
+/* Class = "UILabel"; text = "Order Type:"; ObjectID = "FLu-57-E2d"; */
+"FLu-57-E2d.text" = "订单类型:";
+
+/* Class = "UILabel"; text = "Date:"; ObjectID = "KA0-85-9AI"; */
+"KA0-85-9AI.text" = "日期:";
+
+/* Class = "UILabel"; text = "TCNU6432476"; ObjectID = "Kd7-FH-8p2"; */
+"Kd7-FH-8p2.text" = "TCNU6432476";
+
+/* Class = "UILabel"; text = "Order No.:"; ObjectID = "LR1-3j-ccn"; */
+"LR1-3j-ccn.text" = "订单号:";
+
+/* Class = "UILabel"; text = "Order Type:"; ObjectID = "NOq-3t-C3T"; */
+"NOq-3t-C3T.text" = "订单类型:";
+
+/* Class = "UILabel"; text = "0"; ObjectID = "NTn-LM-Gkv"; */
+"NTn-LM-Gkv.text" = "0";
+
+/* Class = "UILabel"; text = "Order No.:"; ObjectID = "NwP-AP-5zX"; */
+"NwP-AP-5zX.text" = "订单号:";
+
+/* Class = "UILabel"; text = "TCNU6432476"; ObjectID = "ODR-wu-t8u"; */
+"ODR-wu-t8u.text" = "TCNU6432476";
+
+/* Class = "UILabel"; text = "Pick Up"; ObjectID = "Utf-Vm-dJV"; */
+"Utf-Vm-dJV.text" = "Pick Up";
+
+/* Class = "UILabel"; text = "Container No.:"; ObjectID = "Yb1-KB-PDL"; */
+"Yb1-KB-PDL.text" = "货柜号:";
+
+/* Class = "UILabel"; text = "5/30/2018"; ObjectID = "Z8k-hS-sOz"; */
+"Z8k-hS-sOz.text" = "5/30/2018";
+
+/* Class = "UILabel"; text = "AFS180530001200"; ObjectID = "ZZd-1e-a8S"; */
+"ZZd-1e-a8S.text" = "AFS180530001200";
+
+/* Class = "UIViewController"; title = "Apex & Driver"; ObjectID = "aAb-fo-i8m"; */
+"aAb-fo-i8m.title" = "Apex & Driver";
+
+/* Class = "UILabel"; text = "AFS180530001200"; ObjectID = "hNu-AY-bfS"; */
+"hNu-AY-bfS.text" = "AFS180530001200";
+
+/* Class = "UILabel"; text = "Date:"; ObjectID = "hZL-d6-pXB"; */
+"hZL-d6-pXB.text" = "日期:";
+
+/* Class = "UILabel"; text = "Container No.:"; ObjectID = "u11-fA-GhG"; */
+"u11-fA-GhG.text" = "货柜号:";
+
+/* Class = "UILabel"; text = "Pickup Order New"; ObjectID = "y2j-9I-xL6"; */
+"y2j-9I-xL6.text" = "Pickup Order New";

+ 36 - 0
Redant Drivers/Apex And Drivers/Home/zh-Hans.lproj/HomeHeader.strings

@@ -0,0 +1,36 @@
+
+/* Class = "UILabel"; text = "Available"; ObjectID = "Hae-rx-iyX"; */
+"Hae-rx-iyX.text" = "Available";
+
+/* Class = "UIButton"; normalTitle = "More"; ObjectID = "J4X-Vt-JUe"; */
+"J4X-Vt-JUe.normalTitle" = "更多";
+
+/* Class = "UILabel"; text = "Setting"; ObjectID = "JIY-pR-ykw"; */
+"JIY-pR-ykw.text" = "设置";
+
+/* Class = "UILabel"; text = "Message"; ObjectID = "T2T-ct-zc2"; */
+"T2T-ct-zc2.text" = "消息";
+
+/* Class = "UILabel"; text = "121"; ObjectID = "U0M-Uc-xWZ"; */
+"U0M-Uc-xWZ.text" = "121";
+
+/* Class = "UILabel"; text = "5555"; ObjectID = "apL-NL-f18"; */
+"apL-NL-f18.text" = "5555";
+
+/* Class = "UILabel"; text = "Processing"; ObjectID = "ebH-bD-mco"; */
+"ebH-bD-mco.text" = "进行中";
+
+/* Class = "UILabel"; text = "New"; ObjectID = "hNz-uM-4Kh"; */
+"hNz-uM-4Kh.text" = "新订单";
+
+/* Class = "UILabel"; text = "Sign Out"; ObjectID = "moB-91-AOW"; */
+"moB-91-AOW.text" = "退出";
+
+/* Class = "UILabel"; text = "132"; ObjectID = "vBo-bi-6Qy"; */
+"vBo-bi-6Qy.text" = "132";
+
+/* Class = "UILabel"; text = "Finished"; ObjectID = "xea-9I-xck"; */
+"xea-9I-xck.text" = "已完成";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "zid-Ks-zO5"; */
+"zid-Ks-zO5.text" = "Label";

+ 0 - 0
Redant Drivers/Apex And Drivers/Login/Login.storyboard → Redant Drivers/Apex And Drivers/Login/Base.lproj/Login.storyboard


+ 6 - 6
Redant Drivers/Apex And Drivers/Login/LoginViewController.m

@@ -36,7 +36,7 @@
     self.ioffset = 0;
     
     
-    self.title=@"Login";
+    self.title=NSLocalizedString(@"Login", nil);
     
     
     [self.checkSavePassword addTarget:self action:@selector(checkboxClick:) forControlEvents:UIControlEventTouchUpInside];
@@ -49,7 +49,7 @@
     
     NSString* shortNum =[infoDict objectForKey:@"CFBundleShortVersionString"];
     NSString* versionNum =[infoDict objectForKey:@"CFBundleVersion"];
-    versionNum = [NSString stringWithFormat:@"ver:%@.A%@",shortNum,versionNum];
+    versionNum = [NSString localizedStringWithFormat:NSLocalizedString(@"ver:%@.A%@", nil),shortNum,versionNum];
     
     self.verLabel.text = versionNum;
     
@@ -81,17 +81,17 @@
     
     if (RASingleton.sharedInstance.backgroundReportType == RABackgroundReportTypeNone) {
     
-        UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"Warning" message:@"Apex & Drivers need background send location" preferredStyle:UIAlertControllerStyleAlert];
+        UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Warning", nil) message:NSLocalizedString(@"Apex & Drivers need background send location", nil) preferredStyle:UIAlertControllerStyleAlert];
         
-        UIAlertAction *rejectAction = [UIAlertAction actionWithTitle:@"Reject" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        UIAlertAction *rejectAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Reject", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
             RASingleton.sharedInstance.backgroundReportType = RABackgroundReportTypeReject;
         }];
         
-        UIAlertAction *alwaysAction = [UIAlertAction actionWithTitle:@"Always ask" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        UIAlertAction *alwaysAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Always ask", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
             RASingleton.sharedInstance.backgroundReportType = RABackgroundReportTypeAlwaysAsk;
         }];
         
-        UIAlertAction *allowAction = [UIAlertAction actionWithTitle:@"Allow" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        UIAlertAction *allowAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Allow", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
             RASingleton.sharedInstance.backgroundReportType = RABackgroundReportTypeAllow;
         }];
         

+ 36 - 0
Redant Drivers/Apex And Drivers/Login/en.lproj/Login.strings

@@ -0,0 +1,36 @@
+
+/* Class = "UIButton"; normalTitle = "Retrieve password"; ObjectID = "4nB-rd-0CZ"; */
+"4nB-rd-0CZ.normalTitle" = "Retrieve password";
+
+/* Class = "UIButton"; normalTitle = "Ok"; ObjectID = "5lz-8M-zkN"; */
+"5lz-8M-zkN.normalTitle" = "Ok";
+
+/* Class = "UIButton"; normalTitle = "Cancel"; ObjectID = "8vH-Bt-vmC"; */
+"8vH-Bt-vmC.normalTitle" = "Cancel";
+
+/* Class = "UITextField"; placeholder = "Password"; ObjectID = "9gC-X8-VVb"; */
+"9gC-X8-VVb.placeholder" = "Password";
+
+/* Class = "UITextField"; placeholder = "User name"; ObjectID = "NxN-sx-m5j"; */
+"NxN-sx-m5j.placeholder" = "User name";
+
+/* Class = "UITextField"; placeholder = "Email"; ObjectID = "Qyz-eH-lzt"; */
+"Qyz-eH-lzt.placeholder" = "Email";
+
+/* Class = "UIButton"; normalTitle = "Login"; ObjectID = "Qz0-oF-i3d"; */
+"Qz0-oF-i3d.normalTitle" = "Login";
+
+/* Class = "UITextField"; placeholder = "User"; ObjectID = "VlU-9K-g4X"; */
+"VlU-9K-g4X.placeholder" = "User";
+
+/* Class = "UIViewController"; title = "Login"; ObjectID = "bft-hS-tbx"; */
+"bft-hS-tbx.title" = "Login";
+
+/* Class = "UILabel"; text = "ver:A160422"; ObjectID = "hEP-az-ldq"; */
+"hEP-az-ldq.text" = "ver:A160422";
+
+/* Class = "UIButton"; normalTitle = "  Save password"; ObjectID = "vy2-V9-9ML"; */
+"vy2-V9-9ML.normalTitle" = "  Save password";
+
+/* Class = "UILabel"; text = "Retrieve Password"; ObjectID = "z88-in-EvQ"; */
+"z88-in-EvQ.text" = "Retrieve Password";

+ 36 - 0
Redant Drivers/Apex And Drivers/Login/zh-Hans.lproj/Login.strings

@@ -0,0 +1,36 @@
+
+/* Class = "UIButton"; normalTitle = "Retrieve password"; ObjectID = "4nB-rd-0CZ"; */
+"4nB-rd-0CZ.normalTitle" = "找回密码";
+
+/* Class = "UIButton"; normalTitle = "Ok"; ObjectID = "5lz-8M-zkN"; */
+"5lz-8M-zkN.normalTitle" = "确定";
+
+/* Class = "UIButton"; normalTitle = "Cancel"; ObjectID = "8vH-Bt-vmC"; */
+"8vH-Bt-vmC.normalTitle" = "取消";
+
+/* Class = "UITextField"; placeholder = "Password"; ObjectID = "9gC-X8-VVb"; */
+"9gC-X8-VVb.placeholder" = "密码";
+
+/* Class = "UITextField"; placeholder = "User name"; ObjectID = "NxN-sx-m5j"; */
+"NxN-sx-m5j.placeholder" = "用户名";
+
+/* Class = "UITextField"; placeholder = "Email"; ObjectID = "Qyz-eH-lzt"; */
+"Qyz-eH-lzt.placeholder" = "邮箱";
+
+/* Class = "UIButton"; normalTitle = "Login"; ObjectID = "Qz0-oF-i3d"; */
+"Qz0-oF-i3d.normalTitle" = "登陆";
+
+/* Class = "UITextField"; placeholder = "User"; ObjectID = "VlU-9K-g4X"; */
+"VlU-9K-g4X.placeholder" = "用户名";
+
+/* Class = "UIViewController"; title = "Login"; ObjectID = "bft-hS-tbx"; */
+"bft-hS-tbx.title" = "登陆";
+
+/* Class = "UILabel"; text = "ver:A160422"; ObjectID = "hEP-az-ldq"; */
+"hEP-az-ldq.text" = "版本:A160422";
+
+/* Class = "UIButton"; normalTitle = "  Save password"; ObjectID = "vy2-V9-9ML"; */
+"vy2-V9-9ML.normalTitle" = "  保存密码";
+
+/* Class = "UILabel"; text = "Retrieve Password"; ObjectID = "z88-in-EvQ"; */
+"z88-in-EvQ.text" = "找回密码";

+ 0 - 0
Redant Drivers/Apex And Drivers/Message/message.storyboard → Redant Drivers/Apex And Drivers/Message/Base.lproj/message.storyboard


+ 12 - 0
Redant Drivers/Apex And Drivers/Message/en.lproj/message.strings

@@ -0,0 +1,12 @@
+
+/* Class = "UIViewController"; title = "Message"; ObjectID = "5yA-KC-iwJ"; */
+"5yA-KC-iwJ.title" = "Message";
+
+/* Class = "UILabel"; text = "09/13/2018"; ObjectID = "LVR-iU-IbF"; */
+"LVR-iU-IbF.text" = "09/13/2018";
+
+/* Class = "UILabel"; text = "AFS20180530001200"; ObjectID = "Uy9-IU-SO3"; */
+"Uy9-IU-SO3.text" = "AFS20180530001200";
+
+/* Class = "UILabel"; text = "you have a new order"; ObjectID = "zbt-dA-VVv"; */
+"zbt-dA-VVv.text" = "you have a new order";

+ 12 - 0
Redant Drivers/Apex And Drivers/Message/zh-Hans.lproj/message.strings

@@ -0,0 +1,12 @@
+
+/* Class = "UIViewController"; title = "Message"; ObjectID = "5yA-KC-iwJ"; */
+"5yA-KC-iwJ.title" = "消息";
+
+/* Class = "UILabel"; text = "09/13/2018"; ObjectID = "LVR-iU-IbF"; */
+"LVR-iU-IbF.text" = "09/13/2018";
+
+/* Class = "UILabel"; text = "AFS20180530001200"; ObjectID = "Uy9-IU-SO3"; */
+"Uy9-IU-SO3.text" = "AFS20180530001200";
+
+/* Class = "UILabel"; text = "you have a new order"; ObjectID = "zbt-dA-VVv"; */
+"zbt-dA-VVv.text" = "you have a new order";

+ 4 - 4
Redant Drivers/Apex And Drivers/PhotoPreView/RAPhotoPreviewController.m

@@ -50,7 +50,7 @@
 - (void)configureNavigationBar {
     
     if (self.canDelete) {
-        UIBarButtonItem *deleteItem = [[UIBarButtonItem alloc] initWithTitle:@"delete" style:UIBarButtonItemStylePlain target:self action:@selector(deleteActionClick:)];
+        UIBarButtonItem *deleteItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"delete", nil) style:UIBarButtonItemStylePlain target:self action:@selector(deleteActionClick:)];
         self.navigationItem.rightBarButtonItem = deleteItem;
     }
 }
@@ -59,15 +59,15 @@
 
 - (void)deleteActionClick:(UIBarButtonItem *)sender {
     
-    UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:nil message:@"Are you sure you want to delete it" preferredStyle:UIAlertControllerStyleAlert];
+    UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:nil message:NSLocalizedString(@"Are you sure you want to delete it", nil) preferredStyle:UIAlertControllerStyleAlert];
     __weak typeof(self) weakSelf = self;
-    UIAlertAction *yesAction = [UIAlertAction actionWithTitle:@"Yes" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+    UIAlertAction *yesAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"YES", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         if (weakSelf.completion) {
             weakSelf.completion();
         }
         [weakSelf.navigationController popViewControllerAnimated:YES];
     }];
-    UIAlertAction *noAction = [UIAlertAction actionWithTitle:@"No" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+    UIAlertAction *noAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"NO", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
         
     }];
     

+ 4 - 4
Redant Drivers/Apex And Drivers/RANavigationController.m

@@ -129,17 +129,17 @@
         } else {
             NSString *msg = [aps objectForKey:@"message"];
             if (msg.length == 0) {
-                msg = [NSString stringWithFormat:@"%@ status changed,view detail?",orderID];
+                msg = [NSString localizedStringWithFormat:NSLocalizedString(@"%@ status changed,view detail?", nil),orderID];
             }
             
-            UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"Message" message:msg preferredStyle:UIAlertControllerStyleAlert];
+            UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Message", nil) message:msg preferredStyle:UIAlertControllerStyleAlert];
             
-            UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+            UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
                 
             }];
             
             __weak typeof(self) weakSelf = self;
-            UIAlertAction *detailAction = [UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+            UIAlertAction *detailAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Ok", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
                 [weakSelf pushDetailViewControllerForOrderID:orderID type:orderType type2:orderType2 statusNo:statusNo];
             }];
             

+ 0 - 0
Redant Drivers/Apex And Drivers/Setting/setting.storyboard → Redant Drivers/Apex And Drivers/Setting/Base.lproj/setting.storyboard


+ 57 - 0
Redant Drivers/Apex And Drivers/Setting/en.lproj/setting.strings

@@ -0,0 +1,57 @@
+
+/* Class = "UILabel"; text = "Apex & Drivers 1.0"; ObjectID = "0Rt-Xa-P59"; */
+"0Rt-Xa-P59.text" = "Apex & Drivers 1.0";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "7mb-Gz-UK4"; */
+"7mb-Gz-UK4.text" = "Label";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "9Ne-f7-mNd"; */
+"9Ne-f7-mNd.text" = "Label";
+
+/* Class = "UITextField"; placeholder = "Old password *required"; ObjectID = "AGg-Is-zfV"; */
+"AGg-Is-zfV.placeholder" = "Old password *required";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "H3V-Ud-CQM"; */
+"H3V-Ud-CQM.text" = "Label";
+
+/* Class = "UIViewController"; title = "Setting"; ObjectID = "K1Z-ea-fUh"; */
+"K1Z-ea-fUh.title" = "Setting";
+
+/* Class = "UIButton"; normalTitle = "Change"; ObjectID = "NV0-3K-Irh"; */
+"NV0-3K-Irh.normalTitle" = "Change";
+
+/* Class = "UITextView"; text = "redantsupport@united-us.net"; ObjectID = "PVK-zg-HWg"; */
+"PVK-zg-HWg.text" = "redantsupport@united-us.net";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "VQY-CF-Usu"; */
+"VQY-CF-Usu.text" = "Label";
+
+/* Class = "UILabel"; text = "Support:"; ObjectID = "Wiy-uj-wOO"; */
+"Wiy-uj-wOO.text" = "Support:";
+
+/* Class = "UILabel"; text = "Change Password"; ObjectID = "XYO-s8-g1R"; */
+"XYO-s8-g1R.text" = "Change Password";
+
+/* Class = "UITextField"; placeholder = "Confirm new password *required"; ObjectID = "dQK-Xb-iG2"; */
+"dQK-Xb-iG2.placeholder" = "Confirm new password *required";
+
+/* Class = "UILabel"; text = "100M"; ObjectID = "emF-6X-Ajb"; */
+"emF-6X-Ajb.text" = "100M";
+
+/* Class = "UILabel"; text = "Ver:1.0 build 180913"; ObjectID = "gMo-mB-JAI"; */
+"gMo-mB-JAI.text" = "Ver:1.0 build 180913";
+
+/* Class = "UIButton"; normalTitle = "Cancel"; ObjectID = "i90-wQ-C0t"; */
+"i90-wQ-C0t.normalTitle" = "Cancel";
+
+/* Class = "UILabel"; text = "© 2014 United Software Applications, Inc."; ObjectID = "n2h-5Z-NBM"; */
+"n2h-5Z-NBM.text" = "© 2014 United Software Applications, Inc.";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "nn8-Yz-pgL"; */
+"nn8-Yz-pgL.text" = "Label";
+
+/* Class = "UITextField"; placeholder = "New password *required"; ObjectID = "one-j7-LgU"; */
+"one-j7-LgU.placeholder" = "New password *required";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "rXI-of-ag8"; */
+"rXI-of-ag8.text" = "Label";

+ 57 - 0
Redant Drivers/Apex And Drivers/Setting/zh-Hans.lproj/setting.strings

@@ -0,0 +1,57 @@
+
+/* Class = "UILabel"; text = "Apex & Drivers 1.0"; ObjectID = "0Rt-Xa-P59"; */
+"0Rt-Xa-P59.text" = "Apex & Drivers 1.0";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "7mb-Gz-UK4"; */
+"7mb-Gz-UK4.text" = "Label";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "9Ne-f7-mNd"; */
+"9Ne-f7-mNd.text" = "Label";
+
+/* Class = "UITextField"; placeholder = "Old password *required"; ObjectID = "AGg-Is-zfV"; */
+"AGg-Is-zfV.placeholder" = "旧密码(必填)";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "H3V-Ud-CQM"; */
+"H3V-Ud-CQM.text" = "Label";
+
+/* Class = "UIViewController"; title = "Setting"; ObjectID = "K1Z-ea-fUh"; */
+"K1Z-ea-fUh.title" = "设置";
+
+/* Class = "UIButton"; normalTitle = "Change"; ObjectID = "NV0-3K-Irh"; */
+"NV0-3K-Irh.normalTitle" = "修改";
+
+/* Class = "UITextView"; text = "redantsupport@united-us.net"; ObjectID = "PVK-zg-HWg"; */
+"PVK-zg-HWg.text" = "redantsupport@united-us.net";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "VQY-CF-Usu"; */
+"VQY-CF-Usu.text" = "Label";
+
+/* Class = "UILabel"; text = "Support:"; ObjectID = "Wiy-uj-wOO"; */
+"Wiy-uj-wOO.text" = "技术支持:";
+
+/* Class = "UILabel"; text = "Change Password"; ObjectID = "XYO-s8-g1R"; */
+"XYO-s8-g1R.text" = "修改密码";
+
+/* Class = "UITextField"; placeholder = "Confirm new password *required"; ObjectID = "dQK-Xb-iG2"; */
+"dQK-Xb-iG2.placeholder" = "确认密码(必填)";
+
+/* Class = "UILabel"; text = "100M"; ObjectID = "emF-6X-Ajb"; */
+"emF-6X-Ajb.text" = "100M";
+
+/* Class = "UILabel"; text = "Ver:1.0 build 180913"; ObjectID = "gMo-mB-JAI"; */
+"gMo-mB-JAI.text" = "Ver:1.0 build 180913";
+
+/* Class = "UIButton"; normalTitle = "Cancel"; ObjectID = "i90-wQ-C0t"; */
+"i90-wQ-C0t.normalTitle" = "取消";
+
+/* Class = "UILabel"; text = "© 2014 United Software Applications, Inc."; ObjectID = "n2h-5Z-NBM"; */
+"n2h-5Z-NBM.text" = "© 2014 United Software Applications, Inc.";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "nn8-Yz-pgL"; */
+"nn8-Yz-pgL.text" = "Label";
+
+/* Class = "UITextField"; placeholder = "New password *required"; ObjectID = "one-j7-LgU"; */
+"one-j7-LgU.placeholder" = "新密码(必填)";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "rXI-of-ag8"; */
+"rXI-of-ag8.text" = "Label";

+ 0 - 0
Redant Drivers/Apex And Drivers/Update/Edit.storyboard → Redant Drivers/Apex And Drivers/Update/Base.lproj/Edit.storyboard


+ 5 - 5
Redant Drivers/Apex And Drivers/Update/RAOrderEditViewController.m

@@ -190,7 +190,7 @@
 
 - (void)configureNavigationBar {
     
-    UIBarButtonItem *updateItem = [[UIBarButtonItem alloc] initWithTitle:@"Update" style:UIBarButtonItemStylePlain target:self action:@selector(updateBtnClick:)];
+    UIBarButtonItem *updateItem = [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Update", nil) style:UIBarButtonItemStylePlain target:self action:@selector(updateBtnClick:)];
     self.navigationItem.rightBarButtonItem = updateItem;
 }
 
@@ -315,7 +315,7 @@
                     // process error
                     NSString *msg = [json objectForKey:@"err_msg"];
 //                    [strongSelf showAlert:msg];
-                    [strongSelf showAlertTilte:@"Warning" message:msg];
+                    [strongSelf showAlertTilte:NSLocalizedString(@"Warning", nil) message:msg];
                 }
             }
             weakSelf.loading = NO;
@@ -360,7 +360,7 @@
     if (emptyArr.count > 0) {
         
         
-        RAEditRequiredAlert *alertVC = [RAEditRequiredAlert alertWithTile:@"Warning" message:[NSString stringWithFormat:@"please complete missing field:\n%@",[emptyArr componentsJoinedByString:@"\n"]]];
+        RAEditRequiredAlert *alertVC = [RAEditRequiredAlert alertWithTile:NSLocalizedString(@"Warning", nil) message:[NSString localizedStringWithFormat:NSLocalizedString(@"please complete missing field:\n%@", nil),[emptyArr componentsJoinedByString:@"\n"]]];
         
         [self presentViewController:alertVC animated:YES completion:nil];
         return;
@@ -381,7 +381,7 @@
             [hud dismiss:^{
                 
                 NSString *msg = [json objectForKey:@"err_msg"];
-                [weakSelf showAlertTilte:@"Warning" message:msg];
+                [weakSelf showAlertTilte:NSLocalizedString(@"Warning", nil) message:msg];
             }];
         }
         else { // 在线
@@ -414,7 +414,7 @@
                         [hud dismiss:^{
                             
                             NSString *msg = [json objectForKey:@"err_msg"];
-                            [strongSelf showAlertTilte:@"Warning" message:msg];
+                            [strongSelf showAlertTilte:NSLocalizedString(@"Warning", nil) message:msg];
                         }];
                         
                     });

+ 51 - 0
Redant Drivers/Apex And Drivers/Update/en.lproj/Edit.strings

@@ -0,0 +1,51 @@
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "3pu-Ya-6af"; */
+"3pu-Ya-6af.text" = "Label";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "7mL-uV-Ec4"; */
+"7mL-uV-Ec4.text" = "Label";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "877-kV-pfE"; */
+"877-kV-pfE.text" = "Label";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "9KF-7X-fM9"; */
+"9KF-7X-fM9.text" = "Label";
+
+/* Class = "UITextView"; text = "Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda."; ObjectID = "IOP-ZT-bPg"; */
+"IOP-ZT-bPg.text" = "Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.";
+
+/* Class = "UILabel"; text = "*"; ObjectID = "OjZ-5U-5uD"; */
+"OjZ-5U-5uD.text" = "*";
+
+/* Class = "UILabel"; text = "*"; ObjectID = "PXh-An-liI"; */
+"PXh-An-liI.text" = "*";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "Qmw-jO-NVe"; */
+"Qmw-jO-NVe.text" = "Label";
+
+/* Class = "UIButton"; normalTitle = "Ok"; ObjectID = "Rra-Ip-4wb"; */
+"Rra-Ip-4wb.normalTitle" = "Ok";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "Rwu-ro-0dr"; */
+"Rwu-ro-0dr.text" = "Label";
+
+/* Class = "UILabel"; text = "*"; ObjectID = "Top-J1-yJf"; */
+"Top-J1-yJf.text" = "*";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "Urz-aO-cuz"; */
+"Urz-aO-cuz.text" = "Label";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "fYw-WK-y6k"; */
+"fYw-WK-y6k.text" = "Label";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "kSq-7N-B38"; */
+"kSq-7N-B38.text" = "Label";
+
+/* Class = "UILabel"; text = "*"; ObjectID = "oNJ-t7-BbU"; */
+"oNJ-t7-BbU.text" = "*";
+
+/* Class = "UILabel"; text = "*"; ObjectID = "tbt-gp-C5J"; */
+"tbt-gp-C5J.text" = "*";
+
+/* Class = "UILabel"; text = "Warning"; ObjectID = "wal-J9-Hg6"; */
+"wal-J9-Hg6.text" = "Warning";

+ 51 - 0
Redant Drivers/Apex And Drivers/Update/zh-Hans.lproj/Edit.strings

@@ -0,0 +1,51 @@
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "3pu-Ya-6af"; */
+"3pu-Ya-6af.text" = "Label";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "7mL-uV-Ec4"; */
+"7mL-uV-Ec4.text" = "Label";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "877-kV-pfE"; */
+"877-kV-pfE.text" = "Label";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "9KF-7X-fM9"; */
+"9KF-7X-fM9.text" = "Label";
+
+/* Class = "UITextView"; text = "Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda."; ObjectID = "IOP-ZT-bPg"; */
+"IOP-ZT-bPg.text" = "Lorem ipsum dolor sit er elit lamet, consectetaur cillium adipisicing pecu, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Nam liber te conscient to factor tum poen legum odioque civiuda.";
+
+/* Class = "UILabel"; text = "*"; ObjectID = "OjZ-5U-5uD"; */
+"OjZ-5U-5uD.text" = "*";
+
+/* Class = "UILabel"; text = "*"; ObjectID = "PXh-An-liI"; */
+"PXh-An-liI.text" = "*";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "Qmw-jO-NVe"; */
+"Qmw-jO-NVe.text" = "Label";
+
+/* Class = "UIButton"; normalTitle = "Ok"; ObjectID = "Rra-Ip-4wb"; */
+"Rra-Ip-4wb.normalTitle" = "确定";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "Rwu-ro-0dr"; */
+"Rwu-ro-0dr.text" = "Label";
+
+/* Class = "UILabel"; text = "*"; ObjectID = "Top-J1-yJf"; */
+"Top-J1-yJf.text" = "*";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "Urz-aO-cuz"; */
+"Urz-aO-cuz.text" = "Label";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "fYw-WK-y6k"; */
+"fYw-WK-y6k.text" = "Label";
+
+/* Class = "UILabel"; text = "Label"; ObjectID = "kSq-7N-B38"; */
+"kSq-7N-B38.text" = "Label";
+
+/* Class = "UILabel"; text = "*"; ObjectID = "oNJ-t7-BbU"; */
+"oNJ-t7-BbU.text" = "*";
+
+/* Class = "UILabel"; text = "*"; ObjectID = "tbt-gp-C5J"; */
+"tbt-gp-C5J.text" = "*";
+
+/* Class = "UILabel"; text = "Warning"; ObjectID = "wal-J9-Hg6"; */
+"wal-J9-Hg6.text" = "警告";

+ 88 - 0
Redant Drivers/Apex And Drivers/en.lproj/Localizable.strings

@@ -0,0 +1,88 @@
+/* 
+  Localized.strings
+  Apex And Drivers
+
+  Created by Jack on 2018/6/25.
+  Copyright © 2018年 USAI. All rights reserved.
+*/
+
+CFBundleDisplayName="Apex & Drivers";
+
+"alert_title_retrieve_success"="Retrieve successfully!!";
+"alert_msg_email_sent"="Email has been sent.";
+"ok"="Ok";
+"alert_title_error"="Error";
+"alert_msg_failed_retrieve_password"="Failed to retrieve password code %d";
+"alert_msg_uecanotempty"="User&Email can not be empty!";
+"alert_msg_upcanotempty"="User&Password can not be empty!";
+"net_not_available"="Network not available, please check.";
+"net_error"="Network error, can not access server.";
+"auth_error"="Can not login, user or password may not correct.";
+"ver_low"="Current App version is too low, please update.";
+
+
+/**
+ NavigatonVC
+ */
+"Message" = "Message";
+"Cancel" = "Cancel";
+"Ok" = "Ok";
+"%@ status changed,view detail?" = "%@ status changed,view detail?";
+
+/**
+ UploadList
+ */
+"Upload List" = "Upload List";
+"Clear" = "Clear";
+"Upload list is empty." = "Upload list is empty.";
+"Clear upload list" = "Clear upload list";
+"Are you sure remove all error/finish task?" = "Are you sure remove all error/finish task?";
+"NO" = "NO";
+"YES" = "YES";
+"Restart" = "Restart";
+"Current Network is not WiFi" = "Current Network is not WiFi";
+"Remove" = "Remove";
+
+/**
+ Photo Preview
+ */
+"delete" = "delete";
+"Are you sure you want to delete it" = "Are you sure you want to delete it";
+
+/**
+ Update
+ */
+"Update" = "Update";
+"Warning" = "Warning";
+"please complete missing field:\n%@" = "please complete missing field:\n%@";
+
+/**
+ Detail
+ */
+"Apple Map" = "Apple Map";
+"Google Map" = "Google Map";
+"the %@ is not done,are you sure to update %@ now?" = "the %@ is not done,are you sure to update %@ now?";
+
+/**
+ Home
+ */
+"New Order" = "New Order";
+"Processing Order" = "Processing Order";
+"Finished Order" = "Finished Order";
+"are you sure to change status to %@" = "are you sure to change status to %@";
+"Unavailable" = "Unavailable";
+"Available" = "Available";
+" and notification permissions" = " and notification permissions";
+" notification permissions" = " notification permissions";
+" location permissions" = " location permissions";
+"you should open" = "you should open";
+
+/**
+ Login
+ */
+"Allow" = "Allow";
+"Always ask" = "Always ask";
+"Reject" = "Reject";
+"Apex & Drivers need background send location" = "Apex & Drivers need background send location";
+"Login" = "Login";
+"ver:%@.A%@" = "ver:%@.A%@";

+ 1 - 0
Redant Drivers/Apex And Drivers/zh-Hans.lproj/LaunchScreen.strings

@@ -0,0 +1 @@
+

+ 88 - 0
Redant Drivers/Apex And Drivers/zh-Hans.lproj/Localizable.strings

@@ -0,0 +1,88 @@
+/* 
+  Localized.strings
+  Apex And Drivers
+
+  Created by Jack on 2018/6/25.
+  Copyright © 2018年 USAI. All rights reserved.
+*/
+
+CFBundleDisplayName="汽车人";
+
+"alert_title_retrieve_success"="成功找回密码!!";
+"alert_msg_email_sent"="邮件已发送,请查看邮箱.";
+"ok"="确定";
+"alert_title_error"="错误";
+"alert_msg_failed_retrieve_password"="找回密码失败,代码:%d";
+"alert_msg_uecanotempty"="用户名和邮箱不能为空!";
+"alert_msg_upcanotempty"="用户名和密码不能为空!";
+"net_not_available"="网络不可用,请检查网络";
+"net_error"="网络错误,不能连接到服务器";
+"auth_error"="用户名或密码错误";
+"ver_low"="当前应用版本较低,请更新";
+
+
+/**
+ NavigatonVC
+ */
+"Message" = "消息";
+"Cancel" = "取消";
+"Ok" = "确定";
+"%@ status changed,view detail?" = "订单 %@ 状态发生改变,是否查看详情?";
+
+/**
+ UploadList
+ */
+"Upload List" = "上传列表";
+"Clear" = "清除";
+"Upload list is empty." = "上传列表为空.";
+"Clear upload list" = "清空上传列表";
+"Are you sure remove all error/finish task?" = "你确定要删除所有出错和完成的任务吗?";
+"NO" = "不";
+"YES" = "确定";
+"Restart" = "重启";
+"Current Network is not WiFi" = "当前网络不是WiFi";
+"Remove" = "移除";
+
+/**
+ Photo Preview
+ */
+"delete" = "删除";
+"Are you sure you want to delete it" = "你确定要删除这张照片吗?";
+
+/**
+ Update
+ */
+"Update" = "提交";
+"Warning" = "警告";
+"please complete missing field:\n%@" = "请完成以下内容:\n%@";
+
+/**
+ Detail
+ */
+"Apple Map" = "苹果地图";
+"Google Map" = "谷歌地图";
+"the %@ is not done,are you sure to update %@ now?" = "当前操作 %@ 还没有完成,你确定现在要做 %@ 操作吗?";
+
+/**
+ Home
+ */
+"New Order" = "新订单";
+"Processing Order" = "进行中的订单";
+"Finished Order" = "已完成的订单";
+"are you sure to change status to %@" = "你确定要修改用户状态为 %@";
+"Unavailable" = "离线";
+"Available" = "在线";
+" and notification permissions" = " 和 通知权限";
+" notification permissions" = " 通知权限";
+" location permissions" = " 位置权限";
+"you should open" = "你应该打开";
+
+/**
+ Login
+ */
+"Allow" = "允许";
+"Always ask" = "每次询问";
+"Reject" = "拒绝";
+"Apex & Drivers need background send location" = "Apex & Drivers 需要后台发送位置给后台";
+"Login" = "登陆";
+"ver:%@.A%@" = "版本:%@.A%@";

+ 1 - 0
Redant Drivers/Apex And Drivers/zh-Hans.lproj/Main.strings

@@ -0,0 +1 @@
+