Update localization [skip ci]

This commit is contained in:
Peter 2019-10-08 14:54:15 +04:00
parent 97636df73a
commit 12f97fb823
4 changed files with 521 additions and 506 deletions

View File

@ -4756,7 +4756,7 @@ Any member of this group will be able to see messages in the channel.";
"ChatSearch.ResultsTooltip" = "Tap to view as a list."; "ChatSearch.ResultsTooltip" = "Tap to view as a list.";
"Updated.JustNow" = "just now"; "Updated.JustNow" = "updated just now";
"Updated.MinutesAgo_0" = "%@ minutes ago"; //three to ten "Updated.MinutesAgo_0" = "%@ minutes ago"; //three to ten
"Updated.MinutesAgo_1" = "1 minute ago"; //one "Updated.MinutesAgo_1" = "1 minute ago"; //one
"Updated.MinutesAgo_2" = "2 minutes ago"; //two "Updated.MinutesAgo_2" = "2 minutes ago"; //two
@ -4778,6 +4778,7 @@ Any member of this group will be able to see messages in the channel.";
"Wallet.Info.Address" = "Your wallet address"; "Wallet.Info.Address" = "Your wallet address";
"Wallet.Info.YourBalance" = "your balance"; "Wallet.Info.YourBalance" = "your balance";
"Wallet.Info.Receive" = "Receive"; "Wallet.Info.Receive" = "Receive";
"Wallet.Info.ReceiveGrams" = "Receive Grams";
"Wallet.Info.Send" = "Send"; "Wallet.Info.Send" = "Send";
"Wallet.Info.RefreshErrorTitle" = "No network"; "Wallet.Info.RefreshErrorTitle" = "No network";
"Wallet.Info.RefreshErrorText" = "Couldn't refresh balance. Please make sure your internet connection is working and try again."; "Wallet.Info.RefreshErrorText" = "Couldn't refresh balance. Please make sure your internet connection is working and try again.";

View File

