diff --git a/Session/Conversations/Views & Modals/JoinOpenGroupModal.swift b/Session/Conversations/Views & Modals/JoinOpenGroupModal.swift index 3e8dde97d..aa3766d6c 100644 --- a/Session/Conversations/Views & Modals/JoinOpenGroupModal.swift +++ b/Session/Conversations/Views & Modals/JoinOpenGroupModal.swift @@ -53,7 +53,7 @@ final class JoinOpenGroupModal: Modal { joinButton.backgroundColor = Colors.buttonBackground joinButton.titleLabel!.font = .systemFont(ofSize: Values.smallFontSize) joinButton.setTitleColor(Colors.text, for: UIControl.State.normal) - joinButton.setTitle("Join", for: UIControl.State.normal) + joinButton.setTitle("JOIN_COMMUNITY_BUTTON_TITLE".localized(), for: UIControl.State.normal) joinButton.addTarget(self, action: #selector(joinOpenGroup), for: UIControl.Event.touchUpInside) // Button stack view diff --git a/Session/Meta/Translations/de.lproj/Localizable.strings b/Session/Meta/Translations/de.lproj/Localizable.strings index 113f5a183..0f3da385f 100644 --- a/Session/Meta/Translations/de.lproj/Localizable.strings +++ b/Session/Meta/Translations/de.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/en.lproj/Localizable.strings b/Session/Meta/Translations/en.lproj/Localizable.strings index e4d78b256..cc1c26a72 100644 --- a/Session/Meta/Translations/en.lproj/Localizable.strings +++ b/Session/Meta/Translations/en.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/es.lproj/Localizable.strings b/Session/Meta/Translations/es.lproj/Localizable.strings index a00e0c58c..e447a29e6 100644 --- a/Session/Meta/Translations/es.lproj/Localizable.strings +++ b/Session/Meta/Translations/es.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/fa.lproj/Localizable.strings b/Session/Meta/Translations/fa.lproj/Localizable.strings index 06ba2c5cb..82423e38e 100644 --- a/Session/Meta/Translations/fa.lproj/Localizable.strings +++ b/Session/Meta/Translations/fa.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/fi.lproj/Localizable.strings b/Session/Meta/Translations/fi.lproj/Localizable.strings index 9adbbd5a4..7989da67f 100644 --- a/Session/Meta/Translations/fi.lproj/Localizable.strings +++ b/Session/Meta/Translations/fi.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/fr.lproj/Localizable.strings b/Session/Meta/Translations/fr.lproj/Localizable.strings index 4d4fdee29..54da86768 100644 --- a/Session/Meta/Translations/fr.lproj/Localizable.strings +++ b/Session/Meta/Translations/fr.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/hi.lproj/Localizable.strings b/Session/Meta/Translations/hi.lproj/Localizable.strings index f4a6a0831..d79703f35 100644 --- a/Session/Meta/Translations/hi.lproj/Localizable.strings +++ b/Session/Meta/Translations/hi.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/hr.lproj/Localizable.strings b/Session/Meta/Translations/hr.lproj/Localizable.strings index 74f20d423..17fa91859 100644 --- a/Session/Meta/Translations/hr.lproj/Localizable.strings +++ b/Session/Meta/Translations/hr.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/id-ID.lproj/Localizable.strings b/Session/Meta/Translations/id-ID.lproj/Localizable.strings index c9e4ad1b8..d50e08397 100644 --- a/Session/Meta/Translations/id-ID.lproj/Localizable.strings +++ b/Session/Meta/Translations/id-ID.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/it.lproj/Localizable.strings b/Session/Meta/Translations/it.lproj/Localizable.strings index e58247d28..8f20f588d 100644 --- a/Session/Meta/Translations/it.lproj/Localizable.strings +++ b/Session/Meta/Translations/it.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/ja.lproj/Localizable.strings b/Session/Meta/Translations/ja.lproj/Localizable.strings index e4596ade1..6185b3ad5 100644 --- a/Session/Meta/Translations/ja.lproj/Localizable.strings +++ b/Session/Meta/Translations/ja.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/nl.lproj/Localizable.strings b/Session/Meta/Translations/nl.lproj/Localizable.strings index 8ec75219d..ada8b4092 100644 --- a/Session/Meta/Translations/nl.lproj/Localizable.strings +++ b/Session/Meta/Translations/nl.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/pl.lproj/Localizable.strings b/Session/Meta/Translations/pl.lproj/Localizable.strings index fe4f9b0c8..ad77428b6 100644 --- a/Session/Meta/Translations/pl.lproj/Localizable.strings +++ b/Session/Meta/Translations/pl.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/pt_BR.lproj/Localizable.strings b/Session/Meta/Translations/pt_BR.lproj/Localizable.strings index d725ce34f..a13ec240b 100644 --- a/Session/Meta/Translations/pt_BR.lproj/Localizable.strings +++ b/Session/Meta/Translations/pt_BR.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/ru.lproj/Localizable.strings b/Session/Meta/Translations/ru.lproj/Localizable.strings index 32fcd2f7a..28eb7d371 100644 --- a/Session/Meta/Translations/ru.lproj/Localizable.strings +++ b/Session/Meta/Translations/ru.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/si.lproj/Localizable.strings b/Session/Meta/Translations/si.lproj/Localizable.strings index 056e268b8..2bc02f293 100644 --- a/Session/Meta/Translations/si.lproj/Localizable.strings +++ b/Session/Meta/Translations/si.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/sk.lproj/Localizable.strings b/Session/Meta/Translations/sk.lproj/Localizable.strings index b980493af..90da4af9e 100644 --- a/Session/Meta/Translations/sk.lproj/Localizable.strings +++ b/Session/Meta/Translations/sk.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/sv.lproj/Localizable.strings b/Session/Meta/Translations/sv.lproj/Localizable.strings index 15ffd7431..12cf7b6f1 100644 --- a/Session/Meta/Translations/sv.lproj/Localizable.strings +++ b/Session/Meta/Translations/sv.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/th.lproj/Localizable.strings b/Session/Meta/Translations/th.lproj/Localizable.strings index e8fc83e14..aa3d751f0 100644 --- a/Session/Meta/Translations/th.lproj/Localizable.strings +++ b/Session/Meta/Translations/th.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/vi-VN.lproj/Localizable.strings b/Session/Meta/Translations/vi-VN.lproj/Localizable.strings index 334b4f920..f1a783851 100644 --- a/Session/Meta/Translations/vi-VN.lproj/Localizable.strings +++ b/Session/Meta/Translations/vi-VN.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings b/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings index a60bd1ba0..61045a1fa 100644 --- a/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh-Hant.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Meta/Translations/zh_CN.lproj/Localizable.strings b/Session/Meta/Translations/zh_CN.lproj/Localizable.strings index 9d9d71223..f833919df 100644 --- a/Session/Meta/Translations/zh_CN.lproj/Localizable.strings +++ b/Session/Meta/Translations/zh_CN.lproj/Localizable.strings @@ -714,3 +714,4 @@ /* New conversation screen*/ "vc_new_conversation_title" = "New Conversation"; "CREATE_GROUP_BUTTON_TITLE" = "Create"; +"JOIN_COMMUNITY_BUTTON_TITLE" = "Join"; diff --git a/Session/Open Groups/JoinOpenGroupVC.swift b/Session/Open Groups/JoinOpenGroupVC.swift index d084f9bdd..c6fb9c912 100644 --- a/Session/Open Groups/JoinOpenGroupVC.swift +++ b/Session/Open Groups/JoinOpenGroupVC.swift @@ -245,18 +245,18 @@ private final class EnterURLVC: UIViewController, UIGestureRecognizerDelegate, O view.backgroundColor = .clear // Next button - let nextButton = Button(style: .prominentOutline, size: .large) - nextButton.setTitle(NSLocalizedString("next", comment: ""), for: UIControl.State.normal) - nextButton.addTarget(self, action: #selector(joinOpenGroup), for: UIControl.Event.touchUpInside) + let joinButton = Button(style: .prominentOutline, size: .large) + joinButton.setTitle("JOIN_COMMUNITY_BUTTON_TITLE".localized(), for: UIControl.State.normal) + joinButton.addTarget(self, action: #selector(joinOpenGroup), for: UIControl.Event.touchUpInside) - let nextButtonContainer = UIView( - wrapping: nextButton, + let joinButtonContainer = UIView( + wrapping: joinButton, withInsets: UIEdgeInsets(top: 0, leading: 80, bottom: 0, trailing: 80), shouldAdaptForIPadWithWidth: Values.iPadButtonWidth ) // Stack view - let stackView = UIStackView(arrangedSubviews: [ urlTextView, UIView.spacer(withHeight: Values.mediumSpacing), suggestionGridTitleLabel, UIView.spacer(withHeight: Values.mediumSpacing), suggestionGrid, UIView.vStretchingSpacer(), nextButtonContainer ]) + let stackView = UIStackView(arrangedSubviews: [ urlTextView, UIView.spacer(withHeight: Values.mediumSpacing), suggestionGridTitleLabel, UIView.spacer(withHeight: Values.mediumSpacing), suggestionGrid, UIView.vStretchingSpacer(), joinButtonContainer ]) stackView.axis = .vertical stackView.alignment = .fill stackView.layoutMargins = UIEdgeInsets(uniform: Values.largeSpacing)