Fixes

Adamant-im · Oct 6, 2018 · 8d45708 · 8d45708
1 parent 0b067be
commit 8d45708
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 25 deletions.
diff --git a/Adamant/Assets/l18n/de.lproj/Localizable.strings b/Adamant/Assets/l18n/de.lproj/Localizable.strings
@@ -118,6 +118,9 @@
 /* Account tab: 'Send tokens' button */
 "AccountTab.Row.SendTokens" = "Tokens senden";
 
+/* Account tab: 'Address' row */
+"AccountTab.Row.Address" = "Addresse";
+
 /* Account tab: 'Get free tokens' button */
 "AccountTab.Row.FreeTokens" = "Kostenlose ADM Tokens";
 
@@ -133,14 +136,14 @@
 /* Account tab: Application section title */
 "AccountTab.Section.Application" = "Application";
 
-/* Account tab: Adamant wallet section */
-"AccountTab.Sections.adamant_wallet" = "ADAMANT Wallet";
+/* Account tab: Adamant wallet */
+"AccountTab.Wallets.adamant_wallet" = "Adamant Wallet";
 
-/* Account tab: Ethereum wallet section */
-"AccountTab.Sections.ethereum_wallet" = "Ethereum Wallet";
+/* Account tab: Ethereum wallet */
+"AccountTab.Wallets.ethereum_wallet" = "Ethereum Wallet";
 
-/* Account tab: Lisk wallet section */
-"AccountTab.Sections.lisk_wallet" = "Lisk Wallet";
+/* Account tab: Lisk wallet */
+"AccountTab.Wallets.lisk_wallet" = "Lisk Wallet";
 
 /* Account page: scene title */
 "AccountTab.Title" = "Konto";

diff --git a/Adamant/Assets/l18n/en.lproj/Localizable.strings b/Adamant/Assets/l18n/en.lproj/Localizable.strings
@@ -115,6 +115,9 @@
 /* Account tab: 'Send tokens' button */
 "AccountTab.Row.SendTokens" = "Send Tokens";
 
+/* Account tab: 'Address' row */
+"AccountTab.Row.Address" = "Address";
+
 /* Account tab: 'Get free tokens' button */
 "AccountTab.Row.FreeTokens" = "Free ADM tokens";
 
@@ -130,14 +133,14 @@
 /* Account tab: Application section title */
 "AccountTab.Section.Application" = "Application";
 
-/* Account tab: Adamant wallet section */
-"AccountTab.Sections.adamant_wallet" = "ADAMANT Wallet";
+/* Account tab: Adamant wallet */
+"AccountTab.Wallets.adamant_wallet" = "Adamant Wallet";
 
-/* Account tab: Ethereum wallet section */
-"AccountTab.Sections.ethereum_wallet" = "Ethereum Wallet";
+/* Account tab: Ethereum wallet */
+"AccountTab.Wallets.ethereum_wallet" = "Ethereum Wallet";
 
-/* Account tab: Lisk wallet section */
-"AccountTab.Sections.lisk_wallet" = "Lisk Wallet";
+/* Account tab: Lisk wallet */
+"AccountTab.Wallets.lisk_wallet" = "Lisk Wallet";
 
 /* Account page: scene title */
 "AccountTab.Title" = "Account";

diff --git a/Adamant/Assets/l18n/ru.lproj/Localizable.strings b/Adamant/Assets/l18n/ru.lproj/Localizable.strings
@@ -115,6 +115,9 @@
 /* Account tab: 'Send tokens' button */
 "AccountTab.Row.SendTokens" = "Отправить токены";
 
+/* Account tab: 'Address' row */
+"AccountTab.Row.Address" = "Адрес";
+
 /* Account tab: 'Get free tokens' button */
 "AccountTab.Row.FreeTokens" = "Бесплатные ADM-токены";
 
@@ -130,14 +133,14 @@
 /* Account tab: Application section title */
 "AccountTab.Section.Application" = "Приложение";
 
-/* Account tab: Adamant wallet section */
-"AccountTab.Sections.adamant_wallet" = "ADAMANT кошелёк";
+/* Account tab: Adamant wallet */
+"AccountTab.Wallets.adamant_wallet" = "Adamant кошелёк";
 
-/* Account tab: Ethereum wallet section */
-"AccountTab.Sections.ethereum_wallet" = "Ethereum кошелёк";
+/* Account tab: Ethereum wallet */
+"AccountTab.Wallets.ethereum_wallet" = "Ethereum кошелёк";
 
