Skip to content

pidan / FuSiLive

Go to a project
Commit f43b1e2f by ludi
Options

调整几个翻译，修复一个连麦下麦会崩溃的bug

parent 4619bb1e
Inline Side-by-side
Showing with 30 additions and 23 deletions
DevelopmentPods/FUSFoundation/FUSFoundation/Assets/LocalizationString/Fusi_Chinese_Traditional.strings
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
"%@倍大奖" = "%@倍大獎"; "%@倍大奖" = "%@倍大獎";
"珍爱团改名卡" = "珍愛團改名卡"; "社团改名卡" = "社團改名卡";
"热门主播 %@ 已拒绝你的邀请" = "熱門主播 %@ 已拒絕你的邀請"; "热门主播 %@ 已拒绝你的邀请" = "熱門主播 %@ 已拒絕你的邀請";
...@@ -1322,7 +1322,7 @@ ...@@ -1322,7 +1322,7 @@
"说话时间太短" = "說話時間太短"; "说话时间太短" = "說話時間太短";
"请输入珍爱团名" = "請輸入珍愛團名"; "请输入社团名" = "請輸入社團名";
"登录失败" = "登入失敗"; "登录失败" = "登入失敗";
...@@ -1394,7 +1394,7 @@ ...@@ -1394,7 +1394,7 @@
"通话失败，请打开权限以使用麦克风和相机" = "通話失敗，請打開權限以使用麥克風和相機"; "通话失败，请打开权限以使用麦克风和相机" = "通話失敗，請打開權限以使用麥克風和相機";
"修改珍爱团名消耗 %@ x1" = "修改珍愛團名消耗 %@ x1"; "修改社团名消耗 %@ x1" = "修改社團名消耗 %@ x1";
"切换后的直播时长不计入直播奖励活动" = "切換後的直播時長不計入直播獎勵活動"; "切换后的直播时长不计入直播奖励活动" = "切換後的直播時長不計入直播獎勵活動";
...@@ -1476,7 +1476,7 @@ ...@@ -1476,7 +1476,7 @@
"点击追踪主播哦~" = "點擊追蹤主播哦~"; "点击追踪主播哦~" = "點擊追蹤主播哦~";
"修改珍爱团名" = "修改珍愛團名"; "修改社团名" = "修改社團名";
"确认分享的内容符合您所在国家的法律" = "確認分享的內容符合您所在國家的法律"; "确认分享的内容符合您所在国家的法律" = "確認分享的內容符合您所在國家的法律";
...@@ -2686,7 +2686,7 @@ ...@@ -2686,7 +2686,7 @@
"设置您的直播主题" = "設置您的直播主題"; "设置您的直播主题" = "設置您的直播主題";
"珍爱值：%@" = "珍愛值：%@"; "声望：%@" = "聲望：%@";
"是否关闭所有美颜特效？" = "是否關閉所有美顏特效？"; "是否关闭所有美颜特效？" = "是否關閉所有美顏特效？";
...@@ -2698,7 +2698,7 @@ ...@@ -2698,7 +2698,7 @@
"直播预告" = "直播預告"; "直播预告" = "直播預告";
"珍爱团新成员" = "珍愛團新成員"; "社团新成员" = "社團新成員";
"质量" = "質量"; "质量" = "質量";
...@@ -2776,7 +2776,7 @@ ...@@ -2776,7 +2776,7 @@
"美颜特效" = "美顏特效"; "美颜特效" = "美顏特效";
"珍爱团团员" = "珍愛團團員"; "社团团员" = "社團團員";
"獎勵記錄" = "獎勵記錄"; "獎勵記錄" = "獎勵記錄";
......
DevelopmentPods/FUSFoundation/FUSFoundation/Classes/FUSFoundation/Views/StreamView/Beauty/FUSBeautyConfig.m
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
- (UIImage *)filterImage { - (UIImage *)filterImage {
NSString *imageName = self.imageName; NSString *imageName = self.imageName;
NSBundle *cbundle = [NSBundle bundleForClass:[self class]]; NSBundle *cbundle = [NSBundle bundleForClass:[self class]];
NSString *path = [cbundle pathForResource:@"YAStreamKitBundle" ofType:@"bundle"]; NSString *path = [cbundle pathForResource:@"FUSFoundationBundle" ofType:@"bundle"];
NSBundle *bundle = [NSBundle bundleWithPath:path]; NSBundle *bundle = [NSBundle bundleWithPath:path];
return [UIImage imageNamed:imageName inBundle:bundle compatibleWithTraitCollection:nil]; return [UIImage imageNamed:imageName inBundle:bundle compatibleWithTraitCollection:nil];
} }
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FUSVideoEndView/FUSVideoEndNewViewNewFansClubCell.swift
...@@ -80,7 +80,7 @@ import UIKit ...@@ -80,7 +80,7 @@ import UIKit
self.totalDayLabel.attributedText = loveDayAttrString self.totalDayLabel.attributedText = loveDayAttrString
let loveNum = "\(model.exp)" let loveNum = "\(model.exp)"
let loveNummuString = String.fus_localString("珍爱值：%@").replacingOccurrences(of: "%@", with: "\(loveNum)") let loveNummuString = String.fus_localString("声望：%@").replacingOccurrences(of: "%@", with: "\(loveNum)")
let loveNumAttrString = NSMutableAttributedString(string: loveNummuString, attributes: [.foregroundColor:UIColor.init(white: 1, alpha: 0.26), .font: UIFont.fus_themeFont(13) ?? .systemFont(ofSize: 13)]) let loveNumAttrString = NSMutableAttributedString(string: loveNummuString, attributes: [.foregroundColor:UIColor.init(white: 1, alpha: 0.26), .font: UIFont.fus_themeFont(13) ?? .systemFont(ofSize: 13)])
if let range = loveNummuString.range(of: loveNum) { if let range = loveNummuString.range(of: loveNum) {
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FUSVideoEndView/FUSVideoEndV2CustomCell.swift
...@@ -165,7 +165,7 @@ class FUSVideoEndV2CustomCell: UITableViewCell { ...@@ -165,7 +165,7 @@ class FUSVideoEndV2CustomCell: UITableViewCell {
case .fansMember: case .fansMember:
self.titleLabel.text = .fus_localString("珍爱团团员") self.titleLabel.text = .fus_localString("社团团员")
self.scoreLabel.textColor = UIColor(red: 1, green: 0.42, blue: 0.7,alpha:1) self.scoreLabel.textColor = UIColor(red: 1, green: 0.42, blue: 0.7,alpha:1)
self.scoreLabel.text = "\(model.fansMemberTotal)" self.scoreLabel.text = "\(model.fansMemberTotal)"
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FUSVideoEndView/FUSVideoEndV2DetailAlertView.swift
...@@ -251,7 +251,7 @@ class FUSVideoEndV2DetailAlertView: FUSBaseView { ...@@ -251,7 +251,7 @@ class FUSVideoEndV2DetailAlertView: FUSBaseView {
case .newFollow: case .newFollow:
self.titleLabel.text = .fus_localString("新增追踪") self.titleLabel.text = .fus_localString("新增追踪")
case .fansMember: case .fansMember:
self.titleLabel.text = .fus_localString("珍爱团新成员") self.titleLabel.text = .fus_localString("社团新成员")
case .fansTaskRank: case .fansTaskRank:
self.titleLabel.text = .fus_localString("团战周排名") self.titleLabel.text = .fus_localString("团战周排名")
default: default:
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/ChatInputView/FUSBottomOptionalView.m
...@@ -82,16 +82,21 @@ ...@@ -82,16 +82,21 @@
clickItem:click]; clickItem:click];
return; return;
}else if (type == FUSShowAllSetting) { }else if (type == FUSShowAllSetting) {
BOOL isMute = [FUSLiveHelper fus_livePushMuteState];
NSString *muteStr = isMute ? [NSString fus_localString:@"打开麦克风"] : [NSString fus_localString:@"关闭麦克风"];
NSString *muteImgStr = isMute ? @"live_setting_open_mic" : @"live_setting_close_mic";
[self showOptionalViewWithTitleArray:@[[NSString fus_localString:@"美颜设置"], [self showOptionalViewWithTitleArray:@[[NSString fus_localString:@"美颜设置"],
[NSString fus_localString:@"清晰度"], [NSString fus_localString:@"清晰度"],
[NSString fus_localString:@"关闭麦克风"], // [NSString fus_localString:@"关闭麦克风"],
muteStr,
[NSString fus_localString:@"反转镜头"], [NSString fus_localString:@"反转镜头"],
[NSString fus_localString:@"闪光关闭"], [NSString fus_localString:@"闪光关闭"],
[NSString fus_localString:@"镜像"], [NSString fus_localString:@"镜像"],
[NSString fus_localString:@"直播主题"]] [NSString fus_localString:@"直播主题"]]
withImages:@[@"live_icon_cameraSetting", withImages:@[@"live_icon_cameraSetting",
@"live_setting_quality", @"live_setting_quality",
@"live_setting_close_mic", // @"live_setting_close_mic",
muteImgStr,
@"live_icon_changeCamera", @"live_icon_changeCamera",
@"live_icon_turnOffLine", @"live_icon_turnOffLine",
@"live_setting_video_mirror", @"live_setting_video_mirror",
......
Modules/FUSShowRoomModule/FUSShowRoomModule/Features/NewLive/Main/View/FunctionView/LinkMicro/Other/FUSAgoraHelper.m
...@@ -384,14 +384,16 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange"; ...@@ -384,14 +384,16 @@ NSString * const kLiveLinkMicRoleDidChanged = @"linkMicRoleChange";
} }
FUSLogDebug(@"pp===准备离开频道 %ld", channelId); FUSLogDebug(@"pp===准备离开频道 %ld", channelId);
FUSLiveFunctionView *functionView = [FUSLiveHelper shareInstance].currentFunctionView; // FUSLiveFunctionView *functionView = [FUSLiveHelper shareInstance].currentFunctionView;
if (functionView.delegate && [functionView.delegate respondsToSelector:@selector(fus_liveFunctionViewExitLinkMicRoomLeftRoom:completed:)]) { // if (functionView.delegate && [functionView.delegate respondsToSelector:@selector(fus_liveFunctionViewExitLinkMicRoomLeftRoom:completed:)]) {
[functionView.delegate fus_liveFunctionViewExitLinkMicRoomLeftRoom:functionView completed:^(BOOL succeed) { // [functionView.delegate fus_liveFunctionViewExitLinkMicRoomLeftRoom:functionView completed:^(BOOL succeed) {
[self fus_stopRTCStreamingWithCompletion:completion]; // [self fus_stopRTCStreamingWithCompletion:completion];
}]; // }];
} else { // } else {
// [self fus_stopRTCStreamingWithCompletion:completion];
// }
[self fus_stopRTCStreamingWithCompletion:completion]; [self fus_stopRTCStreamingWithCompletion:completion];
}
} }
/** /**
......
Modules/FUSUserCenterModule/FUSUserCenterModule/Features/Zone/View/MyEditName/FUSMyEditNameAlertView.m
...@@ -211,14 +211,14 @@ ...@@ -211,14 +211,14 @@
if (_viewType == 0) { if (_viewType == 0) {
return [NSString fus_localString:@"修改昵称"]; return [NSString fus_localString:@"修改昵称"];
}else{ }else{
return [NSString fus_localString:@"修改珍爱团名"]; return [NSString fus_localString:@"修改社团名"];
} }
} }
-(NSString *)fus_cardName{ -(NSString *)fus_cardName{
if (_viewType == 0) { if (_viewType == 0) {
return [NSString fus_localString:@"改名卡（10宝石）"]; return [NSString fus_localString:@"改名卡（10宝石）"];
}else{ }else{
return [NSString fus_localString:@"珍爱团改名卡"]; return [NSString fus_localString:@"社团改名卡"];
} }
} }
-(UIColor *)fus_cardColor{ -(UIColor *)fus_cardColor{
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
if (_viewType == 0) { if (_viewType == 0) {
return [NSString fus_localString:@"请输入昵称"]; return [NSString fus_localString:@"请输入昵称"];
}else{ }else{
return [NSString fus_localString:@"请输入珍爱团名"]; return [NSString fus_localString:@"请输入社团名"];
} }
} }
-(NSString *)fus_warning{ -(NSString *)fus_warning{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment