Browse Source

1.多国语言修复

huangxiaodong 10 months ago
parent
commit
ece3804724

+ 2 - 2
创维盒子/双子星云手机/Class/Set/previewFile/view/shareRecordTableViewCell.m

@@ -88,7 +88,7 @@
     _remainingNumberLabel.font = [UIFont systemFontOfSize:12.f];
     [_remainingNumberLabel setTextColor:HW666666Color]; //#01B7EA
     [_remainingNumberLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(80);
+        make.width.mas_equalTo(95);
         make.right.equalTo(_rightImage.mas_left).offset(-5.f);
         //make.centerY.equalTo(self.mas_centerY);
         make.top.mas_equalTo(15.f);
@@ -100,7 +100,7 @@
     _stateLabel.font = [UIFont systemFontOfSize:12.f];
     [_stateLabel setTextColor:HW666666Color]; //#01B7EA
     [_stateLabel mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.width.mas_equalTo(80);
+        make.width.mas_equalTo(95);
         make.right.equalTo(_rightImage.mas_left).offset(-5.f);
         //make.centerY.equalTo(self.mas_centerY);
         //make.top.mas_equalTo(15.f);

+ 1 - 1
创维盒子/双子星云手机/NAS/NASViewController.m

@@ -135,7 +135,7 @@
     [welcomelabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(imageTopY);
         make.left.mas_equalTo(16);
-        make.width.mas_equalTo(210);
+        make.width.mas_equalTo(240);
         make.height.mas_equalTo(24);
     }];
     

+ 2 - 2
创维盒子/双子星云手机/NAS/view/NASCommonUsedView.m

@@ -58,8 +58,8 @@
 
     
     NSArray *titleArr = @[NSLocalizedString(@"my_set_no_File_backups",nil),
-                          NSLocalizedString(@"set_file_Transfer_WWAN_title",nil),
-                          NSLocalizedString(@"my_set_no_share",nil)
+                          NSLocalizedString(@"set_file_Transfer_WWAN_title2",nil),
+                          NSLocalizedString(@"my_set_no_share2",nil)
                           //,NSLocalizedString(@"my_set_no_share",nil)
     ];
     

+ 19 - 1
创维盒子/双子星云手机/cloudPhone/view/cloudPhoneSetView.m

@@ -40,10 +40,28 @@
     whiteBgView.layer.cornerRadius = 8;
     whiteBgView.layer.masksToBounds = YES;
     
+    CGFloat curWhiteWidth = 132.0;
+    NSArray *arLanguages = [[NSUserDefaults standardUserDefaults] objectForKey:@"AppleLanguages"];
+    NSLog(@"arLanguages:%@",arLanguages);
+    ///获取设备当前地区的代码和APP语言环境
+    NSString *languageCode = [NSLocale preferredLanguages][0];
+
+    //目前支持 中文(简体 繁体) 英文 日语
+    if([languageCode rangeOfString:@"zh-Hans"].location != NSNotFound)
+    {
+    }
+    else if([languageCode rangeOfString:@"zh-Hant"].location != NSNotFound)
+    {
+    }
+    else{
+        curWhiteWidth = 172;
+    }
+    
     [whiteBgView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.mas_equalTo(100);
         make.right.mas_equalTo(-12);
-        make.width.mas_equalTo(132);
+        make.width.mas_equalTo(curWhiteWidth);
+        //make.width.mas_equalTo(132);
         make.height.mas_equalTo(100);
         //make.height.mas_equalTo(150);
     }];

+ 10 - 8
创维盒子/双子星云手机/en.lproj/Localizable.strings

@@ -162,7 +162,7 @@
 //"my_set_no_invite_friend"   = "邀请好友";
 //"my_set_no_invite_friend_get_vip"   = "邀请好友送会员";
 "my_set_no_check_update"   = "Version Information";
-//"my_set_no_connect_kefu"   = "联系客服";
+"my_set_no_connect_kefu"   = "Customer Service";
 "my_set_no_change_phone"   = "Change Device";
 "my_set_no_TV_p2p"   = "TV projection";
 //"my_set_no_logout"   = "退出账号";
@@ -171,7 +171,7 @@
 "my_set_no_fanzhuan_exit" = "Flip to Exit";
 "my_set_no_fanzhuan_exit_open" = "Flip to exit, enabled";
 "my_set_no_fanzhuan_exit_close" = "Flip to exit, closed";
-"my_set_no_restart_phone" = "Restart Private-X";
+"my_set_no_restart_phone" = "Restart cloudPhone";
 "my_set_no_modify_pwd" = "Change Password";
 "my_set_no_restart_phone_tips" = "Are you sure you want to restart Private-X?";
 "my_set_no_restart_phone_btn_ok" = "Restart";
@@ -352,7 +352,7 @@
 "File_backups_set_close_tip"   = "Turning off backup will cancel the backup task, please operate with caution";
 "my_set_no_File_Transfer_List"   = "transfer list";
 "my_set_no_File_download"   = "download";
-"my_set_no_File_backups"   = "File backup";
+"my_set_no_File_backups"   = "Backup";
 "File_download_Record_no_data"   = "No download record yet";
 "File_backups_Record_no_data"   = "No backup record yet";
 "File_Transfer_List_head_title_ing"   = "Transmitting";
