diff --git a/Trust/Localization/en.lproj/Localizable.strings b/Trust/Localization/en.lproj/Localizable.strings index 80010c9f9..c0193de62 100644 --- a/Trust/Localization/en.lproj/Localizable.strings +++ b/Trust/Localization/en.lproj/Localizable.strings @@ -188,7 +188,7 @@ "a.wallet.contents.filter.currencyOnly.title" = "CURRENCY"; "a.wallet.contents.filter.assetsOnly.title" = "ASSETS"; "a.wallet.contents.issuer.title" = "Issuer"; -"a.wallet.tickets" = "Tickets"; +"a.wallet.tickets" = "%@ Tickets"; "a.help.navigation.title" = "Help & FAQs"; "a.help.contact.footer.button.title" = "Still need help? Contact Us"; "a.help.contents.whatIsETH" = "What is ETH/Ethereum?"; @@ -204,6 +204,7 @@ "a.settings.contents.myWalletAddress" = "My Wallet Address"; "a.settings.contents.notificationsSettings" = "Notifications Settings"; "a.settings.contents.logout" = "Log Out"; +"a.welcome.navigation.title" = "Welcome"; "a.welcome.onboarding.1" = "Hold all your Crypto assets in one place"; "a.welcome.onboarding.2" = "Powered by blockchain technology, smart tickets, fraud free"; "a.welcome.onboarding.3" = "Buy, sell and transfer your favourite tokens"; diff --git a/Trust/Tokens/ViewModels/TicketTokenViewCellViewModel.swift b/Trust/Tokens/ViewModels/TicketTokenViewCellViewModel.swift index 1bb42fbd6..e53502515 100644 --- a/Trust/Tokens/ViewModels/TicketTokenViewCellViewModel.swift +++ b/Trust/Tokens/ViewModels/TicketTokenViewCellViewModel.swift @@ -23,7 +23,7 @@ struct TicketTokenViewCellViewModel { var amount: String { let actualBalance = self.token.balance.filter { $0.balance != 0 } - return actualBalance.count.toString() + " Tickets" + return R.string.localizable.aWalletTickets(actualBalance.count.toString()) } var issuer: String { diff --git a/Trust/Tokens/ViewModels/TicketsViewControllerHeaderViewModel.swift b/Trust/Tokens/ViewModels/TicketsViewControllerHeaderViewModel.swift index 4b34f2692..49eece59f 100644 --- a/Trust/Tokens/ViewModels/TicketsViewControllerHeaderViewModel.swift +++ b/Trust/Tokens/ViewModels/TicketsViewControllerHeaderViewModel.swift @@ -10,7 +10,7 @@ struct TicketsViewControllerHeaderViewModel { } var title: String { - return "\(totalValidTicketNumber) \(R.string.localizable.aWalletTickets()) \(tokenObject.title)" + return "\(R.string.localizable.aWalletTickets(totalValidTicketNumber)) \(tokenObject.title)" } var issuer: String { diff --git a/Trust/Transactions/Views/TransactionsFooterView.swift b/Trust/Transactions/Views/TransactionsFooterView.swift index 022074c87..9ecd7c6c8 100644 --- a/Trust/Transactions/Views/TransactionsFooterView.swift +++ b/Trust/Transactions/Views/TransactionsFooterView.swift @@ -20,7 +20,7 @@ class TransactionsFooterView: UIView { requestButton.translatesAutoresizingMaskIntoConstraints = false requestButton.layer.cornerRadius = 6 requestButton.titleLabel?.font = Fonts.semibold(size: Fonts.buttonSize) - requestButton.setTitle(NSLocalizedString("transactions.receive.button.title", value: "Receive", comment: ""), for: .normal) + requestButton.setTitle(R.string.localizable.transactionsReceiveButtonTitle(), for: .normal) return requestButton }() diff --git a/Trust/Welcome/ViewModels/WelcomeViewModel.swift b/Trust/Welcome/ViewModels/WelcomeViewModel.swift index 88fdf73e4..1f01ae1c8 100644 --- a/Trust/Welcome/ViewModels/WelcomeViewModel.swift +++ b/Trust/Welcome/ViewModels/WelcomeViewModel.swift @@ -7,7 +7,7 @@ import UIKit struct WelcomeViewModel { var title: String { - return "Welcome" + return R.string.localizable.aWelcomeNavigationTitle() } var backgroundColor: UIColor {