@ -206,6 +206,7 @@ private final class WalletInfoHeaderNode: ASDisplayNode {
private let refreshNode: WalletRefreshNode private let refreshNode: WalletRefreshNode
private let balanceSubtitleNode: ImmediateTextNode private let balanceSubtitleNode: ImmediateTextNode
private let receiveButtonNode: SolidRoundedButtonNode private let receiveButtonNode: SolidRoundedButtonNode
private let receiveGramsButtonNode: SolidRoundedButtonNode
private let sendButtonNode: SolidRoundedButtonNode private let sendButtonNode: SolidRoundedButtonNode
private let headerBackgroundNode: ASDisplayNode private let headerBackgroundNode: ASDisplayNode
private let headerCornerNode: ASImageNode private let headerCornerNode: ASImageNode
@ -234,6 +235,7 @@ private final class WalletInfoHeaderNode: ASDisplayNode {
})?.stretchableImage(withLeftCapWidth: 10, topCapHeight: 1) })?.stretchableImage(withLeftCapWidth: 10, topCapHeight: 1)
self.receiveButtonNode = SolidRoundedButtonNode(title: presentationData.strings.Wallet_Info_Receive, icon: UIImage(bundleImageName: "Wallet/ReceiveButtonIcon"), theme: SolidRoundedButtonTheme(backgroundColor: .white, foregroundColor: .black), height: 50.0, cornerRadius: 10.0, gloss: false) self.receiveButtonNode = SolidRoundedButtonNode(title: presentationData.strings.Wallet_Info_Receive, icon: UIImage(bundleImageName: "Wallet/ReceiveButtonIcon"), theme: SolidRoundedButtonTheme(backgroundColor: .white, foregroundColor: .black), height: 50.0, cornerRadius: 10.0, gloss: false)
self.receiveGramsButtonNode = SolidRoundedButtonNode(title: presentationData.strings.Wallet_Info_ReceiveGrams, icon: UIImage(bundleImageName: "Wallet/ReceiveButtonIcon"), theme: SolidRoundedButtonTheme(backgroundColor: .white, foregroundColor: .black), height: 50.0, cornerRadius: 10.0, gloss: false)
self.sendButtonNode = SolidRoundedButtonNode(title: presentationData.strings.Wallet_Info_Send, icon: UIImage(bundleImageName: "Wallet/SendButtonIcon"), theme: SolidRoundedButtonTheme(backgroundColor: .white, foregroundColor: .black), height: 50.0, cornerRadius: 10.0, gloss: false) self.sendButtonNode = SolidRoundedButtonNode(title: presentationData.strings.Wallet_Info_Send, icon: UIImage(bundleImageName: "Wallet/SendButtonIcon"), theme: SolidRoundedButtonTheme(backgroundColor: .white, foregroundColor: .black), height: 50.0, cornerRadius: 10.0, gloss: false)
self.refreshNode = WalletRefreshNode(strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat) self.refreshNode = WalletRefreshNode(strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat)
@ -244,6 +246,7 @@ private final class WalletInfoHeaderNode: ASDisplayNode {
self.addSubnode(self.headerCornerNode) self.addSubnode(self.headerCornerNode)
if hasActions { if hasActions {
self.addSubnode(self.receiveButtonNode) self.addSubnode(self.receiveButtonNode)
self.addSubnode(self.receiveGramsButtonNode)
self.addSubnode(self.sendButtonNode) self.addSubnode(self.sendButtonNode)
} }
self.addSubnode(self.balanceNode) self.addSubnode(self.balanceNode)
@ -253,6 +256,9 @@ private final class WalletInfoHeaderNode: ASDisplayNode {
self.receiveButtonNode.pressed = { self.receiveButtonNode.pressed = {
receiveAction() receiveAction()
} }
self.receiveGramsButtonNode.pressed = {
receiveAction()
}
self.sendButtonNode.pressed = { self.sendButtonNode.pressed = {
sendAction() sendAction()
} }
@ -337,18 +343,18 @@ private final class WalletInfoHeaderNode: ASDisplayNode {
let sendButtonFrame = CGRect(origin: CGPoint(x: leftButtonFrame.maxX + sideInset, y: leftButtonFrame.minY), size: CGSize(width: size.width - leftButtonFrame.maxX - sideInset * 2.0, height: buttonHeight)) let sendButtonFrame = CGRect(origin: CGPoint(x: leftButtonFrame.maxX + sideInset, y: leftButtonFrame.minY), size: CGSize(width: size.width - leftButtonFrame.maxX - sideInset * 2.0, height: buttonHeight))
let fullButtonFrame = CGRect(origin: CGPoint(x: sideInset, y: buttonOffset - sideInset - buttonHeight), size: CGSize(width: size.width - sideInset * 2.0, height: buttonHeight)) let fullButtonFrame = CGRect(origin: CGPoint(x: sideInset, y: buttonOffset - sideInset - buttonHeight), size: CGSize(width: size.width - sideInset * 2.0, height: buttonHeight))
var receiveButtonFrame: CGRect
if let balance = self.balance, balance > 0 { if let balance = self.balance, balance > 0 {
receiveButtonFrame = leftButtonFrame self.receiveGramsButtonNode.isHidden = true
self.receiveButtonNode.isHidden = false self.receiveButtonNode.isHidden = false
self.sendButtonNode.isHidden = false self.sendButtonNode.isHidden = false
} else { } else {
receiveButtonFrame = fullButtonFrame
if self.balance == nil { if self.balance == nil {
self.receiveGramsButtonNode.isHidden = true
self.receiveButtonNode.isHidden = true self.receiveButtonNode.isHidden = true
self.sendButtonNode.isHidden = true self.sendButtonNode.isHidden = true
} else { } else {
self.receiveButtonNode.isHidden = false self.receiveGramsButtonNode.isHidden = false
self.receiveButtonNode.isHidden = true
self.sendButtonNode.isHidden = true self.sendButtonNode.isHidden = true
} }
} }
@ -362,9 +368,12 @@ private final class WalletInfoHeaderNode: ASDisplayNode {
self.refreshNode.isHidden = false self.refreshNode.isHidden = false
} }
transition.updateFrame(node: self.receiveButtonNode, frame: receiveButtonFrame) transition.updateFrame(node: self.receiveGramsButtonNode, frame: fullButtonFrame)
transition.updateAlpha(node: self.receiveGramsButtonNode, alpha: buttonAlpha)
transition.updateFrame(node: self.receiveButtonNode, frame: leftButtonFrame)
transition.updateAlpha(node: self.receiveButtonNode, alpha: buttonAlpha) transition.updateAlpha(node: self.receiveButtonNode, alpha: buttonAlpha)
self.receiveButtonNode.updateLayout(width: receiveButtonFrame.width, transition: transition) self.receiveGramsButtonNode.updateLayout(width: fullButtonFrame.width, transition: transition)
self.receiveButtonNode.updateLayout(width: leftButtonFrame.width, transition: transition)
transition.updateFrame(node: self.sendButtonNode, frame: sendButtonFrame) transition.updateFrame(node: self.sendButtonNode, frame: sendButtonFrame)
transition.updateAlpha(node: self.sendButtonNode, alpha: buttonAlpha) transition.updateAlpha(node: self.sendButtonNode, alpha: buttonAlpha)
self.sendButtonNode.updateLayout(width: sendButtonFrame.width, transition: transition) self.sendButtonNode.updateLayout(width: sendButtonFrame.width, transition: transition)
@ -377,12 +386,16 @@ private final class WalletInfoHeaderNode: ASDisplayNode {
if let result = self.receiveButtonNode.hitTest(self.view.convert(point, to: self.receiveButtonNode.view), with: event) { if let result = self.receiveButtonNode.hitTest(self.view.convert(point, to: self.receiveButtonNode.view), with: event) {
return result return result
} }
if let result = self.receiveGramsButtonNode.hitTest(self.view.convert(point, to: self.receiveGramsButtonNode.view), with: event) {
return result
}
return nil return nil
} }
func becameReady(animated: Bool) { func becameReady(animated: Bool) {
if animated { if animated {
self.sendButtonNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) self.sendButtonNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
self.receiveGramsButtonNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
self.receiveButtonNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) self.receiveButtonNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
self.balanceNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) self.balanceNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)
self.balanceSubtitleNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2) self.balanceSubtitleNode.layer.animateAlpha(from: 0.0, to: 1.0, duration: 0.2)