-/* Account tab: Lisk wallet section */
-"AccountTab.Sections.lisk_wallet" = "Lisk кошелёк";
+/* Account tab: Lisk wallet */
+"AccountTab.Wallets.lisk_wallet" = "Lisk кошелёк";
 
 /* Account tab: Delegates section title */
 "AccountTab.Section.Delegates" = "Делегаты";

diff --git a/Adamant/Wallets/Adamant/AdmWalletService.swift b/Adamant/Wallets/Adamant/AdmWalletService.swift
@@ -30,7 +30,7 @@ class AdmWalletService: NSObject, WalletService {
 	// MARK: - Notifications
 	let walletUpdatedNotification = Notification.Name("adamant.admWallet.updated")
 	let serviceEnabledChanged = Notification.Name("adamant.admWallet.enabledChanged")
-	let transactionFeeUpdated: Notification.Name = Notification.Name("adamant.admWallet.feeUpdated")
+	let transactionFeeUpdated = Notification.Name("adamant.admWallet.feeUpdated")
 
     // MARK: RichMessageProvider properties
     static let richMessageType = "adm_transaction" // not used

diff --git a/Adamant/Wallets/Adamant/AdmWalletViewController.swift b/Adamant/Wallets/Adamant/AdmWalletViewController.swift
@@ -8,12 +8,16 @@
 
 import UIKit
 
+extension String.adamantLocalized.wallets {
+    static let adamant = NSLocalizedString("AccountTab.Wallets.adamant_wallet", comment: "Account tab: Adamant wallet")
+}
+
 class AdmWalletViewController: WalletViewControllerBase {
 	// MARK: Lifecycle
 
 	override func viewDidLoad() {
 		super.viewDidLoad()
 
-		walletTitleLabel.text = "Adamant Wallet"
+		walletTitleLabel.text = String.adamantLocalized.wallets.adamant
 	}
 }
diff --git a/Adamant/Wallets/Ethereum/EthWalletService.swift b/Adamant/Wallets/Ethereum/EthWalletService.swift
@@ -63,7 +63,7 @@ class EthWalletService: WalletService {
 	// MARK: - Notifications
 	let walletUpdatedNotification = Notification.Name("adamant.ethWallet.walletUpdated")
 	let serviceEnabledChanged = Notification.Name("adamant.ethWallet.enabledChanged")
-	let transactionFeeUpdated: Notification.Name = Notification.Name("adamant.ethWallet.feeUpdated")
+	let transactionFeeUpdated = Notification.Name("adamant.ethWallet.feeUpdated")
 
 
     // MARK: RichMessageProvider properties

diff --git a/Adamant/Wallets/Ethereum/EthWalletViewController.swift b/Adamant/Wallets/Ethereum/EthWalletViewController.swift
@@ -8,12 +8,16 @@
 
 import UIKit
 
+extension String.adamantLocalized.wallets {
+    static let ethereum = NSLocalizedString("AccountTab.Wallets.ethereum_wallet", comment: "Account tab: Ethereum wallet")
+}
+
 class EthWalletViewController: WalletViewControllerBase {
 	// MARK: Lifecycle
 
 	override func viewDidLoad() {
 		super.viewDidLoad()
 
-		walletTitleLabel.text = "Ethereum Wallet"
+		walletTitleLabel.text = String.adamantLocalized.wallets.ethereum
 	}
 }
diff --git a/Adamant/Wallets/WalletViewControllerBase.swift b/Adamant/Wallets/WalletViewControllerBase.swift
@@ -9,6 +9,13 @@
 import UIKit
 import Eureka
 
+extension String.adamantLocalized {
+    struct wallets {
+
+        private init() {}
+    }
+}
+
 class WalletViewControllerBase: FormViewController, WalletViewController {
 	// MARK: - Rows
 	enum BaseRows {
@@ -24,9 +31,9 @@ class WalletViewControllerBase: FormViewController, WalletViewController {
 
 		var localized: String {
 			switch self {
-			case .address: return "Адрес"
-			case . balance: return "Баланс"
-			case .send: return "Отправить"
+			case .address: return NSLocalizedString("AccountTab.Row.Address", comment: "Account tab: 'Address' row")
+			case . balance: return NSLocalizedString("AccountTab.Row.Balance", comment: "Account tab: Balance row title")
+			case .send: return NSLocalizedString("AccountTab.Row.SendTokens", comment: "Account tab: 'Send tokens' button")
 			}
 		}
 	}