Browse Source

1.修改iOS Apex Drivers国际化。

Pen Li 7 năm trước cách đây
mục cha
commit
5070e01657

+ 18 - 6
Redant Drivers/Apex And Drivers.xcodeproj/project.pbxproj

@@ -155,7 +155,6 @@
 		42D8B8E020C28755001C125F /* fake_order_detail.json in Resources */ = {isa = PBXBuildFile; fileRef = 42D8B8DF20C28755001C125F /* fake_order_detail.json */; };
 		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 */; };
@@ -173,6 +172,7 @@
 		42ECE185214A08A900AD8283 /* RASettingAboutCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42ECE184214A08A900AD8283 /* RASettingAboutCell.m */; };
 		42ECE189214A49B600AD8283 /* RAChangePasswordViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42ECE188214A49B600AD8283 /* RAChangePasswordViewController.m */; };
 		42F0C5D720E20B3F00922442 /* RACameraViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42F0C5D620E20B3E00922442 /* RACameraViewController.m */; };
+		42F3A32C21829EAC00AB0D3D /* date.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42F3A32E21829EAC00AB0D3D /* date.storyboard */; };
 		42F624E5214BA4A100B1F012 /* RAMessageViewController+DataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 42F624E4214BA4A100B1F012 /* RAMessageViewController+DataSource.m */; };
 		42F624E8214BA4AF00B1F012 /* RAMessageViewController+Delegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 42F624E7214BA4AF00B1F012 /* RAMessageViewController+Delegate.m */; };
 		42F624EB214BA50D00B1F012 /* RAMessageCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42F624EA214BA50D00B1F012 /* RAMessageCell.m */; };
@@ -257,7 +257,6 @@
 		422B06BB21743ABE003DA2DA /* NSData+RAImageType.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "NSData+RAImageType.m"; 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>"; };
 		422DA1BF2134FA7D0021BD70 /* RAPresentationController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAPresentationController.m; sourceTree = "<group>"; };
 		4235FA98213E0CE9000B6672 /* RADetailMapCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RADetailMapCell.h; sourceTree = "<group>"; };
 		4235FA99213E0CE9000B6672 /* RADetailMapCell.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RADetailMapCell.m; sourceTree = "<group>"; };
@@ -486,7 +485,6 @@
 		42DCCC3A218155620027A5BB /* RAEditDateModel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAEditDateModel.m; sourceTree = "<group>"; };
 		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>"; };
@@ -531,6 +529,10 @@
 		42ECE187214A49B600AD8283 /* RAChangePasswordViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RAChangePasswordViewController.h; sourceTree = "<group>"; };
 		42ECE188214A49B600AD8283 /* RAChangePasswordViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RAChangePasswordViewController.m; sourceTree = "<group>"; };
 		42F0C5D620E20B3E00922442 /* RACameraViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RACameraViewController.m; sourceTree = "<group>"; };
+		42F3A32B21829E5700AB0D3D /* RAPresentationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RAPresentationController.h; sourceTree = "<group>"; };
+		42F3A32D21829EAC00AB0D3D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/date.storyboard; sourceTree = "<group>"; };
+		42F3A33021829EAE00AB0D3D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/date.strings; sourceTree = "<group>"; };
+		42F3A33221829EAF00AB0D3D /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/date.strings"; sourceTree = "<group>"; };
 		42F624E3214BA4A100B1F012 /* RAMessageViewController+DataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RAMessageViewController+DataSource.h"; sourceTree = "<group>"; };
 		42F624E4214BA4A100B1F012 /* RAMessageViewController+DataSource.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "RAMessageViewController+DataSource.m"; sourceTree = "<group>"; };
 		42F624E6214BA4AF00B1F012 /* RAMessageViewController+Delegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "RAMessageViewController+Delegate.h"; sourceTree = "<group>"; };
@@ -687,7 +689,7 @@
 		422DA1BD2134FA510021BD70 /* PresentationController */ = {
 			isa = PBXGroup;
 			children = (
-				422DA1BE2134FA7D0021BD70 /* RAPresentationController.h */,
+				42F3A32B21829E5700AB0D3D /* RAPresentationController.h */,
 				422DA1BF2134FA7D0021BD70 /* RAPresentationController.m */,
 			);
 			path = PresentationController;
@@ -1214,7 +1216,7 @@
 			children = (
 				42C1B2722134F24C00637085 /* RADatePickerViewController.h */,
 				42C1B2732134F24C00637085 /* RADatePickerViewController.m */,
-				42DCCC4921818D2F0027A5BB /* date.storyboard */,
+				42F3A32E21829EAC00AB0D3D /* date.storyboard */,
 			);
 			path = DatePicker;
 			sourceTree = "<group>";
@@ -1421,7 +1423,7 @@
 				42DCCC4F2181AA4C0027A5BB /* Login.storyboard in Resources */,
 				42595995214905E400F7DD41 /* setting.json in Resources */,
 				4235FAB8213E581E000B6672 /* Signature.xcassets in Resources */,
-				42DCCC4A21818D2F0027A5BB /* date.storyboard in Resources */,
+				42F3A32C21829EAC00AB0D3D /* date.storyboard in Resources */,
 				71EAA33920B9571B002F003C /* Main.storyboard in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1678,6 +1680,16 @@
 			name = Edit.storyboard;
 			sourceTree = "<group>";
 		};
+		42F3A32E21829EAC00AB0D3D /* date.storyboard */ = {
+			isa = PBXVariantGroup;
+			children = (
+				42F3A32D21829EAC00AB0D3D /* Base */,
+				42F3A33021829EAE00AB0D3D /* en */,
+				42F3A33221829EAF00AB0D3D /* zh-Hans */,
+			);
+			name = date.storyboard;
+			sourceTree = "<group>";
+		};
 		71EAA33720B9571B002F003C /* Main.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (

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

@@ -91,3 +91,23 @@ CFBundleDisplayName="Apex & Drivers";
  */
 "All" = "All";
 "Unread" = "Unread";
+
+/**
+ * Empty
+ */
+"empty_tips" = "There is no data\nPlease click to reload";
+
+/**
+ * HUD
+ */
+"loading..." = "loading...";
+
+/**
+ * Refresh
+ */
+"pull to load more" = "pull to load more";
+"will load more" = "will load more";
+"loosen to load more" = "loosen to load more";
+"no more" = "no more";
+"pull to refresh" = "pull to refresh";
+"loosen to refresh" = "loosen to refresh";

+ 1 - 1
Redant Drivers/Apex And Drivers/BaseViewController/RABaseViewController.m

@@ -40,7 +40,7 @@
     }
 
     UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:title message:msg preferredStyle:UIAlertControllerStyleAlert];
