Commit d5c0e102 by ludi

准备替换翻译

parent aa5a40d4
Showing with 55 additions and 49 deletions
...@@ -34,13 +34,13 @@ ...@@ -34,13 +34,13 @@
NSString *rlt = @""; NSString *rlt = @"";
if (day > 0) { if (day > 0) {
rlt = [NSString fus_versionLocalString:@"天"]; rlt = [NSString fus_localString:@"天"];
} }
else if (hour > 0) { else if (hour > 0) {
rlt = [NSString fus_versionLocalString:@"小时"]; rlt = [NSString fus_localString:@"小时"];
} }
else { else {
rlt = [NSString fus_versionLocalString:@"分钟"]; rlt = [NSString fus_localString:@"分钟"];
} }
return rlt; return rlt;
} }
......
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
} }
case FUSPushNoticeViewTypeOneToOneChatReceive: case FUSPushNoticeViewTypeOneToOneChatReceive:
{ {
_noticeWordsLabel.text = [NSString fus_versionLocalString:@"开启通知权限,可以帮助您提升接通率,增加通话收入"]; _noticeWordsLabel.text = [NSString fus_localString:@"开启通知权限,可以帮助您提升接通率,增加通话收入"];
} }
default: default:
break; break;
......
...@@ -177,12 +177,12 @@ import RxSwift ...@@ -177,12 +177,12 @@ import RxSwift
.mapToModel(FUSGlobalJumpMessageAlertModel.self) .mapToModel(FUSGlobalJumpMessageAlertModel.self)
.subscribe(onNext: { model in .subscribe(onNext: { model in
var cancelText: String = .fus_versionLocalString("确定") var cancelText: String = .fus_localString("确定")
var otherTexts: [String]? = nil var otherTexts: [String]? = nil
if let otherText = model.confirmTxt.fus_getLanguageContent(), if let otherText = model.confirmTxt.fus_getLanguageContent(),
model.showConfirm == 1{ model.showConfirm == 1{
otherTexts = [otherText] otherTexts = [otherText]
cancelText = .fus_versionLocalString("取消") cancelText = .fus_localString("取消")
} }
FUSAlertView.showAlert(withTitle: model.title.fus_getLanguageContent() ?? "", message: model.content.fus_getLanguageContent() ?? "", cancelButtonTitle: cancelText, otherButtonTitles: otherTexts) { clickIndex in FUSAlertView.showAlert(withTitle: model.title.fus_getLanguageContent() ?? "", message: model.content.fus_getLanguageContent() ?? "", cancelButtonTitle: cancelText, otherButtonTitles: otherTexts) { clickIndex in
......
...@@ -13,11 +13,11 @@ ...@@ -13,11 +13,11 @@
- (NSString *)title { - (NSString *)title {
switch (self.riskLevel) { switch (self.riskLevel) {
case 1: case 1:
return [NSString fus_versionLocalString:@"安全"]; return [NSString fus_localString:@"安全"];
case -1: case -1:
return [NSString fus_versionLocalString:@"风险"]; return [NSString fus_localString:@"风险"];
case -2: case -2:
return [NSString fus_versionLocalString:@"不安全"]; return [NSString fus_localString:@"不安全"];
default: default:
break; break;
......
...@@ -202,8 +202,6 @@ ...@@ -202,8 +202,6 @@
"需要獲取所有照片權限,請在「設置」-「螢火蟲直播」-「照片」中選擇「所有照片」" = "需要獲取所有照片權限,請在「設置」-「螢火蟲直播」-「照片」中選擇「所有照片」"; "需要獲取所有照片權限,請在「設置」-「螢火蟲直播」-「照片」中選擇「所有照片」" = "需要獲取所有照片權限,請在「設置」-「螢火蟲直播」-「照片」中選擇「所有照片」";
"蜜桃" = "蜜桃";
"接受" = "接受"; "接受" = "接受";
"声讯" = "聲訊"; "声讯" = "聲訊";
...@@ -404,8 +402,6 @@ ...@@ -404,8 +402,6 @@
"《直播 & 社区公约》" = "《直播 & 社區公約》"; "《直播 & 社区公约》" = "《直播 & 社區公約》";
"超甜" = "超甜";
"继续升级" = "繼續升級"; "继续升级" = "繼續升級";
"请输入密码" = "請輸入密碼"; "请输入密码" = "請輸入密碼";
...@@ -830,8 +826,6 @@ ...@@ -830,8 +826,6 @@
"内容超过限制" = "內容超過限制"; "内容超过限制" = "內容超過限制";
"氧气" = "氧氣";
"关闭开关将无法接听声讯/视讯,如需要恢复接听功能,需要重新打开" = "關閉開關將無法接聽聲訊/視訊,如需要恢復接聽功能,需要重新打開"; "关闭开关将无法接听声讯/视讯,如需要恢复接听功能,需要重新打开" = "關閉開關將無法接聽聲訊/視訊,如需要恢復接聽功能,需要重新打開";
"请输入搜索内容" = "請輸入搜索內容"; "请输入搜索内容" = "請輸入搜索內容";
...@@ -1632,8 +1626,6 @@ ...@@ -1632,8 +1626,6 @@
"请调整正方形图片上传" = "請調整正方形圖片上傳"; "请调整正方形图片上传" = "請調整正方形圖片上傳";
"桔梗" = "桔梗";
"%@后过期" = "%@後過期"; "%@后过期" = "%@後過期";
"定位" = "定位"; "定位" = "定位";
...@@ -1786,8 +1778,6 @@ ...@@ -1786,8 +1778,6 @@
"签到" = "簽到"; "签到" = "簽到";
"初见" = "初見";
"包房已满,请稍后再试" = "包房已滿,請稍後再試"; "包房已满,请稍后再试" = "包房已滿,請稍後再試";
"获取密码" = "獲取密碼"; "获取密码" = "獲取密碼";
...@@ -2609,3 +2599,19 @@ ...@@ -2609,3 +2599,19 @@
"道具已激活" = "道具已激活"; "道具已激活" = "道具已激活";
"数量" = "數量"; "数量" = "數量";
"小时Unit" = "小時";
"分钟Unit" = "分鐘";
"背包礼物只能在直播间内送出" = "背包禮物只能在直播間送出";
"有效期至" = "有效期至";
"有效期:" = "有效期:";
"安全" = "安全";
"风险" = "風險";
"不安全" = "不安全";
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSChatCenterBundle.xcscheme_^#shared#^_</key> <key>FUSChatCenterBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>76</integer> <integer>77</integer>
</dict> </dict>
<key>FUSChatCenterModule.xcscheme_^#shared#^_</key> <key>FUSChatCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>72</integer> <integer>75</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
...@@ -234,7 +234,7 @@ import SJAttributesStringMaker ...@@ -234,7 +234,7 @@ import SJAttributesStringMaker
earnLabel.isHidden = false earnLabel.isHidden = false
earnLabel.attributedText = .sj.makeText({ make in earnLabel.attributedText = .sj.makeText({ make in
make.append(.fus_versionLocalString("私房收益")).textColor(.init(hex: "#666666")) make.append(.fus_localString("私房收益")).textColor(.init(hex: "#666666"))
make.append { make in make.append { make in
// 货币类型(3:宝石、4:萤火、5:露水) // 货币类型(3:宝石、4:萤火、5:露水)
if model.timeIncome.currency == 3 { if model.timeIncome.currency == 3 {
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<key>FUSShowRoomBundle.xcscheme_^#shared#^_</key> <key>FUSShowRoomBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>75</integer> <integer>74</integer>
</dict> </dict>
<key>FUSShowRoomModule.xcscheme_^#shared#^_</key> <key>FUSShowRoomModule.xcscheme_^#shared#^_</key>
<dict> <dict>
......
...@@ -7,12 +7,12 @@ ...@@ -7,12 +7,12 @@
<key>FUSUserCenterModule.xcscheme_^#shared#^_</key> <key>FUSUserCenterModule.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>77</integer> <integer>76</integer>
</dict> </dict>
<key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key> <key>FUSUserCenterModuleBundle.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>74</integer> <integer>72</integer>
</dict> </dict>
</dict> </dict>
</dict> </dict>
......
...@@ -105,19 +105,19 @@ class FUSBackpackGiftCell: UICollectionViewCell { ...@@ -105,19 +105,19 @@ class FUSBackpackGiftCell: UICollectionViewCell {
if day > 0 { if day > 0 {
time = String(day) time = String(day)
timeStr = "\(time) \(String.fus_versionLocalString("天"))" timeStr = "\(time) \(String."暂无背包礼物"("天"))"
timeColor = .init(hex: "#7F7F80") timeColor = .init(hex: "#7F7F80")
} else if hour > 0 { } else if hour > 0 {
time = String(hour) time = String(hour)
timeStr = "\(time) \(String.fus_versionLocalString("小时Unit"))" timeStr = "\(time) \(String."暂无背包礼物"("小时Unit"))"
timeColor = .init(hex: "#e84f4c") timeColor = .init(hex: "#e84f4c")
} else { } else {
time = String(min) time = String(min)
timeStr = "\(time) \(String.fus_versionLocalString("分钟Unit"))" timeStr = "\(time) \(String."暂无背包礼物"("分钟Unit"))"
timeColor = .init(hex: "#e84f4c") timeColor = .init(hex: "#e84f4c")
} }
......
...@@ -24,7 +24,7 @@ class FUSBackpackGiftView: FUSBaseView { ...@@ -24,7 +24,7 @@ class FUSBackpackGiftView: FUSBaseView {
super.init(frame: frame) super.init(frame: frame)
self.addSubview(self.topTipLabel) self.addSubview(self.topTipLabel)
self.topTipLabel.text = .fus_versionLocalString("背包礼物只能在直播间内送出") self.topTipLabel.text = .fus_localString("背包礼物只能在直播间内送出")
self.topTipLabel.textColor = .fus_textColorMedium() self.topTipLabel.textColor = .fus_textColorMedium()
self.topTipLabel.font = .fus_themeFont(10) self.topTipLabel.font = .fus_themeFont(10)
self.topTipLabel.snp.makeConstraints { make in self.topTipLabel.snp.makeConstraints { make in
...@@ -97,7 +97,7 @@ class FUSBackpackGiftView: FUSBaseView { ...@@ -97,7 +97,7 @@ class FUSBackpackGiftView: FUSBaseView {
// var buttonTittle = "" // var buttonTittle = ""
// if FUSCacheDataShare.shareStore().settingInitDataModel.platformStoreShowSwitch == 1 { // if FUSCacheDataShare.shareStore().settingInitDataModel.platformStoreShowSwitch == 1 {
// buttonTittle = .fus_versionLocalString("去%@商城").replacingOccurrences(of: "%@", with: FUSConfig.sharedInstanced().appConfigs.appName) // buttonTittle = .fus_localString("去%@商城").replacingOccurrences(of: "%@", with: FUSConfig.sharedInstanced().appConfigs.appName)
// self.emptyView.clickEmptyBtnAction = { // self.emptyView.clickEmptyBtnAction = {
// //
// let storeUrl = FUSCacheDataShare.shareStore().settingInitDataModel.platformStoreBuyUrl // let storeUrl = FUSCacheDataShare.shareStore().settingInitDataModel.platformStoreBuyUrl
...@@ -108,7 +108,7 @@ class FUSBackpackGiftView: FUSBaseView { ...@@ -108,7 +108,7 @@ class FUSBackpackGiftView: FUSBaseView {
// } // }
// } // }
self.emptyView.fus_setEmptyViewIcon(.fus_emptyImg(), title: .fus_versionLocalString("暂无背包礼物"), buttonTittle: nil) self.emptyView.fus_setEmptyViewIcon(.fus_emptyImg(), title: .fus_localString("暂无背包礼物"), buttonTittle: nil)
} }
func fus_bindViewModel() { func fus_bindViewModel() {
......
...@@ -134,14 +134,14 @@ class FUSBackpackMotorCell: UICollectionViewCell { ...@@ -134,14 +134,14 @@ class FUSBackpackMotorCell: UICollectionViewCell {
if day > 0 { if day > 0 {
time = String(day) time = String(day)
timeUnit = .fus_versionLocalString("天") timeUnit = .fus_localString("天")
} else if hour > 0 { } else if hour > 0 {
time = String(hour) time = String(hour)
timeUnit = .fus_versionLocalString("小时Unit") timeUnit = .fus_localString("小时Unit")
} else { } else {
time = String(min) time = String(min)
timeUnit = .fus_versionLocalString("分钟") timeUnit = .fus_localString("分钟")
} }
if day > 3 { if day > 3 {
timeColor = UIColor.fus_theme() timeColor = UIColor.fus_theme()
...@@ -217,7 +217,7 @@ class FUSBackpackMotorCell: UICollectionViewCell { ...@@ -217,7 +217,7 @@ class FUSBackpackMotorCell: UICollectionViewCell {
self.wearImageView.isHidden = true self.wearImageView.isHidden = true
self.activeStateLabel.isHidden = model.status self.activeStateLabel.isHidden = model.status
self.activeStateLabel.text = model.state == true ? String.fus_versionLocalString("已激活") : String.fus_versionLocalString("未激活") self.activeStateLabel.text = model.state == true ? String.fus_localString("已激活") : String.fus_localString("未激活")
self.lightImageView.isHidden = !isSelected self.lightImageView.isHidden = !isSelected
self.bottomLightImageView.isHidden = !isSelected self.bottomLightImageView.isHidden = !isSelected
......
...@@ -35,7 +35,7 @@ class FUSBackpackMotorView: FUSBaseView { ...@@ -35,7 +35,7 @@ class FUSBackpackMotorView: FUSBaseView {
} }
self.useBtn.style = .none self.useBtn.style = .none
self.useBtn.setTitle(.fus_versionLocalString("装配"), for: .normal) self.useBtn.setTitle(.fus_localString("装配"), for: .normal)
self.useBtn.titleLabel?.font = .fus_themeMediumFont(15) self.useBtn.titleLabel?.font = .fus_themeMediumFont(15)
self.useBtn.backgroundColor = .fus_theme() self.useBtn.backgroundColor = .fus_theme()
self.useBtn.layer.cornerRadius = 38 / 2; self.useBtn.layer.cornerRadius = 38 / 2;
...@@ -130,7 +130,7 @@ class FUSBackpackMotorView: FUSBaseView { ...@@ -130,7 +130,7 @@ class FUSBackpackMotorView: FUSBaseView {
// var buttonTittle = "" // var buttonTittle = ""
// if FUSCacheDataShare.shareStore().settingInitDataModel.platformStoreShowSwitch == 1 { // if FUSCacheDataShare.shareStore().settingInitDataModel.platformStoreShowSwitch == 1 {
// buttonTittle = .fus_versionLocalString("去%@商城").replacingOccurrences(of: "%@", with: FUSConfig.sharedInstanced().appConfigs.appName) // buttonTittle = .fus_localString("去%@商城").replacingOccurrences(of: "%@", with: FUSConfig.sharedInstanced().appConfigs.appName)
// self.emptyView.clickEmptyBtnAction = { // self.emptyView.clickEmptyBtnAction = {
// //
// let storeUrl = FUSCacheDataShare.shareStore().settingInitDataModel.platformStoreBuyUrl // let storeUrl = FUSCacheDataShare.shareStore().settingInitDataModel.platformStoreBuyUrl
...@@ -141,7 +141,7 @@ class FUSBackpackMotorView: FUSBaseView { ...@@ -141,7 +141,7 @@ class FUSBackpackMotorView: FUSBaseView {
// } // }
// } // }
self.emptyView.fus_setEmptyViewIcon(.fus_emptyImg(), title: .fus_versionLocalString("暂无座驾"), buttonTittle: nil) self.emptyView.fus_setEmptyViewIcon(.fus_emptyImg(), title: .fus_localString("暂无座驾"), buttonTittle: nil)
} }
...@@ -183,19 +183,19 @@ class FUSBackpackMotorView: FUSBaseView { ...@@ -183,19 +183,19 @@ class FUSBackpackMotorView: FUSBaseView {
if let model = self?.motorList.value[selectedindex] { if let model = self?.motorList.value[selectedindex] {
self?.motorNameLabel.text = model.name self?.motorNameLabel.text = model.name
if model.state == true { if model.state == true {
self?.statusLabel.text = .fus_versionLocalString("已激活") self?.statusLabel.text = .fus_localString("已激活")
self?.descLabel.text = "\(String.fus_versionLocalString("有效期至")) \(model.expireFullTime)" self?.descLabel.text = "\(String.fus_localString("有效期至")) \(model.expireFullTime)"
} else { } else {
self?.statusLabel.text = .fus_versionLocalString("未激活") self?.statusLabel.text = .fus_localString("未激活")
self?.descLabel.text = "\(String.fus_versionLocalString("有效期:"))\(model.fus_expiretimeStr())\(model.fus_expiretimeUnit())" self?.descLabel.text = "\(String.fus_localString("有效期:"))\(model.fus_expiretimeStr())\(model.fus_expiretimeUnit())"
} }
if model.status == true { if model.status == true {
self?.useBtn.setTitle(.fus_versionLocalString("已装配"), for: .normal) self?.useBtn.setTitle(.fus_localString("已装配"), for: .normal)
self?.useBtn.isEnabled = false self?.useBtn.isEnabled = false
} else { } else {
self?.useBtn.setTitle(.fus_versionLocalString("装配"), for: .normal) self?.useBtn.setTitle(.fus_localString("装配"), for: .normal)
self?.useBtn.isEnabled = true self?.useBtn.isEnabled = true
} }
} }
......
...@@ -103,19 +103,19 @@ class FUSBackpackPropsCell: UICollectionViewCell { ...@@ -103,19 +103,19 @@ class FUSBackpackPropsCell: UICollectionViewCell {
if day > 0 { if day > 0 {
time = String(day) time = String(day)
timeStr = "\(time) \(String.fus_versionLocalString("天"))" timeStr = "\(time) \(String.fus_localString("天"))"
timeColor = .init(hex: "#7F7F80") timeColor = .init(hex: "#7F7F80")
} else if hour > 0 { } else if hour > 0 {
time = String(hour) time = String(hour)
timeStr = "\(time) \(String.fus_versionLocalString("小时Unit"))" timeStr = "\(time) \(String.fus_localString("小时Unit"))"
timeColor = .init(hex: "#e84f4c") timeColor = .init(hex: "#e84f4c")
} else { } else {
time = String(min) time = String(min)
timeStr = "\(time) \(String.fus_versionLocalString("分钟Unit"))" timeStr = "\(time) \(String.fus_localString("分钟Unit"))"
timeColor = .init(hex: "#e84f4c") timeColor = .init(hex: "#e84f4c")
} }
......
...@@ -25,7 +25,7 @@ class FUSBackpackPropsView: FUSBaseView { ...@@ -25,7 +25,7 @@ class FUSBackpackPropsView: FUSBaseView {
didSet { didSet {
// var buttonTittle = "" // var buttonTittle = ""
// if FUSCacheDataShare.shareStore().settingInitDataModel.platformStoreShowSwitch == 1 { // if FUSCacheDataShare.shareStore().settingInitDataModel.platformStoreShowSwitch == 1 {
// buttonTittle = .fus_versionLocalString("去%@商城").replacingOccurrences(of: "%@", with: FUSConfig.sharedInstanced().appConfigs.appName) // buttonTittle = .fus_localString("去%@商城").replacingOccurrences(of: "%@", with: FUSConfig.sharedInstanced().appConfigs.appName)
// self.emptyView.clickEmptyBtnAction = { // self.emptyView.clickEmptyBtnAction = {
// let storeUrl = FUSCacheDataShare.shareStore().settingInitDataModel.platformStoreBuyUrl // let storeUrl = FUSCacheDataShare.shareStore().settingInitDataModel.platformStoreBuyUrl
// let webVC = FUSWKWebViewController() // let webVC = FUSWKWebViewController()
...@@ -51,7 +51,7 @@ class FUSBackpackPropsView: FUSBaseView { ...@@ -51,7 +51,7 @@ class FUSBackpackPropsView: FUSBaseView {
make.height.equalTo(70) make.height.equalTo(70)
} }
self.useBtn.setTitle(.fus_versionLocalString("使用"), for: .normal) self.useBtn.setTitle(.fus_localString("使用"), for: .normal)
self.useBtn.titleLabel?.font = .fus_themeMediumFont(15) self.useBtn.titleLabel?.font = .fus_themeMediumFont(15)
self.useBtn.style = .blue self.useBtn.style = .blue
self.useBtn.rx.tap.subscribe(onNext: { [weak self] _ in self.useBtn.rx.tap.subscribe(onNext: { [weak self] _ in
......
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