Skip to content
This repository was archived by the owner on Feb 1, 2026. It is now read-only.

Commit a1b5d61

Browse files
RemiBardonRemiBardon
committed
chore: Fix rebase issues and add fatalErrors
1 parent 7401868 commit a1b5d61

4 files changed

Lines changed: 119 additions & 27 deletions

File tree

‎Prose/ProseLib/Sources/AppLocalization/Generated/Strings+Generated.swift‎

Lines changed: 113 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,52 +18,98 @@ public enum L10n {
1818
public enum AddMember {
1919
public enum CancelAction {
2020
/// Cancel
21-
public static let label = L10n.tr("Localizable", "add_member.cancel_action.label")
21+
public static let label = L10n.tr(
22+
"Localizable",
23+
"add_member.cancel_action.label",
24+
fallback: #"Cancel"#
25+
)
2226
}
2327

2428
public enum Header {
2529
/// Add an existing chat address, or invite an email to join your team.
26-
public static let subtitle = L10n.tr("Localizable", "add_member.header.subtitle")
30+
public static let subtitle = L10n.tr(
31+
"Localizable",
32+
"add_member.header.subtitle",
33+
fallback: #"Add an existing chat address, or invite an email to join your team."#
34+
)
2735
/// Add a new member
28-
public static let title = L10n.tr("Localizable", "add_member.header.title")
36+
public static let title = L10n.tr(
37+
"Localizable",
38+
"add_member.header.title",
39+
fallback: #"Add a new member"#
40+
)
2941
}
3042

3143
public enum InviteAction {
3244
/// Invite
33-
public static let label = L10n.tr("Localizable", "add_member.invite_action.label")
45+
public static let label = L10n.tr(
46+
"Localizable",
47+
"add_member.invite_action.label",
48+
fallback: #"Invite"#
49+
)
3450
}
3551

3652
public enum SendRequestAction {
3753
/// Send Request
38-
public static let label = L10n.tr("Localizable", "add_member.send_request_action.label")
54+
public static let label = L10n.tr(
55+
"Localizable",
56+
"add_member.send_request_action.label",
57+
fallback: #"Send Request"#
58+
)
3959
}
4060

4161
public enum State {
4262
public enum Existing {
4363
/// A contact request will be sent to **%s**.
4464
public static func label(_ p1: UnsafePointer<CChar>) -> String {
45-
L10n.tr("Localizable", "add_member.state.existing.label", p1)
65+
L10n.tr(
66+
"Localizable",
67+
"add_member.state.existing.label",
68+
p1,
69+
fallback: #"A contact request will be sent to **%s**."#
70+
)
4671
}
4772

4873
/// Once **%s** accepts your request, you will be able to chat and call.
4974
public static func sublabel(_ p1: UnsafePointer<CChar>) -> String {
50-
L10n.tr("Localizable", "add_member.state.existing.sublabel", p1)
75+
L10n.tr(
76+
"Localizable",
77+
"add_member.state.existing.sublabel",
78+
p1,
79+
fallback: #"Once **%s** accepts your request, you will be able to chat and call."#
80+
)
5181
}
5282
}
5383

5484
public enum Unknown {
5585
/// This chat address doesn't exist yet.
56-
public static let label = L10n.tr("Localizable", "add_member.state.unknown.label")
86+
public static let label = L10n.tr(
87+
"Localizable",
88+
"add_member.state.unknown.label",
89+
fallback: #"This chat address doesn't exist yet."#
90+
)
5791
/// You can invite this person to join your team.
58-
public static let sublabel = L10n.tr("Localizable", "add_member.state.unknown.sublabel")
92+
public static let sublabel = L10n.tr(
93+
"Localizable",
94+
"add_member.state.unknown.sublabel",
95+
fallback: #"You can invite this person to join your team."#
96+
)
5997
}
6098
}
6199

62100
public enum TextField {
63101
/// Chat address
64-
public static let label = L10n.tr("Localizable", "add_member.text_field.label")
102+
public static let label = L10n.tr(
103+
"Localizable",
104+
"add_member.text_field.label",
105+
fallback: #"Chat address"#
106+
)
65107
/// someone@domain.tld
66-
public static let prompt = L10n.tr("Localizable", "add_member.text_field.prompt")
108+
public static let prompt = L10n.tr(
109+
"Localizable",
110+
"add_member.text_field.prompt",
111+
fallback: #"someone@domain.tld"#
112+
)
67113
}
68114
}
69115

@@ -1334,49 +1380,94 @@ public enum L10n {
13341380
public enum JoinGroup {
13351381
public enum CancelAction {
13361382
/// Cancel
1337-
public static let label = L10n.tr("Localizable", "join_group.cancel_action.label")
1383+
public static let label = L10n.tr(
1384+
"Localizable",
1385+
"join_group.cancel_action.label",
1386+
fallback: #"Cancel"#
1387+
)
13381388
}
13391389

13401390
public enum CreateGroupAction {
13411391
/// Create Group
1342-
public static let label = L10n.tr("Localizable", "join_group.create_group_action.label")
1392+
public static let label = L10n.tr(
1393+
"Localizable",
1394+
"join_group.create_group_action.label",
1395+
fallback: #"Create Group"#
1396+
)
13431397
}
13441398

13451399
public enum Header {
13461400
/// Create a new group and invite people, or join an existing group.
1347-
public static let subtitle = L10n.tr("Localizable", "join_group.header.subtitle")
1401+
public static let subtitle = L10n.tr(
1402+
"Localizable",
1403+
"join_group.header.subtitle",
1404+
fallback: #"Create a new group and invite people, or join an existing group."#
1405+
)
13481406
/// Create or join a group
1349-
public static let title = L10n.tr("Localizable", "join_group.header.title")
1407+
public static let title = L10n.tr(
1408+
"Localizable",
1409+
"join_group.header.title",
1410+
fallback: #"Create or join a group"#
1411+
)
13501412
}
13511413

13521414
public enum JoinGroupAction {
13531415
/// Join Group
1354-
public static let label = L10n.tr("Localizable", "join_group.join_group_action.label")
1416+
public static let label = L10n.tr(
1417+
"Localizable",
1418+
"join_group.join_group_action.label",
1419+
fallback: #"Join Group"#
1420+
)
13551421
}
13561422

13571423
public enum State {
13581424
public enum Existing {
13591425
/// This group exists, and is open. You will be able to join it immediately.
1360-
public static let label = L10n.tr("Localizable", "join_group.state.existing.label")
1426+
public static let label = L10n.tr(
1427+
"Localizable",
1428+
"join_group.state.existing.label",
1429+
fallback: #"This group exists, and is open. You will be able to join it immediately."#
1430+
)
13611431
/// %u people are currently in this group. They will see that you joined.
13621432
public static func sublabel(_ p1: Int) -> String {
1363-
L10n.tr("Localizable", "join_group.state.existing.sublabel", p1)
1433+
L10n.tr(
1434+
"Localizable",
1435+
"join_group.state.existing.sublabel",
1436+
p1,
1437+
fallback: #"%u people are currently in this group. They will see that you joined."#
1438+
)
13641439
}
13651440
}
13661441

13671442
public enum Unknown {
13681443
/// This group doesn't exist yet.
1369-
public static let label = L10n.tr("Localizable", "join_group.state.unknown.label")
1444+
public static let label = L10n.tr(
1445+
"Localizable",
1446+
"join_group.state.unknown.label",
1447+
fallback: #"This group doesn't exist yet."#
1448+
)
13701449
/// You can create it now and invite people later.
1371-
public static let sublabel = L10n.tr("Localizable", "join_group.state.unknown.sublabel")
1450+
public static let sublabel = L10n.tr(
1451+
"Localizable",
1452+
"join_group.state.unknown.sublabel",
1453+
fallback: #"You can create it now and invite people later."#
1454+
)
13721455
}
13731456
}
13741457

13751458
public enum TextField {
13761459
/// Group chat address
1377-
public static let label = L10n.tr("Localizable", "join_group.text_field.label")
1460+
public static let label = L10n.tr(
1461+
"Localizable",
1462+
"join_group.text_field.label",
1463+
fallback: #"Group chat address"#
1464+
)
13781465
/// groupname@domain.tld
1379-
public static let prompt = L10n.tr("Localizable", "join_group.text_field.prompt")
1466+
public static let prompt = L10n.tr(
1467+
"Localizable",
1468+
"join_group.text_field.prompt",
1469+
fallback: #"groupname@domain.tld"#
1470+
)
13801471
}
13811472
}
13821473

‎Prose/ProseLib/Sources/JoinChatFeature/JoinGroupSheet.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public struct JoinGroupSheet: View {
9292
icon: "bolt.circle",
9393
label: l10n.State.Existing.label,
9494
secondaryLabel: l10n.State.Existing.sublabel(peopleCount),
95-
color: Colors.State.blue.color
95+
color: .blue
9696
)
9797
}
9898
}

