diff --git a/gaios/HWFlow/VerifyOnDevice/VerifyOnDeviceViewController.swift b/gaios/HWFlow/VerifyOnDevice/VerifyOnDeviceViewController.swift index 26bf5f1e..1e064ea4 100644 --- a/gaios/HWFlow/VerifyOnDevice/VerifyOnDeviceViewController.swift +++ b/gaios/HWFlow/VerifyOnDevice/VerifyOnDeviceViewController.swift @@ -88,12 +88,12 @@ class VerifyOnDeviceViewController: UIViewController { func setContent() { copyView.isHidden = false - lblTitle.text = "Verify on Device".localized + lblTitle.text = "id_verify_on_device".localized if viewModel.isRedeposit { lblTitle.text = "Verify redeposit address".localized copyView.isHidden = true } - lblHint.text = "Please verify that the address shown on your hardware wallet matches the one on your phone.".localized + lblHint.text = "id_please_verify_that_the_address".localized btnCopy.setTitle("id_copy".localized, for: .normal) } diff --git a/gaios/Home/Controllers/LoginViewController.swift b/gaios/Home/Controllers/LoginViewController.swift index eabb40e3..f233c3c4 100644 --- a/gaios/Home/Controllers/LoginViewController.swift +++ b/gaios/Home/Controllers/LoginViewController.swift @@ -165,7 +165,7 @@ class LoginViewController: UIViewController { } func setContent() { - lblTitle.text = account.isDerivedLightning ? "Lightning Shortcut".localized : "id_enter_pin".localized + lblTitle.text = account.isDerivedLightning ? "id_lightning_shortcut".localized : "id_enter_pin".localized lblWalletLockHint1.text = "\("id_youve_entered_an_invalid_pin".localized)\n\("id_youll_need_your_recovery_phrase".localized)" lblWalletLockHint2.isHidden = true btnWalletLock.setTitle("id_restore_with_recovery_phrase".localized, for: .normal) diff --git a/gaios/LTFlow/Controllers/LTRemoveShortcutViewController.swift b/gaios/LTFlow/Controllers/LTRemoveShortcutViewController.swift index dee5167c..276a02d9 100644 --- a/gaios/LTFlow/Controllers/LTRemoveShortcutViewController.swift +++ b/gaios/LTFlow/Controllers/LTRemoveShortcutViewController.swift @@ -42,10 +42,10 @@ class LTRemoveShortcutViewController: UIViewController { } func setContent() { - lblTitle.text = "Payments Will Fail!".localized - lblHint.text = "You will stop receiving push notifications for this lightning account, but they are necessary for your lightning account to receive and send reliably.".localized + lblTitle.text = "id_payments_will_fail".localized + lblHint.text = "id_you_will_stop_receiving_push.".localized btnCancel.setTitle("id_cancel".localized, for: .normal) - btnRemove.setTitle("Remove Shortcut".localized, for: .normal) + btnRemove.setTitle("id_remove_lightning_shortcut".localized, for: .normal) } func setStyle() { diff --git a/gaios/LTFlow/Controllers/LTShortcut/LTShortcutViewController.swift b/gaios/LTFlow/Controllers/LTShortcut/LTShortcutViewController.swift index 01533562..c323994d 100644 --- a/gaios/LTFlow/Controllers/LTShortcut/LTShortcutViewController.swift +++ b/gaios/LTFlow/Controllers/LTShortcut/LTShortcutViewController.swift @@ -48,7 +48,7 @@ class LTShortcutViewController: UIViewController { btnLearnMore.setTitle(vm.btnMore, for: .normal) btnMain.setTitle(vm.btnMain, for: .normal) lblJadeExtraNote.isHidden = true - lblJadeExtraNote.text = "You will need to export the account from Jade at your next login.".localized + lblJadeExtraNote.text = "id_you_will_need_to_export_the".localized switch vm.action { case .addFromAccount: DrawerAnimationManager.shared.accountId = vm.account.id diff --git a/gaios/Menu/PopoverMenuHomeViewController.swift b/gaios/Menu/PopoverMenuHomeViewController.swift index 38c0c0a2..3f08d9b5 100644 --- a/gaios/Menu/PopoverMenuHomeViewController.swift +++ b/gaios/Menu/PopoverMenuHomeViewController.swift @@ -61,7 +61,7 @@ extension PopoverMenuHomeViewController: UITableViewDataSource, UITableViewDeleg case .edit: cell.textLabel?.text = "id_rename_wallet".localized case .delete: - cell.textLabel?.text = isDerivedLightning ? "Remove Lightning Shortcut".localized : "id_remove_wallet".localized + cell.textLabel?.text = isDerivedLightning ? "id_remove_lightning_shortcut".localized : "id_remove_wallet".localized } return cell } diff --git a/gaios/OnBoard/Controllers/HowToSecure/HowToSecureViewController.swift b/gaios/OnBoard/Controllers/HowToSecure/HowToSecureViewController.swift index f2166472..7a036cc4 100644 --- a/gaios/OnBoard/Controllers/HowToSecure/HowToSecureViewController.swift +++ b/gaios/OnBoard/Controllers/HowToSecure/HowToSecureViewController.swift @@ -28,7 +28,7 @@ class HowToSecureViewController: UIViewController { func setContent() { - lblTitle.text = "How do you want to secure your funds?".localized + lblTitle.text = "id_how_do_you_want_to_secure_your".localized btnWatchOnly.setTitle(NSLocalizedString("id_watchonly", comment: ""), for: .normal) } @@ -40,7 +40,7 @@ class HowToSecureViewController: UIViewController { let storyboard = UIStoryboard(name: "Dialogs", bundle: nil) if let vc = storyboard.instantiateViewController(withIdentifier: "DialogListViewController") as? DialogListViewController { vc.delegate = self - vc.viewModel = DialogListViewModel(title: "Select Network", type: .networkPrefs, items: NetworkPrefs.getItems()) + vc.viewModel = DialogListViewModel(title: "id_select_network".localized, type: .networkPrefs, items: NetworkPrefs.getItems()) vc.modalPresentationStyle = .overFullScreen present(vc, animated: false, completion: nil) } diff --git a/gaios/OnBoard/Controllers/WalletSettingsViewController.swift b/gaios/OnBoard/Controllers/WalletSettingsViewController.swift index 6a7b8e02..9ac2a5da 100644 --- a/gaios/OnBoard/Controllers/WalletSettingsViewController.swift +++ b/gaios/OnBoard/Controllers/WalletSettingsViewController.swift @@ -127,12 +127,12 @@ class WalletSettingsViewController: KeyboardViewController { lblAnalyticsTitle.text = NSLocalizedString("id_help_green_improve", comment: "") lblAnalyticsHint.text = NSLocalizedString("id_enable_limited_usage_data", comment: "") btnAnalytics.setTitle(NSLocalizedString("id_more_info", comment: ""), for: .normal) - lblExperimentalTitle.text = "Enable experimental features" - lblExperimentalHint.text = "Experimental features might change, break, or be discontinued at any time, so you agree to use them at your own risk." + lblExperimentalTitle.text = "id_enable_experimental_features".localized + lblExperimentalHint.text = "id_experimental_features_might".localized lblProxyTitle.text = NSLocalizedString("id_connect_through_a_proxy", comment: "") lblProxyHint.text = "" fieldProxyIp.placeholder = NSLocalizedString("id_server_ip_and_port_ipport", comment: "") - lblRememberHWTitle.text = "Remember hardware devices".localized + lblRememberHWTitle.text = "id_remember_hardware_devices".localized lblRememberHWHint.text = "" lblSPVTitle.text = NSLocalizedString("id_custom_servers_and_validation", comment: "") lblSPVPersonalNodeTitle.text = NSLocalizedString("id_personal_electrum_server", comment: "") @@ -141,16 +141,16 @@ class WalletSettingsViewController: KeyboardViewController { lblSPVliquidServer.text = NSLocalizedString("id_liquid_electrum_server", comment: "") lblSPVliquidTestnetServer.text = NSLocalizedString("id_liquid_testnet_electrum_server", comment: "") lblSPVtestnetServer.text = NSLocalizedString("id_testnet_electrum_server", comment: "") - lblElectrumGapLimit.text = NSLocalizedString("Electrum server gap limit", comment: "") + lblElectrumGapLimit.text = NSLocalizedString("id_electrum_server_gap_limit", comment: "") fieldSPVbtcServer.placeholder = NSLocalizedString("id_server_ip_and_port_ipport", comment: "") fieldSPVliquidServer.placeholder = NSLocalizedString("id_server_ip_and_port_ipport", comment: "") fieldSPVtestnetServer.placeholder = NSLocalizedString("id_server_ip_and_port_ipport", comment: "") - lblElectrumTls.text = NSLocalizedString("Enable TLS", comment: "") + lblElectrumTls.text = NSLocalizedString("id_enable_tls", comment: "") lblTxCheckTitle.text = NSLocalizedString("id_spv_verification", comment: "") lblTxCheckHint.text = NSLocalizedString("id_verify_your_bitcoin", comment: "") lblMultiTitle.text = NSLocalizedString("id_multiserver_validation", comment: "") lblMultiHint.text = NSLocalizedString("id_double_check_spv_with_other", comment: "") - lblDescElectrumGapLimit.text = "Number of consecutive empty addresses to monitor".localized + lblDescElectrumGapLimit.text = "id_number_of_consecutive_empty".localized btnCancel.setTitle(NSLocalizedString("id_cancel", comment: ""), for: .normal) btnSave.setTitle(NSLocalizedString("id_save", comment: ""), for: .normal) fieldSPVbtcServer.placeholder = GdkSettings.btcElectrumSrvDefaultEndPoint diff --git a/gaios/Receive/Cells/ReceiveAddressCell.swift b/gaios/Receive/Cells/ReceiveAddressCell.swift index 44525d8f..39aa262c 100644 --- a/gaios/Receive/Cells/ReceiveAddressCell.swift +++ b/gaios/Receive/Cells/ReceiveAddressCell.swift @@ -40,8 +40,8 @@ class ReceiveAddressCell: UITableViewCell { envelopeBorderView.borderWidth = 5.0 envelopeBorderView.borderColor = UIColor.gGreenMatrix() envelopeBorderView.cornerRadius = 20.0 - btnMagnify.setTitle("Increase QR Size".localized, for: .normal) - btnCopyAddress.setTitle("Copy Address".localized, for: .normal) + btnMagnify.setTitle("id_increase_qr_size".localized, for: .normal) + btnCopyAddress.setTitle("id_copy_address".localized, for: .normal) [btnMagnify, btnCopyAddress].forEach { $0.setStyle(.blackWithImg) } diff --git a/gaios/Sendflow/Controllers/SendFailViewController.swift b/gaios/Sendflow/Controllers/SendFailViewController.swift index 6797ecdd..d1a585c4 100644 --- a/gaios/Sendflow/Controllers/SendFailViewController.swift +++ b/gaios/Sendflow/Controllers/SendFailViewController.swift @@ -43,7 +43,7 @@ class SendFailViewController: UIViewController { } func setContent() { - lblTitle.text = "Transaction failed".localized + lblTitle.text = "id_transaction_failed".localized errorTextView.text = error.description()?.localized btnAgain.setTitle("id_try_again".localized, for: .normal) btnSupport.setTitle("Contact Support".localized, for: .normal) diff --git a/gaios/Sendflow/Controllers/SendTxConfirmViewController.swift b/gaios/Sendflow/Controllers/SendTxConfirmViewController.swift index ee94ca4b..6b25a1f9 100644 --- a/gaios/Sendflow/Controllers/SendTxConfirmViewController.swift +++ b/gaios/Sendflow/Controllers/SendTxConfirmViewController.swift @@ -65,12 +65,12 @@ class SendTxConfirmViewController: UIViewController { func setContent() { if viewModel.isWithdraw { - title = "Confirm Withdraw".localized + title = "id_withdraw".localized } else { title = "id_confirm_transaction".localized } - lblAssetTitle.text = "Asset & Account".localized + lblAssetTitle.text = "id_account__asset".localized lblAddressTitle.text = viewModel.addressTitle.localized lblAmountTitle.text = viewModel.amountTitle.localized lblAmountValue.text = "" @@ -81,14 +81,14 @@ class SendTxConfirmViewController: UIViewController { lblSumFeeKey.text = "id_network_fee".localized lblSumFeeValue.text = "" - lblSumAmountKey.text = "Recipient Receives" + lblSumAmountKey.text = "Recipient Receives".localized lblSumAmountValue.text = "" - lblSumTotalKey.text = "Total Spent" + lblSumTotalKey.text = "id_total_spent".localized lblSumTotalValue.text = "" - lblNoteTitle.text = "Notes" + lblNoteTitle.text = "id_my_notes".localized lblNoteTxt.text = "" - lblPayRequestByTitle.text = "Payment requested by".localized + lblPayRequestByTitle.text = "id_payment_requested_by_s".localized lblPayRequestByValue.text = "" lblPayRequestByHint.text = "" payRequestByStack.isHidden = true @@ -140,7 +140,7 @@ class SendTxConfirmViewController: UIViewController { case .verified: btnVerifyAddress.isUserInteractionEnabled = false btnVerifyAddress.borderColor = .gray - btnVerifyAddress.setTitle("Address verified!".localized, for: .normal) + btnVerifyAddress.setTitle("id_address_verified".localized, for: .normal) btnVerifyAddress.setImage(UIImage(named: "ic_check_circle")?.maskWithColor(color: .white), for: .normal) } } diff --git a/gaios/Shared/Models/AccountPrefs.swift b/gaios/Shared/Models/AccountPrefs.swift index e582261a..7b654a3d 100644 --- a/gaios/Shared/Models/AccountPrefs.swift +++ b/gaios/Shared/Models/AccountPrefs.swift @@ -23,9 +23,9 @@ enum AccountPrefs { case .enhanceSecurity: return "id_enhance_security".localized case .nodeInfo: - return "Node Info".localized + return "id_node_info".localized case .shortcut: - return "Lightning shortcut".localized + return "id_lightning_shortcut".localized case .logout: return "id_logout".localized case .settings: diff --git a/gaios/Shared/Models/MoreOptPrefs.swift b/gaios/Shared/Models/MoreOptPrefs.swift index b5bb5a55..9c72d996 100644 --- a/gaios/Shared/Models/MoreOptPrefs.swift +++ b/gaios/Shared/Models/MoreOptPrefs.swift @@ -13,7 +13,7 @@ enum MoreOptPrefs: Int, CaseIterable { case .sweep: return "id_sweep_from_paper_wallet".localized case .addressAuth: - return "List of Addresses" + return "id_list_of_addresses".localized } } diff --git a/gaios/Shared/Models/RedeemPrefs.swift b/gaios/Shared/Models/RedeemPrefs.swift index 62ffc282..aee9176f 100644 --- a/gaios/Shared/Models/RedeemPrefs.swift +++ b/gaios/Shared/Models/RedeemPrefs.swift @@ -7,9 +7,9 @@ enum RedeemPrefs: Int, CaseIterable { var name: String { switch self { case .scan: - return "Scan QR Code" + return "id_scan_qr_code".localized case .type: - return "Enter Code" + return "id_enter_your_code".localized } } diff --git a/gaios/Shared/Models/WalletPrefs.swift b/gaios/Shared/Models/WalletPrefs.swift index a921fadc..20228036 100644 --- a/gaios/Shared/Models/WalletPrefs.swift +++ b/gaios/Shared/Models/WalletPrefs.swift @@ -36,7 +36,7 @@ enum WalletPrefs: Int, CaseIterable { case .logout: return "id_logout".localized case .denominations: - return "Denominations".localized + return "id_denomination".localized case .rename: return "id_rename".localized case .refresh: diff --git a/gaios/TxDetails/Cells/TxDetailsStatusCell.swift b/gaios/TxDetails/Cells/TxDetailsStatusCell.swift index a1872a8c..e912c500 100644 --- a/gaios/TxDetails/Cells/TxDetailsStatusCell.swift +++ b/gaios/TxDetails/Cells/TxDetailsStatusCell.swift @@ -56,36 +56,36 @@ class TxDetailsStatusCell: UITableViewCell { let isLightning = model.transaction.subaccountItem?.gdkNetwork.lightning ?? false if model.transaction.isRefundableSwap ?? false { - lblStateTitle.text = "Transaction Failed".localized - lblStateInfo.text = "Your transactions failed".localized - lblStateStatus.text = NSLocalizedString("Failed", comment: "") + lblStateTitle.text = "id_transaction_failed".localized + lblStateInfo.text = String(format: "id_your_transaction_failed_s".localized, "") + lblStateStatus.text = NSLocalizedString("id_failed", comment: "") applyColor(UIColor.gRedTx()) stateIcon.image = UIImage(named: "ic_tx_failed")! } else if model.transaction.isUnconfirmed(block: model.blockHeight) { - lblStateTitle.text = "Transaction Unconfirmed".localized + " 0/6" + lblStateTitle.text = String(format: "id_transaction_unconfirmed_ss".localized, "0", "6") lblStateStatus.text = model.txUnconfirmedStatus applyColor(UIColor.gOrangeTx()) setPendingIcon() } else if !isLightning && model.transaction.isLiquid && model.blockHeight < model.transaction.blockHeight + 1 { step = Int(model.blockHeight) - Int(model.transaction.blockHeight) + 1 - lblStateTitle.text = "Transaction Unconfirmed".localized + " \(step)/\(steps)" + lblStateTitle.text = String(format: "id_transaction_unconfirmed_ss".localized, "\(step)", "\(steps)") lblStateStatus.text = model.txStatus applyColor(UIColor.gOrangeTx()) setPendingIcon() } else if !isLightning && !model.transaction.isLiquid && model.blockHeight < model.transaction.blockHeight + 5 { if model.blockHeight >= model.transaction.blockHeight { step = Int(model.blockHeight) - Int(model.transaction.blockHeight) + 1 - lblStateTitle.text = "Transaction Confirmed".localized + " \(step)/\(steps)" + lblStateTitle.text = String(format: "id_transaction_confirmed_ss".localized, "\(step)", "\(steps)") lblStateStatus.text = model.txStatus applyColor(UIColor.gGreenTx()) stateIcon.image = UIImage(named: "ic_tx_confirmed")! } } else { applyColor(UIColor.gGreenTx()) - lblStateTitle.text = "Transaction Completed".localized + lblStateTitle.text = "id_transaction_completed".localized lblStateStatus.text = model.txStatus if isLightning && !(model.transaction.closingTxid?.isEmpty ?? true) { - lblStateStatus.text = "Closed Channel".localized + lblStateStatus.text = "id_close_channel".localized } stateIcon.image = UIImage(named: "ic_tx_confirmed")! } diff --git a/gaios/TxDetails/Cells/TxDetailsStatusCellModel.swift b/gaios/TxDetails/Cells/TxDetailsStatusCellModel.swift index b479ebcd..3df0b444 100644 --- a/gaios/TxDetails/Cells/TxDetailsStatusCellModel.swift +++ b/gaios/TxDetails/Cells/TxDetailsStatusCellModel.swift @@ -30,16 +30,15 @@ class TxDetailsStatusCellModel { var txStatusExtended: String { - let str = "Your transaction was successfully" + " " switch transaction.type { case .redeposit: - return str + "id_redeposited".localized.lowercased() + return "id_your_transaction_was".localized case .incoming: - return str + "id_received".localized.lowercased() + return "id_the_transaction_was".localized case .outgoing: - return str + "id_sent".localized.lowercased() + return "id_your_transaction_was".localized case .mixed: - return str + "id_swapped".localized.lowercased() + return "id_your_transaction_was".localized } } diff --git a/gaios/TxDetails/Cells/TxDetailsTotalsCell.swift b/gaios/TxDetails/Cells/TxDetailsTotalsCell.swift index ac00cde7..271bb1b3 100644 --- a/gaios/TxDetails/Cells/TxDetailsTotalsCell.swift +++ b/gaios/TxDetails/Cells/TxDetailsTotalsCell.swift @@ -46,7 +46,7 @@ class TxDetailsTotalsCell: UITableViewCell { func setContent() { lblSumFeeKey.text = "id_network_fee".localized lblSumAmountKey.text = "Recipient Receives".localized - lblSumTotalKey.text = "Total Spent".localized + lblSumTotalKey.text = "id_total_spent".localized } func setStyle() { diff --git a/gaios/TxDetails/TxDetailsViewModel.swift b/gaios/TxDetails/TxDetailsViewModel.swift index e538a737..d040b4c2 100644 --- a/gaios/TxDetails/TxDetailsViewModel.swift +++ b/gaios/TxDetails/TxDetailsViewModel.swift @@ -108,13 +108,13 @@ class TxDetailsViewModel { var title = "" switch transaction.type { case .redeposit: - title = "Redeposited to".localized + title = "id_redeposited".localized case .incoming: title = "id_received_on".localized case .outgoing: title = "id_sent_to".localized case .mixed: - title = "Swapped to".localized + title = "id_swapped".localized } let hint = address @@ -134,7 +134,7 @@ class TxDetailsViewModel { let (fiat, fiatCurrency) = balance.toFiat() let str = "\(amount) \(denom) ≈ \(fiat) \(fiatCurrency)" - items.append(TxDetailsInfoCellModel(title: "Network fees".localized, hint: str, type: .fee, hideBalance: hideBalance)) + items.append(TxDetailsInfoCellModel(title: "id_network_fees".localized, hint: str, type: .fee, hideBalance: hideBalance)) } // fee rate @@ -161,7 +161,7 @@ class TxDetailsViewModel { // message if transaction.isLightning && transaction.message != nil { - items.append(TxDetailsInfoCellModel(title: "Message".localized, + items.append(TxDetailsInfoCellModel(title: "id_message".localized, hint: transaction.message ?? "", type: .message, hideBalance: hideBalance)) @@ -193,7 +193,7 @@ class TxDetailsViewModel { if showBumpFee() { models.append( TxDetailsActionCellModel(icon: UIImage(named: "ic_tx_action_speed")!, - title: "Speed up Transaction".localized, + title: "id_speed_up_transaction".localized, action: .speedUp) ) } @@ -207,14 +207,14 @@ class TxDetailsViewModel { if (transaction.isLightning) {} else { models.append( TxDetailsActionCellModel(icon: UIImage(named: "ic_tx_action_explorer")!.maskWithColor(color: UIColor.gGreenMatrix()), - title: "View in Explorer".localized, + title: "id_view_in_explorer".localized, action: .explorer) ) } if transaction.isLightning {} else { models.append( TxDetailsActionCellModel(icon: UIImage(named: "ic_tx_action_share")!, - title: "Share Transaction".localized, + title: "id_share_transaction".localized, action: .shareTx) ) } @@ -222,7 +222,7 @@ class TxDetailsViewModel { if transaction.isLightning && !(transaction.isRefundableSwap ?? false) { models.append( TxDetailsActionCellModel(icon: UIImage(named: "ic_tx_action_more")!, - title: "More Details".localized, + title: "id_more_details".localized, action: .more) ) } @@ -230,7 +230,7 @@ class TxDetailsViewModel { if transaction.isLightning && transaction.isRefundableSwap ?? false { models.append( TxDetailsActionCellModel(icon: UIImage(named: "ic_tx_action_revert")!.maskWithColor(color: UIColor.gGreenMatrix()), - title: "Initiate Refund".localized, + title: "id_initiate_refund".localized, action: .refund) ) } diff --git a/gaios/UserSettings/Models/UserSettings.swift b/gaios/UserSettings/Models/UserSettings.swift index 1a82cab4..621808bd 100644 --- a/gaios/UserSettings/Models/UserSettings.swift +++ b/gaios/UserSettings/Models/UserSettings.swift @@ -12,7 +12,7 @@ enum USSection: String, Codable, CaseIterable { enum USItem: String, Codable, CaseIterable { case Logout = "id_logout" - case UnifiedDenominationExchange = "Denomination & Exchange Rate" + case UnifiedDenominationExchange = "id_denomination__exchange_rate" case ArchievedAccounts = "id_archived_accounts" case WatchOnly = "id_watchonly" case ChangePin = "id_change_pin" diff --git a/gaios/Utility/AssetExpandableSelect/Cells/AssetExpandableView.swift b/gaios/Utility/AssetExpandableSelect/Cells/AssetExpandableView.swift index 9c84c759..a0e3e5f5 100644 --- a/gaios/Utility/AssetExpandableSelect/Cells/AssetExpandableView.swift +++ b/gaios/Utility/AssetExpandableSelect/Cells/AssetExpandableView.swift @@ -33,9 +33,9 @@ class AssetExpandableView: UIView { } // Any AMP asset if model.anyAmp { - title.text = "Receive any Amp Asset".localized + title.text = "id_receive_any_amp_asset".localized icon.image = UIImage(named: "default_asset_amp_icon")! - lblAmp.text = "You need an AMP account in order to receive it.".localized + lblAmp.text = "id_you_need_an_amp_account_in".localized ampTip.isHidden = !open return } diff --git a/gaios/Utility/AssetSelect/AssetSelectCell/AnyAssetCell.swift b/gaios/Utility/AssetSelect/AssetSelectCell/AnyAssetCell.swift index f9d821ff..805d64c8 100644 --- a/gaios/Utility/AssetSelect/AssetSelectCell/AnyAssetCell.swift +++ b/gaios/Utility/AssetSelect/AssetSelectCell/AnyAssetCell.swift @@ -30,7 +30,7 @@ class AnyAssetCell: UITableViewCell { self.lblAny.text = "id_receive_any_liquid_asset".localized imgView.image = UIImage(named: "default_asset_liquid_icon")! case .amp: - self.lblAny.text = "Receive any Amp Asset".localized + self.lblAny.text = "id_receive_any_amp_asset".localized imgView.image = UIImage(named: "default_asset_amp_icon")! } } diff --git a/gaios/Utility/MasterKey/MasterKeyViewController.swift b/gaios/Utility/MasterKey/MasterKeyViewController.swift index 748d16cc..2a666267 100644 --- a/gaios/Utility/MasterKey/MasterKeyViewController.swift +++ b/gaios/Utility/MasterKey/MasterKeyViewController.swift @@ -68,8 +68,8 @@ class MasterKeyViewController: UIViewController { } func setContent() { - lblTitle.text = "Green needs the master blinding key from Jade".localized - lblHint.text = "to show balances and transactions on Liquid accounts up to 10x faster at every login, and it's necessary to use Liquid singlesig accounts." + lblTitle.text = "id_green_needs_the_master_blinding".localized + lblHint.text = "id_to_show_balances_and".localized btnLearnMore.setTitle("id_learn_more".localized, for: .normal) } diff --git a/gaios/Utility/SecuritySelect/Cells/PolicyCell.swift b/gaios/Utility/SecuritySelect/Cells/PolicyCell.swift index d24fa1ba..29114a8f 100644 --- a/gaios/Utility/SecuritySelect/Cells/PolicyCell.swift +++ b/gaios/Utility/SecuritySelect/Cells/PolicyCell.swift @@ -29,8 +29,8 @@ class PolicyCell: UITableViewCell { bgTypeDesc.cornerRadius = bgType.frame.size.height / 2.0 lblName.font = UIFont.systemFont(ofSize: 18.0, weight: .bold) disableView.cornerRadius = 5.0 - lblDisableTitle.text = "Added Already!".localized - lblDisableHint.text = "You cannot add more than one\nLightning Account.".localized + lblDisableTitle.text = "id_added_already".localized + lblDisableHint.text = "id_you_cannot_add_more_than_one".localized lblDisableTitle.setStyle(.txtBigger) [lblHint, lblDisableHint].forEach { $0.setStyle(.txtCard) diff --git a/gaios/Utility/SecuritySelect/Cells/PolicyCellModel.swift b/gaios/Utility/SecuritySelect/Cells/PolicyCellModel.swift index 4174315d..8400ca2c 100644 --- a/gaios/Utility/SecuritySelect/Cells/PolicyCellModel.swift +++ b/gaios/Utility/SecuritySelect/Cells/PolicyCellModel.swift @@ -15,19 +15,19 @@ struct PolicyCellModel { static func from(policy: PolicyCellType) -> PolicyCellModel { switch policy { case .LegacySegwit: - return PolicyCellModel(hint: "Simple, portable, standard account, secured by your key, the recovery phrase.", policy: policy) + return PolicyCellModel(hint: "id_simple_portable_standard".localized, policy: policy) case .Lightning: - return PolicyCellModel(hint: "Fast transactions on the Lightning Network, powered by Greenlight.", policy: policy) + return PolicyCellModel(hint: "id_fast_transactions_on_the".localized, policy: policy) case .TwoFAProtected: - return PolicyCellModel(hint: "Quick setup 2FA account, ideal for active spenders (2FA expires if you don't move funds for 1 year).", policy: policy) + return PolicyCellModel(hint: "id_quick_setup_2fa_account_ideal".localized, policy: policy) case .TwoOfThreeWith2FA: - return PolicyCellModel(hint: "Permanent 2FA account, ideal for long term hodling, optionally with 3rd emergency key on hardware wallet.", policy: policy) + return PolicyCellModel(hint: "id_permanent_2fa_account_ideal_for".localized, policy: policy) case .NativeSegwit: - return PolicyCellModel(hint: "Cheaper singlesig option. Addresses are Native SegWit Bech32.", policy: policy) + return PolicyCellModel(hint: "id_cheaper_singlesig_option".localized, policy: policy) // case .Taproot: // return PolicyCellModel(hint: "Cheaper and more private singlesig option. Addresses are Bech32m.", policy: policy) case .Amp: - return PolicyCellModel(hint: "Account for special assets, monitored or authorized by the asset issuer.", policy: policy) + return PolicyCellModel(hint: "id_account_for_special_assets".localized, policy: policy) } } } diff --git a/gaios/Utility/SecuritySelect/SecuritySelectViewController.swift b/gaios/Utility/SecuritySelect/SecuritySelectViewController.swift index ecf951c0..a066706b 100644 --- a/gaios/Utility/SecuritySelect/SecuritySelectViewController.swift +++ b/gaios/Utility/SecuritySelect/SecuritySelectViewController.swift @@ -48,14 +48,14 @@ class SecuritySelectViewController: UIViewController { } func unarchiveCreateDialog(completion: @escaping (Bool) -> ()) { - let alert = UIAlertController(title: NSLocalizedString("Archived Account", comment: ""), - message: NSLocalizedString("There is already an archived account. Do you want to create a new one?", comment: ""), + let alert = UIAlertController(title: NSLocalizedString("id_archived_account", comment: ""), + message: NSLocalizedString("id_there_is_already_an_archived", comment: ""), preferredStyle: .alert) - alert.addAction(UIAlertAction(title: NSLocalizedString("Unarchived Account", comment: ""), + alert.addAction(UIAlertAction(title: NSLocalizedString("id_unarchive_account", comment: ""), style: .cancel) { (_: UIAlertAction) in completion(false) }) - alert.addAction(UIAlertAction(title: NSLocalizedString("Create", comment: ""), + alert.addAction(UIAlertAction(title: NSLocalizedString("id_create", comment: ""), style: .default) { (_: UIAlertAction) in completion(true) }) @@ -165,7 +165,7 @@ extension SecuritySelectViewController: UITableViewDelegate, UITableViewDataSour case .asset: return headerView( "id_asset".localized ) case .policy: - return headerView( "Security Policy".localized ) + return headerView("id_choose_security_policy".localized ) default: return nil } diff --git a/gaios/Wallet/ReEnable2fa/Cells/ReEnable2faAccountCell.swift b/gaios/Wallet/ReEnable2fa/Cells/ReEnable2faAccountCell.swift index 9966ee20..0ff9d676 100644 --- a/gaios/Wallet/ReEnable2fa/Cells/ReEnable2faAccountCell.swift +++ b/gaios/Wallet/ReEnable2fa/Cells/ReEnable2faAccountCell.swift @@ -42,6 +42,6 @@ class ReEnable2faAccountCell: UITableViewCell { func configure(subaccount: WalletItem) { lblType.text = subaccount.type.path.uppercased() lblName.text = subaccount.name - lblHint.text = "Redeposit Expired 2FA Coins" + lblHint.text = "id_redeposit_expired_2fa_coins".localized } } diff --git a/gaios/Wallet/ReEnable2fa/Controllers/ReEnable2faViewController.swift b/gaios/Wallet/ReEnable2fa/Controllers/ReEnable2faViewController.swift index 14594c2d..3797fde7 100644 --- a/gaios/Wallet/ReEnable2fa/Controllers/ReEnable2faViewController.swift +++ b/gaios/Wallet/ReEnable2fa/Controllers/ReEnable2faViewController.swift @@ -19,7 +19,7 @@ class ReEnable2faViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - title = "Re-enable 2FA" + title = "id_reenable_2fa".localized setContent() setStyle() @@ -36,8 +36,8 @@ class ReEnable2faViewController: UIViewController { } func setContent() { - lblHint1.text = "Some coins in your wallet haven't move for a long time, so 2FA expired to keep you in control. To reactivate 2FA:".localized - lblHint2.text = "\u{2022} " + "Send normally and refresh the 2FA on change coins (optimizes fees)".localized + "\n\u{2022} " + "Redeposit all your expired 2FA coins".localized + lblHint1.text = "id_some_coins_in_your_wallet".localized + lblHint2.text = "" btnLearnmore.setTitle("id_learn_more".localized, for: .normal) } diff --git a/gaios/Wallet/ReEnable2fa/ReEnable2fa.storyboard b/gaios/Wallet/ReEnable2fa/ReEnable2fa.storyboard index cb6a2349..f006385e 100644 --- a/gaios/Wallet/ReEnable2fa/ReEnable2fa.storyboard +++ b/gaios/Wallet/ReEnable2fa/ReEnable2fa.storyboard @@ -1,9 +1,9 @@ - + - + diff --git a/gaios/Wallet/WalletViewController/Cells/AlertCardCell/AlertCardCell.swift b/gaios/Wallet/WalletViewController/Cells/AlertCardCell/AlertCardCell.swift index c3f06d8d..ad0a0489 100644 --- a/gaios/Wallet/WalletViewController/Cells/AlertCardCell/AlertCardCell.swift +++ b/gaios/Wallet/WalletViewController/Cells/AlertCardCell/AlertCardCell.swift @@ -75,7 +75,7 @@ class AlertCardCell: UITableViewCell { btnLeft.isHidden = true case .reactivate: lblTitle.text = NSLocalizedString("id_2fa_expired", comment: "") - lblHint.text = "2FA protection on some of your funds has expired" + lblHint.text = "id_show_coins_with_expiring".localized btnRight.setTitle(NSLocalizedString("id_learn_more", comment: ""), for: .normal) btnLeft.setTitle("Reactivate 2FA", for: .normal) case .systemMessage(let system): @@ -148,22 +148,22 @@ class AlertCardCell: UITableViewCell { break } case .lightningMaintenance: - lblTitle.text = "Lightning account" - lblHint.text = "The Lightning service is currently unavailable for maintenance, but it will be back soon." + lblTitle.text = "id_lightning_account".localized + lblHint.text = "id_lightning_service_is_undergoing".localized lblHint.text = NSLocalizedString("id_this_wallet_is_based_on_your", comment: "") btnRight.isHidden = true btnLeft.isHidden = true btnsContainer.isHidden = true case .lightningServiceDisruption: - lblTitle.text = "Lightning account" - lblHint.text = "The Lightning service is currently unavailable. We apologize for the disruption, we are working to bring the service back online." + lblTitle.text = "id_lightning_account".localized + lblHint.text = "id_the_lightning_service_is".localized btnRight.isHidden = true btnLeft.isHidden = true btnsContainer.isHidden = true case .reEnable2fa: - lblTitle.text = "Re-enable 2FA".localized + lblTitle.text = "id_reenable_2fa".localized lblHint.text = "Some coins are no longer 2FA protected.".localized - btnRight.setTitle("Re-enable 2FA".localized, for: .normal) + btnRight.setTitle("id_reenable_2fa".localized, for: .normal) btnLeft.isHidden = true } }