Merge branch 'release/0.3.7'

Adamant-im · Apr 5, 2018 · 91dc633 · 91dc633
2 parents 05d7cf1 + c564d75
commit 91dc633
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/Adamant/Assets/l18n/en.lproj/Localizable.strings b/Adamant/Assets/l18n/en.lproj/Localizable.strings
@@ -16,6 +16,9 @@
 /* Account tab: Confirm logout alert */
 "AccountTab.ConfirmLogout.MessageFormat" = "Logout from %@?";
 
+/* Account tab: A full 'Join ICO' link, with %@ as address */
+"AccountTab.JoinIcoUrlFormat" = "https://adamant.im/ico?wallet=%@";
+
 /* Account tab: Balance row title */
 "AccountTab.Row.Balance" = "Balance";
 

diff --git a/Adamant/Assets/l18n/ru.lproj/Localizable.strings b/Adamant/Assets/l18n/ru.lproj/Localizable.strings
diff --git a/Adamant/Info.plist b/Adamant/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>0.3.7</string>
 	<key>CFBundleVersion</key>
-	<string>24</string>
+	<string>25</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>

diff --git a/Adamant/Stories/Account/AccountViewController.swift b/Adamant/Stories/Account/AccountViewController.swift
@@ -20,6 +20,8 @@ extension String.adamantLocalized {
 		static let webApp = NSLocalizedString("AccountTab.TransferBlocked.GoToPWA", comment: "Account tab: 'Transfer not allowed' alert 'go to WebApp button'")
 		static let transferNotAllowed = NSLocalizedString("AccountTab.TransferBlocked.Message", comment: "Account tab: Inform user that sending tokens not allowed by Apple until the end of ICO")
 
+		static let joinIcoUrlFormat = NSLocalizedString("AccountTab.JoinIcoUrlFormat", comment: "Account tab: A full 'Join ICO' link, with %@ as address")
+
 		private init() { }
 	}
 }
@@ -241,7 +243,7 @@ class AccountViewController: FormViewController {
 			})
 			.onCellSelection({ [weak self] (_, _) in
 				guard let address = self?.accountService.account?.address,
-					let url = URL(string: "https://adamant.im/ico/?wallet=\(address)") else {
+					let url = URL(string:  String.localizedStringWithFormat(String.adamantLocalized.account.joinIcoUrlFormat, address)) else {
 					return
 				}