ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-07 17:30:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '6bea5292b615cad83ccbb3e47d22c0b260220b02'

Browse Source
This commit is contained in:
Peter 2019-04-09 16:19:03 +01:00
commit ce0720f9fd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/GenerateLocalization.swift
View File

@ -389,6 +389,7 @@ public final class PresentationStrings {
public let primaryComponent: PresentationStringsComponent public let primaryComponent: PresentationStringsComponent
public let secondaryComponent: PresentationStringsComponent? public let secondaryComponent: PresentationStringsComponent?
public let baseLanguageCode: String public let baseLanguageCode: String
public let groupingSeparator: String
private let _s: [Int: String] private let _s: [Int: String]
private let _r: [Int: [(Int, NSRange)]] private let _r: [Int: [(Int, NSRange)]]
@ -490,7 +491,8 @@ public final class PresentationStrings {
""" """
public func \(escapedIdentifier(key))(_ value: Int32) -> String { public func \(escapedIdentifier(key))(_ value: Int32) -> String {
let form = presentationStringsPluralizationForm(self.lc, value) let form = presentationStringsPluralizationForm(self.lc, value)
return String(format: self._ps[\(id) * \(PluralizationForm.formCount) + Int(form.rawValue)]!, \"\\(value)\") let stringValue = presentationStringsFormattedNumber(value, self.groupingSeparator)
return String(format: self._ps[\(id) * \(PluralizationForm.formCount) + Int(form.rawValue)]!, stringValue)
} }
""" """
@ -503,9 +505,10 @@ public final class PresentationStrings {
result += result +=
""" """
init(primaryComponent: PresentationStringsComponent, secondaryComponent: PresentationStringsComponent?) { init(primaryComponent: PresentationStringsComponent, secondaryComponent: PresentationStringsComponent?, groupingSeparator: String) {
self.primaryComponent = primaryComponent self.primaryComponent = primaryComponent
self.secondaryComponent = secondaryComponent self.secondaryComponent = secondaryComponent
self.groupingSeparator = groupingSeparator
self.baseLanguageCode = secondaryComponent?.languageCode ?? primaryComponent.languageCode self.baseLanguageCode = secondaryComponent?.languageCode ?? primaryComponent.languageCode