@@ -495,7 +495,7 @@
 "copy_share_link_suc_tip"   = "Copy link successfully";
 "copy_share_link_Invalid_tip"   = "expired";
 "copy_share_link_Invalid_tip2"   = "Invalid";
-"copy_share_link_Invalid_tip3"   = "Expiration time";
+"copy_share_link_Invalid_tip3"   = "Expiration:";
 "share_expiration_date_unit_day_tip"   = "days";
 "share_expiration_date_unit_hour_tip"   = "hours";
 "share_expiration_date_unit_min_tip"   = "minutes";
@@ -579,15 +579,15 @@
 "cloudPhone_TV_show_tip"   = "Screen mirroring started, please check the TV for success";
 "cloudPhone_fullscreen_tvshow_tip"   = "The system detected full-screen mode. TV mirroring will close full-screen mode.";
 "cloudPhone_tvShow_before_fullscreen_tip"   = "Full-screen functions are limited during TV mirroring. Please disable mirroring to use full screen.";
-"mine_net_LAN"   = "Intranet";
-"mine_net_WAN"   = "External Network";
-"mine_net_unLink"   = "Not Connected";
+"mine_net_LAN"   = "LAN";
+"mine_net_WAN"   = "WAN";
+"mine_net_unLink"   = "offLine";
 "mine_help_title"   = "Help & Feedback";
 "mine_newuser_title"   = "Beginner's Guide";
 "mine_sn_cancel_title"   = "Log Out";
 "share_number_limit_title"   = "File Sharing Count";
 "share_number_limit_error_tip"   = "The maximum number of file sharing cannot exceed 80";
-"share_number_remainingNumber_tip"   = "Remaining Count:";
+"share_number_remainingNumber_tip"   = "Remaining:";
 "share_report_tip1"   = "Ban Reason:";
 "share_report_tip2"   = "Report Ban";
 "delete_upload_task_title_msg"   = "Confirm to delete selected task?";
@@ -602,3 +602,5 @@
 "backups_need_read_msg2" = "3. Backup path can be changed at";
 "backups_need_read_msg3" = "[Transfer Settings]";
 "backups_need_read_msg4" = "Page replacement";
+"set_file_Transfer_WWAN_title2" = "Settings";
+"my_set_no_share2"   = "Records";

+ 2 - 1
创维盒子/双子星云手机/mine/view/MineCommonUsedView.m

@@ -115,13 +115,14 @@
         textLabel.font = [UIFont systemFontOfSize:13.0];
         textLabel.textColor = [UIColor hwColor:@"#828D9A"];
         textLabel.text = titleArr[i];
+        textLabel.numberOfLines = 0;
         [but addSubview:textLabel];
         //textLabel.backgroundColor = [UIColor redColor];
         
         [textLabel mas_makeConstraints:^(MASConstraintMaker *make) {
             make.centerX.mas_equalTo(0);
             make.width.mas_equalTo(butWidth);
-            make.height.mas_equalTo(20);
+            make.height.mas_equalTo(35);
             make.top.equalTo(imageV.mas_bottom).offset(5);
         }];
         

+ 3 - 1
创维盒子/双子星云手机/zh-Hans.lproj/Localizable.strings

@@ -491,7 +491,7 @@
 "copy_share_link_suc_tip"   = "复制链接成功";
 "copy_share_link_Invalid_tip"   = "已失效";
 "copy_share_link_Invalid_tip2"   = "失效";
-"copy_share_link_Invalid_tip3"   = "失效时间";
+"copy_share_link_Invalid_tip3"   = "失效时间:";
 "share_expiration_date_unit_day_tip"   = "天后";
 "share_expiration_date_unit_hour_tip"   = "小时后";
 "share_expiration_date_unit_min_tip"   = "分钟后";
@@ -599,3 +599,5 @@
 "backups_need_read_msg2" = "3、备份路径可以到";
 "backups_need_read_msg3" = "【传输设置】";
 "backups_need_read_msg4" = "页面进行更换";
+"set_file_Transfer_WWAN_title2" = "传输设置";
+"my_set_no_share2"   = "分享记录";

+ 3 - 1
创维盒子/双子星云手机/zh-Hant.lproj/Localizable.strings

@@ -497,7 +497,7 @@
 "copy_share_link_suc_tip"   = "複製連結成功";
 "copy_share_link_Invalid_tip"   = "已失效";
 "copy_share_link_Invalid_tip2"   = "失效";
-"copy_share_link_Invalid_tip3"   = "失效時間";
+"copy_share_link_Invalid_tip3"   = "失效時間:";
 "share_expiration_date_unit_day_tip"   = "天後";
 "share_expiration_date_unit_hour_tip"   = "小時後";
 "share_expiration_date_unit_min_tip"   = "分鐘後";
@@ -604,3 +604,5 @@
 "backups_need_read_msg2" = "3、備份路徑可以到";
 "backups_need_read_msg3" = "【傳輸設置】";
 "backups_need_read_msg4" = "頁面進行更換";
+"set_file_Transfer_WWAN_title2" = "傳輸設置";
+"my_set_no_share2"   = "分享記錄";