github-mirror/Telegram-iOS
1
0
Fork 0
mirror of https://github.com/TelegramMessenger/Telegram-iOS.git synced 2026-07-06 03:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update localization

Browse source
This commit is contained in:
Peter 2019-10-04 21:34:02 +04:00
parent 1e44eee8c6
commit 4148595da8
5 changed files with 3561 additions and 3527 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Telegram-iOS/en.lproj/Localizable.strings
View file

@ -4867,6 +4867,9 @@ Any member of this group will be able to see messages in the channel.";
"Wallet.TransactionInfo.CommentHeader" = "COMMENT";
"Wallet.TransactionInfo.StorageFeeHeader" = "STORAGE FEE";
"Wallet.TransactionInfo.OtherFeeHeader" = "TRANSACTION FEE";
"Wallet.TransactionInfo.StorageFeeInfo" = "Blockchain validators collect a tiny fee for storing information about your decentralized wallet. [More info]()";
"Wallet.TransactionInfo.OtherFeeInfo" = "Blockchain validators collect a tiny fee for processing your decentralized transactions. [More info]()";
"Wallet.TransactionInfo.FeeInfoURL" = "https://telegram.org/wallet/fee";
"Wallet.WordCheck.Title" = "Test Time!";
"Wallet.WordCheck.Text" = "Let’s check that you wrote them down correctly. Please enter words\n**%1$@**, **%2$@** and **%3$@** below:";
"Wallet.WordCheck.Continue" = "Continue";

7043
submodules/TelegramPresentationData/Sources/PresentationStrings.swift
View file

File diff suppressed because it is too large Load diff

BIN
submodules/TelegramUI/TelegramUI/Resources/PresentationStrings.mapping
View file

Binary file not shown.

1
submodules/WalletUI/BUCK
View file

