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

Various Fixes

Browse Source
This commit is contained in:
Ilya Laktyushin
2021-03-14 22:16:20 +04:00
parent b3e5ac68b0
commit 2178de9f8a
10 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
submodules/TelegramPresentationData/Sources/PresentationData.swift
View File

@@ -15,13 +15,24 @@ public struct PresentationDateTimeFormat: Equatable {
public let timeFormat: PresentationTimeFormat
public let dateFormat: PresentationDateFormat
public let dateSeparator: String
public let dateSuffix: String
public let decimalSeparator: String
public let groupingSeparator: String
public init(timeFormat: PresentationTimeFormat, dateFormat: PresentationDateFormat, dateSeparator: String, decimalSeparator: String, groupingSeparator: String) {
public init() {
self.timeFormat = .regular
self.dateFormat = .monthFirst
self.dateSeparator = "."
self.dateSuffix = ""
self.decimalSeparator = "."
self.groupingSeparator = "."
}
public init(timeFormat: PresentationTimeFormat, dateFormat: PresentationDateFormat, dateSeparator: String, dateSuffix: String, decimalSeparator: String, groupingSeparator: String) {
self.timeFormat = timeFormat
self.dateFormat = dateFormat
self.dateSeparator = dateSeparator
self.dateSuffix = dateSuffix
self.decimalSeparator = decimalSeparator
self.groupingSeparator = groupingSeparator
}
@@ -145,9 +156,13 @@ private func currentDateTimeFormat() -> PresentationDateTimeFormat {
let dateFormat: PresentationDateFormat
var dateSeparator = "/"
var dateSuffix = ""
if let dateString = DateFormatter.dateFormat(fromTemplate: "MdY", options: 0, locale: locale) {
for separator in [".", "/", "-", "/"] {
for separator in [". ", ".", "/", "-", "/"] {
if dateString.contains(separator) {
if separator == ". " {
dateSuffix = "."
}
dateSeparator = separator
break
}
@@ -163,7 +178,7 @@ private func currentDateTimeFormat() -> PresentationDateTimeFormat {
let decimalSeparator = locale.decimalSeparator ?? "."
let groupingSeparator = locale.groupingSeparator ?? ""
return PresentationDateTimeFormat(timeFormat: timeFormat, dateFormat: dateFormat, dateSeparator: dateSeparator, decimalSeparator: decimalSeparator, groupingSeparator: groupingSeparator)
return PresentationDateTimeFormat(timeFormat: timeFormat, dateFormat: dateFormat, dateSeparator: dateSeparator, dateSuffix: dateSuffix, decimalSeparator: decimalSeparator, groupingSeparator: groupingSeparator)
}
private func currentPersonNameSortOrder() -> PresentationPersonNameOrder {