keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use newly translated strings

Browse Source
pull/406/head
Niels Andriesse 3 years ago
parent 92af8da03e
commit ea668f0344
18 changed files with 37 additions and 35 deletions
Show Stats Download Patch File Download Diff File

4
Session/Conversations/Input View/InputTextView.swift
Unescape Escape View File

@ -9,7 +9,7 @@ public final class InputTextView : UITextView, UITextViewDelegate {
// MARK: UI Components // MARK: UI Components
private lazy var placeholderLabel: UILabel = { private lazy var placeholderLabel: UILabel = {
let result = UILabel() let result = UILabel()
result.text = "Message" result.text = NSLocalizedString("vc_conversation_input_prompt", comment: "")
result.font = .systemFont(ofSize: Values.mediumFontSize) result.font = .systemFont(ofSize: Values.mediumFontSize)
result.textColor = Colors.text.withAlphaComponent(Values.mediumOpacity) result.textColor = Colors.text.withAlphaComponent(Values.mediumOpacity)
return result return result
@ -74,7 +74,7 @@ public final class InputTextView : UITextView, UITextViewDelegate {
} }
// MARK: Delegate // MARK: Delegate
protocol InputTextViewDelegate : class { protocol InputTextViewDelegate : AnyObject {
func inputTextViewDidChangeSize(_ inputTextView: InputTextView) func inputTextViewDidChangeSize(_ inputTextView: InputTextView)
func inputTextViewDidChangeContent(_ inputTextView: InputTextView) func inputTextViewDidChangeContent(_ inputTextView: InputTextView)

2
Session/Conversations/Input View/InputView.swift
Unescape Escape View File

@ -341,7 +341,7 @@ final class InputView : UIView, InputViewButtonDelegate, InputTextViewDelegate,
} }
// MARK: Delegate // MARK: Delegate
protocol InputViewDelegate : class, ExpandingAttachmentsButtonDelegate, VoiceMessageRecordingViewDelegate { protocol InputViewDelegate : AnyObject, ExpandingAttachmentsButtonDelegate, VoiceMessageRecordingViewDelegate {
func showLinkPreviewSuggestionModal() func showLinkPreviewSuggestionModal()
func handleSendButtonTapped() func handleSendButtonTapped()

2
Session/Conversations/Input View/VoiceMessageRecordingView.swift
Unescape Escape View File

@ -61,7 +61,7 @@ final class VoiceMessageRecordingView : UIView {
private lazy var slideToCancelLabel: UILabel = { private lazy var slideToCancelLabel: UILabel = {
let result = UILabel() let result = UILabel()
result.text = "Slide to cancel" result.text = NSLocalizedString("vc_conversation_voice_message_cancel_message", comment: "")
result.font = .systemFont(ofSize: Values.smallFontSize) result.font = .systemFont(ofSize: Values.smallFontSize)
result.textColor = Colors.text.withAlphaComponent(Values.mediumOpacity) result.textColor = Colors.text.withAlphaComponent(Values.mediumOpacity)
return result return result

2
Session/Conversations/Settings/OWSConversationSettingsViewController.m
Unescape Escape View File

@ -291,7 +291,7 @@ CGFloat kIconViewLength = 24;
[mainSection addItem:[OWSTableItem [mainSection addItem:[OWSTableItem
itemWithCustomCellBlock:^{ itemWithCustomCellBlock:^{
return [weakSelf return [weakSelf
disclosureCellWithName:@"Copy Session ID" disclosureCellWithName:NSLocalizedString(@"vc_conversation_settings_copy_session_id_button_title", "")
iconName:@"ic_copy" iconName:@"ic_copy"
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME( accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(
OWSConversationSettingsViewController, @"copy_session_id")]; OWSConversationSettingsViewController, @"copy_session_id")];

6
Session/Conversations/Views & Modals/BlockedModal.swift
Unescape Escape View File

@ -23,13 +23,13 @@ final class BlockedModal : Modal {
let titleLabel = UILabel() let titleLabel = UILabel()
titleLabel.textColor = Colors.text titleLabel.textColor = Colors.text
titleLabel.font = .boldSystemFont(ofSize: Values.largeFontSize) titleLabel.font = .boldSystemFont(ofSize: Values.largeFontSize)
titleLabel.text = "Unblock \(name)?" titleLabel.text = String(format: NSLocalizedString("modal_blocked_title", comment: ""), name)
titleLabel.textAlignment = .center titleLabel.textAlignment = .center
// Message // Message
let messageLabel = UILabel() let messageLabel = UILabel()
messageLabel.textColor = Colors.text messageLabel.textColor = Colors.text
messageLabel.font = .systemFont(ofSize: Values.smallFontSize) messageLabel.font = .systemFont(ofSize: Values.smallFontSize)
let message = "Are you sure you want to unblock \(name)?" let message = String(format: NSLocalizedString("modal_blocked_explanation", comment: ""), name)
let attributedMessage = NSMutableAttributedString(string: message) let attributedMessage = NSMutableAttributedString(string: message)
attributedMessage.addAttributes([ .font : UIFont.boldSystemFont(ofSize: Values.smallFontSize) ], range: (message as NSString).range(of: name)) attributedMessage.addAttributes([ .font : UIFont.boldSystemFont(ofSize: Values.smallFontSize) ], range: (message as NSString).range(of: name))
messageLabel.attributedText = attributedMessage messageLabel.attributedText = attributedMessage
@ -43,7 +43,7 @@ final class BlockedModal : Modal {
unblockButton.backgroundColor = Colors.buttonBackground unblockButton.backgroundColor = Colors.buttonBackground
unblockButton.titleLabel!.font = .systemFont(ofSize: Values.smallFontSize) unblockButton.titleLabel!.font = .systemFont(ofSize: Values.smallFontSize)
unblockButton.setTitleColor(Colors.text, for: UIControl.State.normal) unblockButton.setTitleColor(Colors.text, for: UIControl.State.normal)
unblockButton.setTitle("Unblock", for: UIControl.State.normal) unblockButton.setTitle(NSLocalizedString("modal_blocked_button_title", comment: ""), for: UIControl.State.normal)
unblockButton.addTarget(self, action: #selector(unblock), for: UIControl.Event.touchUpInside) unblockButton.addTarget(self, action: #selector(unblock), for: UIControl.Event.touchUpInside)
// Button stack view // Button stack view
let buttonStackView = UIStackView(arrangedSubviews: [ cancelButton, unblockButton ]) let buttonStackView = UIStackView(arrangedSubviews: [ cancelButton, unblockButton ])

6
Session/Conversations/Views & Modals/DownloadAttachmentModal.swift
Unescape Escape View File

@ -24,13 +24,13 @@ final class DownloadAttachmentModal : Modal {
let titleLabel = UILabel() let titleLabel = UILabel()
titleLabel.textColor = Colors.text titleLabel.textColor = Colors.text
titleLabel.font = .boldSystemFont(ofSize: Values.largeFontSize) titleLabel.font = .boldSystemFont(ofSize: Values.largeFontSize)
titleLabel.text = "Trust \(name)?" titleLabel.text = String(format: NSLocalizedString("modal_download_attachment_title", comment: ""), name)
titleLabel.textAlignment = .center titleLabel.textAlignment = .center
// Message // Message
let messageLabel = UILabel() let messageLabel = UILabel()
messageLabel.textColor = Colors.text messageLabel.textColor = Colors.text
messageLabel.font = .systemFont(ofSize: Values.smallFontSize) messageLabel.font = .systemFont(ofSize: Values.smallFontSize)
let message = "Are you sure you want to download media sent by \(name)?" let message = String(format: NSLocalizedString("modal_download_attachment_explanation", comment: ""), name)
let attributedMessage = NSMutableAttributedString(string: message) let attributedMessage = NSMutableAttributedString(string: message)
attributedMessage.addAttributes([ .font : UIFont.boldSystemFont(ofSize: Values.smallFontSize) ], range: (message as NSString).range(of: name)) attributedMessage.addAttributes([ .font : UIFont.boldSystemFont(ofSize: Values.smallFontSize) ], range: (message as NSString).range(of: name))
messageLabel.attributedText = attributedMessage messageLabel.attributedText = attributedMessage
@ -44,7 +44,7 @@ final class DownloadAttachmentModal : Modal {
downloadButton.backgroundColor = Colors.buttonBackground downloadButton.backgroundColor = Colors.buttonBackground
downloadButton.titleLabel!.font = .systemFont(ofSize: Values.smallFontSize) downloadButton.titleLabel!.font = .systemFont(ofSize: Values.smallFontSize)
downloadButton.setTitleColor(Colors.text, for: UIControl.State.normal) downloadButton.setTitleColor(Colors.text, for: UIControl.State.normal)
downloadButton.setTitle("Download", for: UIControl.State.normal) downloadButton.setTitle(NSLocalizedString("modal_download_button_title", comment: ""), for: UIControl.State.normal)
downloadButton.addTarget(self, action: #selector(trust), for: UIControl.Event.touchUpInside) downloadButton.addTarget(self, action: #selector(trust), for: UIControl.Event.touchUpInside)
// Button stack view // Button stack view
let buttonStackView = UIStackView(arrangedSubviews: [ cancelButton, downloadButton ]) let buttonStackView = UIStackView(arrangedSubviews: [ cancelButton, downloadButton ])

6
Session/Conversations/Views & Modals/LinkPreviewModal.swift
Unescape Escape View File

@ -21,13 +21,13 @@ final class LinkPreviewModal : Modal {
let titleLabel = UILabel() let titleLabel = UILabel()
titleLabel.textColor = Colors.text titleLabel.textColor = Colors.text
titleLabel.font = .boldSystemFont(ofSize: Values.largeFontSize) titleLabel.font = .boldSystemFont(ofSize: Values.largeFontSize)
titleLabel.text = "Enable Link Previews?" titleLabel.text = NSLocalizedString("modal_link_previews_title", comment: "")
titleLabel.textAlignment = .center titleLabel.textAlignment = .center
// Message // Message
let messageLabel = UILabel() let messageLabel = UILabel()
messageLabel.textColor = Colors.text messageLabel.textColor = Colors.text
messageLabel.font = .systemFont(ofSize: Values.smallFontSize) messageLabel.font = .systemFont(ofSize: Values.smallFontSize)
let message = "Enabling link previews will show previews for URLs you send and receive. This can be useful, but Session will need to contact linked websites to generate previews. You can always disable link previews in Session's settings." let message = NSLocalizedString("modal_link_previews_explanation", comment: "")
messageLabel.text = message messageLabel.text = message
messageLabel.numberOfLines = 0 messageLabel.numberOfLines = 0
messageLabel.lineBreakMode = .byWordWrapping messageLabel.lineBreakMode = .byWordWrapping
@ -39,7 +39,7 @@ final class LinkPreviewModal : Modal {
enableButton.backgroundColor = Colors.buttonBackground enableButton.backgroundColor = Colors.buttonBackground
enableButton.titleLabel!.font = .systemFont(ofSize: Values.smallFontSize) enableButton.titleLabel!.font = .systemFont(ofSize: Values.smallFontSize)
enableButton.setTitleColor(Colors.text, for: UIControl.State.normal) enableButton.setTitleColor(Colors.text, for: UIControl.State.normal)
enableButton.setTitle("Enable", for: UIControl.State.normal) enableButton.setTitle(NSLocalizedString("modal_link_previews_button_title", comment: ""), for: UIControl.State.normal)
enableButton.addTarget(self, action: #selector(enable), for: UIControl.Event.touchUpInside) enableButton.addTarget(self, action: #selector(enable), for: UIControl.Event.touchUpInside)
// Button stack view // Button stack view
let buttonStackView = UIStackView(arrangedSubviews: [ cancelButton, enableButton ]) let buttonStackView = UIStackView(arrangedSubviews: [ cancelButton, enableButton ])

6
Session/Conversations/Views & Modals/URLModal.swift
Unescape Escape View File

@ -21,13 +21,13 @@ final class URLModal : Modal {
let titleLabel = UILabel() let titleLabel = UILabel()
titleLabel.textColor = Colors.text titleLabel.textColor = Colors.text
titleLabel.font = .boldSystemFont(ofSize: Values.largeFontSize) titleLabel.font = .boldSystemFont(ofSize: Values.largeFontSize)
titleLabel.text = "Open URL?" titleLabel.text = NSLocalizedString("modal_open_url_title", comment: "")
titleLabel.textAlignment = .center titleLabel.textAlignment = .center
// Message // Message
let messageLabel = UILabel() let messageLabel = UILabel()
messageLabel.textColor = Colors.text messageLabel.textColor = Colors.text
messageLabel.font = .systemFont(ofSize: Values.smallFontSize) messageLabel.font = .systemFont(ofSize: Values.smallFontSize)
let message = "Are you sure you want to open \(url.absoluteString)?" let message = String(format: NSLocalizedString("modal_open_url_explanation", comment: ""), url.absoluteString)
let attributedMessage = NSMutableAttributedString(string: message) let attributedMessage = NSMutableAttributedString(string: message)
attributedMessage.addAttributes([ .font : UIFont.boldSystemFont(ofSize: Values.smallFontSize) ], range: (message as NSString).range(of: url.absoluteString)) attributedMessage.addAttributes([ .font : UIFont.boldSystemFont(ofSize: Values.smallFontSize) ], range: (message as NSString).range(of: url.absoluteString))
messageLabel.attributedText = attributedMessage messageLabel.attributedText = attributedMessage
@ -41,7 +41,7 @@ final class URLModal : Modal {
openButton.backgroundColor = Colors.buttonBackground openButton.backgroundColor = Colors.buttonBackground
openButton.titleLabel!.font = .systemFont(ofSize: Values.smallFontSize) openButton.titleLabel!.font = .systemFont(ofSize: Values.smallFontSize)
openButton.setTitleColor(Colors.text, for: UIControl.State.normal) openButton.setTitleColor(Colors.text, for: UIControl.State.normal)
openButton.setTitle("Open", for: UIControl.State.normal) openButton.setTitle(NSLocalizedString("modal_open_url_button_title", comment: ""), for: UIControl.State.normal)
openButton.addTarget(self, action: #selector(openURL), for: UIControl.Event.touchUpInside) openButton.addTarget(self, action: #selector(openURL), for: UIControl.Event.touchUpInside)
// Button stack view // Button stack view
let buttonStackView = UIStackView(arrangedSubviews: [ cancelButton, openButton ]) let buttonStackView = UIStackView(arrangedSubviews: [ cancelButton, openButton ])

4
Session/DMs/NewDMVC.swift
Unescape Escape View File

@ -167,7 +167,7 @@ private final class EnterPublicKeyVC : UIViewController {
// MARK: Components // MARK: Components
private lazy var publicKeyTextView: TextView = { private lazy var publicKeyTextView: TextView = {
let result = TextView(placeholder: "Enter Session ID or ONS name") let result = TextView(placeholder: NSLocalizedString("vc_enter_public_key_text_field_hint", comment: ""))
result.autocapitalizationType = .none result.autocapitalizationType = .none
return result return result
}() }()
@ -308,7 +308,7 @@ private final class EnterPublicKeyVC : UIViewController {
UIPasteboard.general.string = getUserHexEncodedPublicKey() UIPasteboard.general.string = getUserHexEncodedPublicKey()
copyButton.isUserInteractionEnabled = false copyButton.isUserInteractionEnabled = false
UIView.transition(with: copyButton, duration: 0.25, options: .transitionCrossDissolve, animations: { UIView.transition(with: copyButton, duration: 0.25, options: .transitionCrossDissolve, animations: {
self.copyButton.setTitle("Copied", for: UIControl.State.normal) self.copyButton.setTitle(NSLocalizedString("copied", comment: ""), for: UIControl.State.normal)
}, completion: nil) }, completion: nil)
Timer.scheduledTimer(timeInterval: 4, target: self, selector: #selector(enableCopyButton), userInfo: nil, repeats: false) Timer.scheduledTimer(timeInterval: 4, target: self, selector: #selector(enableCopyButton), userInfo: nil, repeats: false)
} }

4
Session/Home/HomeVC.swift
Unescape Escape View File

@ -89,7 +89,7 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, NewConv
setUpNavBarStyle() setUpNavBarStyle()
} }
updateNavBarButtons() updateNavBarButtons()
setNavBarTitle("Messages") setNavBarTitle(NSLocalizedString("vc_home_title", comment: ""))
// Recovery phrase reminder // Recovery phrase reminder
let hasViewedSeed = UserDefaults.standard[.hasViewedSeed] let hasViewedSeed = UserDefaults.standard[.hasViewedSeed]
if !hasViewedSeed { if !hasViewedSeed {
@ -326,7 +326,7 @@ final class HomeVC : BaseVC, UITableViewDataSource, UITableViewDelegate, NewConv
let delete = UITableViewRowAction(style: .destructive, title: NSLocalizedString("TXT_DELETE_TITLE", comment: "")) { [weak self] _, _ in let delete = UITableViewRowAction(style: .destructive, title: NSLocalizedString("TXT_DELETE_TITLE", comment: "")) { [weak self] _, _ in
var message = NSLocalizedString("CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE", comment: "") var message = NSLocalizedString("CONVERSATION_DELETE_CONFIRMATION_ALERT_MESSAGE", comment: "")
if let thread = thread as? TSGroupThread, thread.isClosedGroup, thread.groupModel.groupAdminIds.contains(getUserHexEncodedPublicKey()) { if let thread = thread as? TSGroupThread, thread.isClosedGroup, thread.groupModel.groupAdminIds.contains(getUserHexEncodedPublicKey()) {
message = "Because you are the creator of this group it will be deleted for everyone. This cannot be undone." message = NSLocalizedString("admin_group_leave_warning", comment: "")
} }
let alert = UIAlertController(title: NSLocalizedString("CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE", comment: ""), message: message, preferredStyle: .alert) let alert = UIAlertController(title: NSLocalizedString("CONVERSATION_DELETE_CONFIRMATION_ALERT_TITLE", comment: ""), message: message, preferredStyle: .alert)
alert.addAction(UIAlertAction(title: NSLocalizedString("TXT_DELETE_TITLE", comment: ""), style: .destructive) { [weak self] _ in alert.addAction(UIAlertAction(title: NSLocalizedString("TXT_DELETE_TITLE", comment: ""), style: .destructive) { [weak self] _ in

2
Session/Meta/Translations/en.lproj/Localizable.strings
Unescape Escape View File

@ -491,7 +491,9 @@
"vc_view_my_qr_code_explanation" = "This is your QR code. Other users can scan it to start a session with you."; "vc_view_my_qr_code_explanation" = "This is your QR code. Other users can scan it to start a session with you.";
// MARK: - Not Yet Translated // MARK: - Not Yet Translated
"fast_mode_explanation" = "You’ll be notified of new messages reliably and immediately using Apple’s notification servers."; "fast_mode_explanation" = "You’ll be notified of new messages reliably and immediately using Apple’s notification servers.";
"fast_mode" = "Fast Mode";
"slow_mode_explanation" = "Session will occasionally check for new messages in the background."; "slow_mode_explanation" = "Session will occasionally check for new messages in the background.";
"slow_mode" = "Slow Mode";
"vc_pn_mode_title" = "Message Notifications"; "vc_pn_mode_title" = "Message Notifications";
"vc_notification_settings_notification_mode_title" = "Use Fast Mode"; "vc_notification_settings_notification_mode_title" = "Use Fast Mode";
"vc_link_device_recovery_phrase_tab_title" = "Recovery Phrase"; "vc_link_device_recovery_phrase_tab_title" = "Recovery Phrase";

8
Session/Onboarding/LinkDeviceVC.swift
Unescape Escape View File

@ -10,7 +10,7 @@ final class LinkDeviceVC : BaseVC, UIPageViewControllerDataSource, UIPageViewCon
// MARK: Components // MARK: Components
private lazy var tabBar: TabBar = { private lazy var tabBar: TabBar = {
let tabs = [ let tabs = [
TabBar.Tab(title: "Recovery Phrase") { [weak self] in TabBar.Tab(title: NSLocalizedString("vc_link_device_recovery_phrase_tab_title", comment: "")) { [weak self] in
guard let self = self else { return } guard let self = self else { return }
self.pageVC.setViewControllers([ self.pages[0] ], direction: .forward, animated: false, completion: nil) self.pageVC.setViewControllers([ self.pages[0] ], direction: .forward, animated: false, completion: nil)
}, },
@ -35,7 +35,7 @@ final class LinkDeviceVC : BaseVC, UIPageViewControllerDataSource, UIPageViewCon
}() }()
private lazy var scanQRCodeWrapperVC: ScanQRCodeWrapperVC = { private lazy var scanQRCodeWrapperVC: ScanQRCodeWrapperVC = {
let message = "Navigate to Settings → Recovery Phrase on your other device to show your QR code." let message = NSLocalizedString("vc_link_device_scan_qr_code_explanation", comment: "")
let result = ScanQRCodeWrapperVC(message: message) let result = ScanQRCodeWrapperVC(message: message)
result.delegate = self result.delegate = self
return result return result
@ -163,14 +163,14 @@ private final class RecoveryPhraseVC : UIViewController {
let titleLabel = UILabel() let titleLabel = UILabel()
titleLabel.textColor = Colors.text titleLabel.textColor = Colors.text
titleLabel.font = .boldSystemFont(ofSize: isIPhone5OrSmaller ? Values.largeFontSize : Values.veryLargeFontSize) titleLabel.font = .boldSystemFont(ofSize: isIPhone5OrSmaller ? Values.largeFontSize : Values.veryLargeFontSize)
titleLabel.text = "Recovery Phrase" titleLabel.text = NSLocalizedString("vc_enter_recovery_phrase_title", comment: "")
titleLabel.numberOfLines = 0 titleLabel.numberOfLines = 0
titleLabel.lineBreakMode = .byWordWrapping titleLabel.lineBreakMode = .byWordWrapping
// Explanation label // Explanation label
let explanationLabel = UILabel() let explanationLabel = UILabel()
explanationLabel.textColor = Colors.text explanationLabel.textColor = Colors.text
explanationLabel.font = .systemFont(ofSize: Values.smallFontSize) explanationLabel.font = .systemFont(ofSize: Values.smallFontSize)
explanationLabel.text = "To link your device, enter the recovery phrase that was given to you when you signed up." explanationLabel.text = NSLocalizedString("vc_enter_recovery_phrase_explanation", comment: "")
explanationLabel.numberOfLines = 0 explanationLabel.numberOfLines = 0
explanationLabel.lineBreakMode = .byWordWrapping explanationLabel.lineBreakMode = .byWordWrapping
// Spacers // Spacers

6
Session/Onboarding/PNModeVC.swift
Unescape Escape View File

@ -12,14 +12,14 @@ final class PNModeVC : BaseVC, OptionViewDelegate {
// MARK: Components // MARK: Components
private lazy var apnsOptionView: OptionView = { private lazy var apnsOptionView: OptionView = {
let explanation = "You’ll be notified of new messages reliably and immediately using Apple’s notification servers." let explanation = NSLocalizedString("fast_mode_explanation", comment: "")
let result = OptionView(title: "Fast Mode", explanation: explanation, delegate: self, isRecommended: true) let result = OptionView(title: "Fast Mode", explanation: explanation, delegate: self, isRecommended: true)
result.accessibilityLabel = "Fast mode option" result.accessibilityLabel = "Fast mode option"
return result return result
}() }()
private lazy var backgroundPollingOptionView: OptionView = { private lazy var backgroundPollingOptionView: OptionView = {
let explanation = "Session will occasionally check for new messages in the background." let explanation = NSLocalizedString("slow_mode_explanation", comment: "")
let result = OptionView(title: "Slow Mode", explanation: explanation, delegate: self) let result = OptionView(title: "Slow Mode", explanation: explanation, delegate: self)
result.accessibilityLabel = "Slow mode option" result.accessibilityLabel = "Slow mode option"
return result return result
@ -38,7 +38,7 @@ final class PNModeVC : BaseVC, OptionViewDelegate {
let titleLabel = UILabel() let titleLabel = UILabel()
titleLabel.textColor = Colors.text titleLabel.textColor = Colors.text
titleLabel.font = .boldSystemFont(ofSize: isIPhone5OrSmaller ? Values.largeFontSize : Values.veryLargeFontSize) titleLabel.font = .boldSystemFont(ofSize: isIPhone5OrSmaller ? Values.largeFontSize : Values.veryLargeFontSize)
titleLabel.text = "Message Notifications" titleLabel.text = NSLocalizedString("vc_pn_mode_title", comment: "")
titleLabel.numberOfLines = 0 titleLabel.numberOfLines = 0
titleLabel.lineBreakMode = .byWordWrapping titleLabel.lineBreakMode = .byWordWrapping
// Set up spacers // Set up spacers

2
Session/Onboarding/RegisterVC.swift
Unescape Escape View File

@ -177,7 +177,7 @@ final class RegisterVC : BaseVC {
UIPasteboard.general.string = x25519KeyPair.hexEncodedPublicKey UIPasteboard.general.string = x25519KeyPair.hexEncodedPublicKey
copyPublicKeyButton.isUserInteractionEnabled = false copyPublicKeyButton.isUserInteractionEnabled = false
UIView.transition(with: copyPublicKeyButton, duration: 0.25, options: .transitionCrossDissolve, animations: { UIView.transition(with: copyPublicKeyButton, duration: 0.25, options: .transitionCrossDissolve, animations: {
self.copyPublicKeyButton.setTitle("Copied", for: UIControl.State.normal) self.copyPublicKeyButton.setTitle(NSLocalizedString("copied", comment: ""), for: UIControl.State.normal)
}, completion: nil) }, completion: nil)
Timer.scheduledTimer(timeInterval: 4, target: self, selector: #selector(enableCopyButton), userInfo: nil, repeats: false) Timer.scheduledTimer(timeInterval: 4, target: self, selector: #selector(enableCopyButton), userInfo: nil, repeats: false)
} }

2
Session/Onboarding/SeedVC.swift
Unescape Escape View File

@ -177,7 +177,7 @@ final class SeedVC : BaseVC {
UIPasteboard.general.string = mnemonic UIPasteboard.general.string = mnemonic
copyButton.isUserInteractionEnabled = false copyButton.isUserInteractionEnabled = false
UIView.transition(with: copyButton, duration: 0.25, options: .transitionCrossDissolve, animations: { UIView.transition(with: copyButton, duration: 0.25, options: .transitionCrossDissolve, animations: {
self.copyButton.setTitle("Copied", for: UIControl.State.normal) self.copyButton.setTitle(NSLocalizedString("copied", comment: ""), for: UIControl.State.normal)
}, completion: nil) }, completion: nil)
Timer.scheduledTimer(timeInterval: 4, target: self, selector: #selector(enableCopyButton), userInfo: nil, repeats: false) Timer.scheduledTimer(timeInterval: 4, target: self, selector: #selector(enableCopyButton), userInfo: nil, repeats: false)
} }

2
Session/Open Groups/JoinOpenGroupVC.swift
Unescape Escape View File

@ -228,7 +228,7 @@ private final class EnterURLVC : UIViewController, UIGestureRecognizerDelegate,
let suggestionGridTitleLabel = UILabel() let suggestionGridTitleLabel = UILabel()
suggestionGridTitleLabel.textColor = Colors.text suggestionGridTitleLabel.textColor = Colors.text
suggestionGridTitleLabel.font = .boldSystemFont(ofSize: Values.largeFontSize) suggestionGridTitleLabel.font = .boldSystemFont(ofSize: Values.largeFontSize)
suggestionGridTitleLabel.text = "Or join one of these..." suggestionGridTitleLabel.text = NSLocalizedString("vc_join_open_group_suggestions_title", comment: "")
suggestionGridTitleLabel.numberOfLines = 0 suggestionGridTitleLabel.numberOfLines = 0
suggestionGridTitleLabel.lineBreakMode = .byWordWrapping suggestionGridTitleLabel.lineBreakMode = .byWordWrapping
// Next button // Next button

2
Session/Settings/NotificationSettingsViewController.m
Unescape Escape View File

@ -44,7 +44,7 @@
OWSTableSection *strategySection = [OWSTableSection new]; OWSTableSection *strategySection = [OWSTableSection new];
strategySection.headerTitle = NSLocalizedString(@"preferences_notifications_strategy_category_title", @""); strategySection.headerTitle = NSLocalizedString(@"preferences_notifications_strategy_category_title", @"");
[strategySection addItem:[OWSTableItem switchItemWithText:@"Use Fast Mode" [strategySection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"vc_notification_settings_notification_mode_title", @"")
accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"push_notification_strategy") accessibilityIdentifier:ACCESSIBILITY_IDENTIFIER_WITH_NAME(self, @"push_notification_strategy")
isOnBlock:^{ isOnBlock:^{
return [NSUserDefaults.standardUserDefaults boolForKey:@"isUsingFullAPNs"]; return [NSUserDefaults.standardUserDefaults boolForKey:@"isUsingFullAPNs"];

6
Session/Settings/SettingsVC.swift
Unescape Escape View File

@ -139,13 +139,13 @@ final class SettingsVC : BaseVC, AvatarViewHelperDelegate {
versionLabel.text = "Version \(version) (\(buildNumber))" versionLabel.text = "Version \(version) (\(buildNumber))"
// Invite button // Invite button
let inviteButton = UIButton() let inviteButton = UIButton()
inviteButton.setTitle("Invite a Friend", for: UIControl.State.normal) inviteButton.setTitle(NSLocalizedString("vc_settings_invite_a_friend_button_title", comment: ""), for: UIControl.State.normal)
inviteButton.setTitleColor(Colors.text, for: UIControl.State.normal) inviteButton.setTitleColor(Colors.text, for: UIControl.State.normal)
inviteButton.titleLabel!.font = .boldSystemFont(ofSize: Values.smallFontSize) inviteButton.titleLabel!.font = .boldSystemFont(ofSize: Values.smallFontSize)
inviteButton.addTarget(self, action: #selector(sendInvitation), for: UIControl.Event.touchUpInside) inviteButton.addTarget(self, action: #selector(sendInvitation), for: UIControl.Event.touchUpInside)
// Help translate button // Help translate button
let helpTranslateButton = UIButton() let helpTranslateButton = UIButton()
helpTranslateButton.setTitle("Help us Translate Session", for: UIControl.State.normal) helpTranslateButton.setTitle(NSLocalizedString("vc_settings_help_us_translate_button_title", comment: ""), for: UIControl.State.normal)
helpTranslateButton.setTitleColor(Colors.text, for: UIControl.State.normal) helpTranslateButton.setTitleColor(Colors.text, for: UIControl.State.normal)
helpTranslateButton.titleLabel!.font = .boldSystemFont(ofSize: Values.smallFontSize) helpTranslateButton.titleLabel!.font = .boldSystemFont(ofSize: Values.smallFontSize)
helpTranslateButton.addTarget(self, action: #selector(helpTranslate), for: UIControl.Event.touchUpInside) helpTranslateButton.addTarget(self, action: #selector(helpTranslate), for: UIControl.Event.touchUpInside)
@ -427,7 +427,7 @@ final class SettingsVC : BaseVC, AvatarViewHelperDelegate {
UIPasteboard.general.string = getUserHexEncodedPublicKey() UIPasteboard.general.string = getUserHexEncodedPublicKey()
copyButton.isUserInteractionEnabled = false copyButton.isUserInteractionEnabled = false
UIView.transition(with: copyButton, duration: 0.25, options: .transitionCrossDissolve, animations: { UIView.transition(with: copyButton, duration: 0.25, options: .transitionCrossDissolve, animations: {
self.copyButton.setTitle("Copied", for: UIControl.State.normal) self.copyButton.setTitle(NSLocalizedString("copied", comment: ""), for: UIControl.State.normal)
}, completion: nil) }, completion: nil)
Timer.scheduledTimer(timeInterval: 4, target: self, selector: #selector(enableCopyButton), userInfo: nil, repeats: false) Timer.scheduledTimer(timeInterval: 4, target: self, selector: #selector(enableCopyButton), userInfo: nil, repeats: false)
} }

Write Preview
Loading…
Cancel
Save