@ -30,6 +30,7 @@ static_library(
"//submodules/UrlHandling:UrlHandling",
"//submodules/UrlEscaping:UrlEscaping",
"//submodules/LocalAuth:LocalAuth",
"//submodules/ScreenCaptureDetection:ScreenCaptureDetection",
],
frameworks = [
"$SDKROOT/System/Library/Frameworks/Foundation.framework",

41
submodules/WalletUI/Sources/WalletTransactionInfoScreen.swift
View file

@ -18,11 +18,13 @@ private final class WalletTransactionInfoControllerArguments {
let copyWalletAddress: () -> Void
let sendGrams: () -> Void
let displayContextMenu: (WalletTransactionInfoEntryTag, String) -> Void
let openFeeInfo: () -> Void
init(copyWalletAddress: @escaping () -> Void, sendGrams: @escaping () -> Void, displayContextMenu: @escaping (WalletTransactionInfoEntryTag, String) -> Void) {
init(copyWalletAddress: @escaping () -> Void, sendGrams: @escaping () -> Void, displayContextMenu: @escaping (WalletTransactionInfoEntryTag, String) -> Void, openFeeInfo: @escaping () -> Void) {
self.copyWalletAddress = copyWalletAddress
self.sendGrams = sendGrams
self.displayContextMenu = displayContextMenu
self.openFeeInfo = openFeeInfo
}
}
@ -55,8 +57,10 @@ private enum WalletTransactionInfoEntry: ItemListNodeEntry {
case infoSendGrams(PresentationTheme, String)
case storageFeeHeader(PresentationTheme, String)
case storageFee(PresentationTheme, String)
case storageFeeInfo(PresentationTheme, String)
case otherFeeHeader(PresentationTheme, String)
case otherFee(PresentationTheme, String)
case otherFeeInfo(PresentationTheme, String)
case commentHeader(PresentationTheme, String)
case comment(PresentationTheme, String)
@ -66,9 +70,9 @@ private enum WalletTransactionInfoEntry: ItemListNodeEntry {
return WalletTransactionInfoSection.amount.rawValue
case .infoHeader, .infoAddress, .infoCopyAddress, .infoSendGrams:
return WalletTransactionInfoSection.info.rawValue
case .storageFeeHeader, .storageFee:
case .storageFeeHeader, .storageFee, .storageFeeInfo:
return WalletTransactionInfoSection.storageFee.rawValue
case .otherFeeHeader, .otherFee:
case .otherFeeHeader, .otherFee, .otherFeeInfo:
return WalletTransactionInfoSection.otherFee.rawValue
case .commentHeader, .comment:
return WalletTransactionInfoSection.comment.rawValue
@ -91,14 +95,18 @@ private enum WalletTransactionInfoEntry: ItemListNodeEntry {
return 5
case .storageFee:
return 6
case .otherFeeHeader:
case .storageFeeInfo:
return 7
case .otherFee:
case .otherFeeHeader:
return 8
case .commentHeader:
case .otherFee:
return 9
case .comment:
case .otherFeeInfo:
return 10
case .commentHeader:
return 11
case .comment:
return 12
}
}
@ -130,10 +138,24 @@ private enum WalletTransactionInfoEntry: ItemListNodeEntry {
return ItemListSectionHeaderItem(theme: theme, text: text, sectionId: self.section)
case let .storageFee(theme, text):
return ItemListMultilineTextItem(theme: theme, text: text, enabledEntityTypes: [], sectionId: self.section, style: .blocks, longTapAction: nil, tag: nil)
case let .storageFeeInfo(theme, text):
return ItemListTextItem(theme: theme, text: .markdown(text), sectionId: self.section, linkAction: { action in
switch action {
case .tap:
arguments.openFeeInfo()
}
}, style: .blocks)
case let .otherFeeHeader(theme, text):
return ItemListSectionHeaderItem(theme: theme, text: text, sectionId: self.section)
case let .otherFee(theme, text):
return ItemListMultilineTextItem(theme: theme, text: text, enabledEntityTypes: [], sectionId: self.section, style: .blocks, longTapAction: nil, tag: nil)
case let .otherFeeInfo(theme, text):
return ItemListTextItem(theme: theme, text: .markdown(text), sectionId: self.section, linkAction: { action in
switch action {
case .tap:
arguments.openFeeInfo()
}
}, style: .blocks)
case let .commentHeader(theme, text):
return ItemListSectionHeaderItem(theme: theme, text: text, sectionId: self.section)
case let .comment(theme, text):
@ -250,10 +272,12 @@ private func walletTransactionInfoControllerEntries(presentationData: Presentati
if transaction.storageFee != 0 {
entries.append(.storageFeeHeader(presentationData.theme, presentationData.strings.Wallet_TransactionInfo_StorageFeeHeader))
entries.append(.storageFee(presentationData.theme, formatBalanceText(-transaction.storageFee, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
entries.append(.storageFeeInfo(presentationData.theme, presentationData.strings.Wallet_TransactionInfo_StorageFeeInfo))
}
if transaction.otherFee != 0 {
entries.append(.otherFeeHeader(presentationData.theme, presentationData.strings.Wallet_TransactionInfo_OtherFeeHeader))
entries.append(.otherFee(presentationData.theme, formatBalanceText(-transaction.otherFee, decimalSeparator: presentationData.dateTimeFormat.decimalSeparator)))
entries.append(.otherFeeInfo(presentationData.theme, presentationData.strings.Wallet_TransactionInfo_OtherFeeInfo))
}
}
@ -295,6 +319,9 @@ func walletTransactionInfoController(context: AccountContext, tonContext: TonCon
}
}, displayContextMenu: { tag, text in
displayContextMenuImpl?(tag, text)
}, openFeeInfo: {
let presentationData = context.sharedContext.currentPresentationData.with { $0 }
context.sharedContext.openExternalUrl(context: context, urlContext: .generic, url: presentationData.strings.Wallet_TransactionInfo_FeeInfoURL, forceExternal: true, presentationData: presentationData, navigationController: nil, dismissInput: {})
})
let signal = combineLatest(queue: .mainQueue(), context.sharedContext.presentationData, statePromise.get())