ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-10-09 03:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '5d684792b24ffbb610e06a26036426ff14a3d61e'

Browse Source
This commit is contained in:
Ali 2020-01-21 23:30:35 +04:00
commit 79ac746282
6 changed files with 3333 additions and 3328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram-iOS/en.lproj/Localizable.strings
View File

@ -5296,3 +5296,5 @@ Any member of this group will be able to see messages in the channel.";
"Appearance.BubbleCorners.Title" = "Message Corners";
"Appearance.BubbleCorners.AdjustAdjacent" = "Adjust Adjacent Corners";
"Appearance.BubbleCorners.Apply" = "Set";
"Conversation.LiveLocationYouAndOther" = "**You** and %@";

4
submodules/TelegramBaseController/Sources/LocationBroadcastNavigationAccessoryPanel.swift
View File

@ -135,13 +135,13 @@ final class LocationBroadcastNavigationAccessoryPanel: ASDisplayNode {
} else {
let otherString: String
if filteredPeers.count == 1 {
otherString = peers[0].compactDisplayTitle
otherString = peers[0].compactDisplayTitle.replacingOccurrences(of: "*", with: "")
} else {
otherString = self.strings.Conversation_LiveLocationMembersCount(Int32(peers.count))
}
let rawText: String
if filteredPeers.count != peers.count {
rawText = self.strings.Conversation_LiveLocationYouAnd(otherString).0.replacingOccurrences(of: "*", with: "**")
rawText = self.strings.Conversation_LiveLocationYouAndOther(otherString).0
} else {
rawText = otherString
}

6651
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.

BIN
submodules/WalletUI/Resources/WalletStrings.mapping
View File

Binary file not shown.

4
submodules/WalletUI/Sources/WalletStrings.swift
View File

@ -448,12 +448,12 @@ public final class WalletStrings: Equatable {
public var Wallet_SecureStorageReset_Title: String { return self._s[218]! }
public var Wallet_Receive_CommentHeader: String { return self._s[219]! }
public var Wallet_Info_ReceiveGrams: String { return self._s[220]! }
public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String {
public func Wallet_Updated_HoursAgo(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = walletStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[0 * 6 + Int(form.rawValue)]!, stringValue)
}
public func Wallet_Updated_HoursAgo(_ value: Int32) -> String {
public func Wallet_Updated_MinutesAgo(_ value: Int32) -> String {
let form = getPluralizationForm(self.lc, value)
let stringValue = walletStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[1 * 6 + Int(form.rawValue)]!, stringValue)