diff --git a/CustomKeyboard/View/KBSettingView.m b/CustomKeyboard/View/KBSettingView.m index 77ff8a6..f895904 100644 --- a/CustomKeyboard/View/KBSettingView.m +++ b/CustomKeyboard/View/KBSettingView.m @@ -26,7 +26,7 @@ }]; self.titleLabel = [[UILabel alloc] init]; - self.titleLabel.text = KBLocalized(@"设置"); + self.titleLabel.text = KBLocalized(@"Settings"); self.titleLabel.font = [UIFont systemFontOfSize:16 weight:UIFontWeightSemibold]; self.titleLabel.textColor = [UIColor blackColor]; [self addSubview:self.titleLabel]; @@ -37,7 +37,7 @@ // 占位内容 UILabel *place = [[UILabel alloc] init]; - place.text = KBLocalized(@"这里是设置内容占位"); + place.text = KBLocalized(@"Settings content placeholder"); place.textColor = [UIColor darkGrayColor]; place.font = [UIFont systemFontOfSize:14]; [self addSubview:place]; diff --git a/Shared/Localization/en.lproj/Localizable.strings b/Shared/Localization/en.lproj/Localizable.strings index 87fb816..d5255a5 100644 --- a/Shared/Localization/en.lproj/Localizable.strings +++ b/Shared/Localization/en.lproj/Localizable.strings @@ -92,7 +92,7 @@ "No data" = "No data"; "Failed to parse JSON" = "Failed to parse JSON"; "Parse failed" = "Parse failed"; -"未获取到数据" = "No data received"; +"No data received" = "No data received"; "请求失败\nURL: %@\n状态: %ld\n错误: %@\nUserInfo: %@" = "Request failed\nURL: %@\nStatus: %ld\nError: %@\nUserInfo: %@"; "响应成功(JSON)\nURL: %@\n状态: %ld\nContent-Type: %@\n数据: %@" = "Response OK (JSON)\nURL: %@\nStatus: %ld\nContent-Type: %@\nData: %@"; "响应成功(Data)\nURL: %@\n状态: %ld\nContent-Type: %@\n数据: %@" = "Response OK (Data)\nURL: %@\nStatus: %ld\nContent-Type: %@\nData: %@"; @@ -205,9 +205,8 @@ // Misc -"测试" = "Test"; -"这里是设置内容占位" = "Settings content placeholder"; -"设置" = "Settings"; +"Test" = "Test"; +"Settings content placeholder" = "Settings content placeholder"; // English-only keys with Chinese equivalents "Change The Nickname" = "Change Nickname"; diff --git a/Shared/Localization/zh-Hans.lproj/Localizable.strings b/Shared/Localization/zh-Hans.lproj/Localizable.strings index 1431799..9be29eb 100644 --- a/Shared/Localization/zh-Hans.lproj/Localizable.strings +++ b/Shared/Localization/zh-Hans.lproj/Localizable.strings @@ -209,7 +209,6 @@ // 其它 "Test" = "测试"; "暂无数据" = "暂无数据"; // 已有英文 key "No data" -"Settings" = "设置"; "Change The Nickname" = "修改名称"; diff --git a/keyBoard/Class/Me/VC/MyVC.m b/keyBoard/Class/Me/VC/MyVC.m index ec5830d..4ce9ecb 100644 --- a/keyBoard/Class/Me/VC/MyVC.m +++ b/keyBoard/Class/Me/VC/MyVC.m @@ -50,7 +50,7 @@ @{ @"title": KBLocalized(@"E-mail"), @"icon": @"my_email_icon", @"color": @(0xFF8A65),@"id":@"4" }, @{ @"title": KBLocalized(@"Agreement"), @"icon": @"my_agreement_icon", @"color": @(0x4CD964),@"id":@"5" }, @{ @"title": KBLocalized(@"Privacy Policy"), @"icon": @"my_privacy_icon", @"color": @(0x5AC8FA),@"id":@"6" }, - @{ @"title": KBLocalized(@"测试"), @"icon": @"", @"color": @(0x5AC8FA),@"id":@"7" }, + @{ @"title": KBLocalized(@"Test"), @"icon": @"", @"color": @(0x5AC8FA),@"id":@"7" }, ] ]; diff --git a/keyBoard/Class/Network/KBNetworkManager.m b/keyBoard/Class/Network/KBNetworkManager.m index 595c9e1..69467c4 100644 --- a/keyBoard/Class/Network/KBNetworkManager.m +++ b/keyBoard/Class/Network/KBNetworkManager.m @@ -409,7 +409,7 @@ autoShowBusinessError:YES NSData *data = (NSData *)responseObject; if (![data isKindOfClass:[NSData class]]) { #if DEBUG - KBLOG(@"无效响应\nURL: %@\n说明: %@", req.URL.absoluteString, KBLocalized(@"未获取到数据")); + KBLOG(@"无效响应\nURL: %@\n说明: %@", req.URL.absoluteString, KBLocalized(@"No data received")); #endif if (completion) completion(nil, response, [NSError errorWithDomain:KBNetworkErrorDomain code:KBNetworkErrorInvalidResponse userInfo:@{NSLocalizedDescriptionKey:KBLocalized(@"No data")}]); return; diff --git a/keyBoard/ViewController.m b/keyBoard/ViewController.m index 90bdb2c..02c838c 100644 --- a/keyBoard/ViewController.m +++ b/keyBoard/ViewController.m @@ -20,7 +20,7 @@ - (void)setupTextField { CGRect frame = CGRectMake(([UIScreen mainScreen].bounds.size.width - 200)/2, ([UIScreen mainScreen].bounds.size.height - 200)/2, 200, 200); self.textView = [[UITextView alloc] initWithFrame:frame]; - self.textView.text = KBLocalized(@"测试"); + self.textView.text = KBLocalized(@"Test"); self.textView.layer.borderColor = [UIColor blackColor].CGColor; self.textView.layer.borderWidth = 0.5; [self.view addSubview:self.textView];