zelo72
/
mastodon-ios
mirror of https://github.com/mastodon/mastodon-ios
2
2
Fork 1
Code Issues 17 Releases Wiki Activity

chore: remove useless change

This commit is contained in:
sunxiaojian 2021-04-30 15:38:15 +08:00
parent 8a5c62990e
commit 514e5b0443
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Localization/app.json
View File

@ -92,7 +92,7 @@
"pending": "Pending",
"block": "Block",
"block_user": "Block %s",
"block_domain": "Domain Blocked",
"block_domain": "Block %s",
"unblock": "Unblock",
"unblock_user": "Unblock %s",
"blocked": "Blocked",

10
Mastodon/Diffiable/Section/StatusSection.swift
View File

@ -634,9 +634,17 @@ extension StatusSection {
.assertNoFailure()
)
.receive(on: DispatchQueue.main)
.sink { [weak dependency, weak cell] domains,change in
.sink { [weak dependency, weak cell] _,change in
guard let cell = cell else { return }
guard let dependency = dependency else { return }
switch change.changeType {
case .delete:
return
case .update(_):
break
case .none:
break
}
StatusSection.setupStatusMoreButtonMenu(cell: cell, indexPath: indexPath, dependency: dependency, status: status)
}
.store(in: &cell.disposeBag)

6
Mastodon/Generated/Strings.swift
View File

@ -132,8 +132,10 @@ internal enum L10n {
internal enum Firendship {
/// Block
internal static let block = L10n.tr("Localizable", "Common.Controls.Firendship.Block")
/// Domain Blocked
internal static let blockDomain = L10n.tr("Localizable", "Common.Controls.Firendship.BlockDomain")
/// Block %@
internal static func blockDomain(_ p1: Any) -> String {
return L10n.tr("Localizable", "Common.Controls.Firendship.BlockDomain", String(describing: p1))
}
/// Blocked
internal static let blocked = L10n.tr("Localizable", "Common.Controls.Firendship.Blocked")
/// Block %@

2
Mastodon/Resources/en.lproj/Localizable.strings
View File

@ -43,7 +43,7 @@ Please check your internet connection.";
"Common.Controls.Actions.TryAgain" = "Try Again";
"Common.Controls.Actions.UnblockDomain" = "Unblock %@";
"Common.Controls.Firendship.Block" = "Block";
"Common.Controls.Firendship.BlockDomain" = "Domain Blocked";
"Common.Controls.Firendship.BlockDomain" = "Block %@";
"Common.Controls.Firendship.BlockUser" = "Block %@";
"Common.Controls.Firendship.Blocked" = "Blocked";
"Common.Controls.Firendship.EditInfo" = "Edit info";

4
Mastodon/Scene/Profile/ProfileViewModel.swift
View File

@ -327,7 +327,6 @@ extension ProfileViewModel {
case muting
case blocked
case blocking
case domainBlocking
case suspended
case edit
case editing
@ -350,7 +349,6 @@ extension ProfileViewModel {
static let muting = RelationshipAction.muting.option
static let blocked = RelationshipAction.blocked.option
static let blocking = RelationshipAction.blocking.option
static let domainBlocking = RelationshipAction.domainBlocking.option
static let suspended = RelationshipAction.suspended.option
static let edit = RelationshipAction.edit.option
static let editing = RelationshipAction.editing.option
@ -381,7 +379,6 @@ extension ProfileViewModel {
case .muting: return L10n.Common.Controls.Firendship.muted
case .blocked: return L10n.Common.Controls.Firendship.follow // blocked by user
case .blocking: return L10n.Common.Controls.Firendship.blocked
case .domainBlocking: return L10n.Common.Controls.Firendship.blockDomain
case .suspended: return L10n.Common.Controls.Firendship.follow
case .edit: return L10n.Common.Controls.Firendship.editInfo
case .editing: return L10n.Common.Controls.Actions.done
@ -403,7 +400,6 @@ extension ProfileViewModel {
case .muting: return Asset.Colors.Background.alertYellow.color
case .blocked: return Asset.Colors.Button.normal.color
case .blocking: return Asset.Colors.Background.danger.color
case .domainBlocking: return Asset.Colors.Button.normal.color
case .suspended: return Asset.Colors.Button.normal.color
case .edit: return Asset.Colors.Button.normal.color
case .editing: return Asset.Colors.Button.normal.color