‎Prose/ProseLib/Sources/SidebarFeature/SidebarReducer.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,9 @@ public let sidebarReducer: Reducer<
147147
state.sheet = nil
148148
return .none
149149

150+
case .addMember(.submitTapped), .joinGroup(.submitTapped):
151+
fatalError("\(action) not implemented yet.")
152+
150153
default:
151154
return .none
152155
}

‎Prose/ProseLib/Sources/SidebarFeature/SidebarView.swift‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,6 @@ public struct SidebarView: View {
109109
ActionButton(title: L10n.Sidebar.TeamMembers.Add.label) {
110110
viewStore.send(.addContactButtonTapped)
111111
}
112-
// https://github.com/prose-im/prose-app-macos/issues/45
113-
.disabled(true)
114112
}
115113
}
116114
}
@@ -119,13 +117,13 @@ public struct SidebarView: View {
119117
private var groupsSection: some View {
120118
Section(L10n.Sidebar.Groups.title) {
121119
IconRow(title: "My group", icon: .group)
120+
// https://github.com/prose-im/prose-app-macos/issues/45
122121
.opacity(0.5)
122+
.disabled(true)
123123
ActionButton(title: L10n.Sidebar.Groups.Add.label) {
124124
self.viewStore.send(.addGroupButtonTapped)
125125
}
126126
}
127-
// https://github.com/prose-im/prose-app-macos/issues/45
128-
.disabled(true)
129127
}
130128
}
131129

0 commit comments

Comments
 (0)