-    UIAlertAction *okAction = [UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+    UIAlertAction *okAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"Ok", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
 
     }];
 

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


+ 9 - 0
Redant Drivers/Apex And Drivers/DatePicker/en.lproj/date.strings

@@ -0,0 +1,9 @@
+
+/* Class = "UIButton"; normalTitle = "Cancel"; ObjectID = "7Bd-bE-hfF"; */
+"7Bd-bE-hfF.normalTitle" = "Cancel";
+
+/* Class = "UILabel"; text = "Title"; ObjectID = "Fbi-R0-4N2"; */
+"Fbi-R0-4N2.text" = "Title";
+
+/* Class = "UIButton"; normalTitle = "Set"; ObjectID = "LjX-WA-ZSH"; */
+"LjX-WA-ZSH.normalTitle" = "Set";

+ 9 - 0
Redant Drivers/Apex And Drivers/DatePicker/zh-Hans.lproj/date.strings

@@ -0,0 +1,9 @@
+
+/* Class = "UIButton"; normalTitle = "Cancel"; ObjectID = "7Bd-bE-hfF"; */
+"7Bd-bE-hfF.normalTitle" = "取消";
+
+/* Class = "UILabel"; text = "Title"; ObjectID = "Fbi-R0-4N2"; */
+"Fbi-R0-4N2.text" = "Title";
+
+/* Class = "UIButton"; normalTitle = "Set"; ObjectID = "LjX-WA-ZSH"; */
+"LjX-WA-ZSH.normalTitle" = "确定";

+ 1 - 1
Redant Drivers/Apex And Drivers/EmptyView/RAEmptyView.m

@@ -49,7 +49,7 @@
 - (UILabel *)tipLabel {
     if (!_tipLabel) {
         _tipLabel = [[UILabel alloc] init];
-        _tipLabel.text = @"There is no data\nPlease click to reload";
+        _tipLabel.text = NSLocalizedString(@"empty_tips", nil);
         _tipLabel.numberOfLines = 0;
         _tipLabel.textAlignment = NSTextAlignmentCenter;
     }

+ 0 - 13
Redant Drivers/Apex And Drivers/PresentationController/RApresentationController.h

@@ -1,13 +0,0 @@
-//
-//  RApresentationController.h
-//  Apex And Drivers
-//
-//  Created by Jack on 2018/8/28.
-//  Copyright © 2018年 USAI. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface RAPresentationController : UIPresentationController
-
-@end

+ 1 - 1
Redant Drivers/Apex And Drivers/RAProgressHUD.m

@@ -24,7 +24,7 @@ static const CGFloat HUDSIZE = 100.0f;
 
 + (instancetype)showHUDOnView:(UIView *)view {
     
-    return [self showHUDOnView:view withTitle:@"loading..."];
+    return [self showHUDOnView:view withTitle:NSLocalizedString(@"loading...", @"loading...")];
 }
 
 + (instancetype)showHUDOnView:(UIView *)view withTitle:(NSString *)title {

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

@@ -92,3 +92,23 @@ CFBundleDisplayName="Apex & Drivers";
  */
 "All" = "All";
 "Unread" = "Unread";
+
+/**
+ * Empty
+ */
+"empty_tips" = "There is no data\nPlease click to reload";
+
+/**
+ * HUD
+ */
+"loading..." = "loading...";
+
+/**
+ * Refresh
+ */
+"pull to load more" = "pull to load more";
+"will load more" = "will load more";
+"loosen to load more" = "loosen to load more";
+"no more" = "no more";
+"pull to refresh" = "pull to refresh";
+"loosen to refresh" = "loosen to refresh";

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

@@ -92,3 +92,24 @@ CFBundleDisplayName="汽车人";
  */
 "All" = "所有";
 "Unread" = "未读";
+
+/**
+ * Empty
+ */
+"empty_tips" = "暂时没有数据\n请点击刷新";
+
+/**
+ * HUD
+ */
+"loading..." = "加载中...";
+
+/**
+ * Refresh
+ */
+"pull to load more" = "上拉加载";
+"will load more" = "即将加载";
+"loosen to load more" = "松开加载";
+"no more" = "没有了";
+"pull to refresh" = "下拉刷新";
+"loosen to refresh" = "松开刷新";
+