mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-12-22 22:25:57 +00:00
Cherry-pick various fixes
This commit is contained in:
@@ -57,7 +57,10 @@ public func presentGiveawayInfoController(
|
||||
|
||||
switch giveawayInfo {
|
||||
case let .ongoing(start, status):
|
||||
let startDate = stringForDate(timestamp: start, timeZone: timeZone, strings: presentationData.strings)
|
||||
let startDate = presentationData.strings.Chat_Giveaway_Info_FullDate(
|
||||
stringForMessageTimestamp(timestamp: start, dateTimeFormat: presentationData.dateTimeFormat),
|
||||
stringForDate(timestamp: start, timeZone: timeZone, strings: presentationData.strings)
|
||||
).string.trimmingCharacters(in: CharacterSet(charactersIn: "*"))
|
||||
|
||||
title = presentationData.strings.Chat_Giveaway_Info_Title
|
||||
|
||||
@@ -123,7 +126,11 @@ public func presentGiveawayInfoController(
|
||||
|
||||
text = "\(intro)\n\n\(ending)\(participation)"
|
||||
case let .finished(status, start, finish, _, activatedCount):
|
||||
let startDate = stringForDate(timestamp: start, timeZone: timeZone, strings: presentationData.strings)
|
||||
let startDate = presentationData.strings.Chat_Giveaway_Info_FullDate(
|
||||
stringForMessageTimestamp(timestamp: start, dateTimeFormat: presentationData.dateTimeFormat),
|
||||
stringForDate(timestamp: start, timeZone: timeZone, strings: presentationData.strings)
|
||||
).string.trimmingCharacters(in: CharacterSet(charactersIn: "*"))
|
||||
|
||||
let finishDate = stringForDate(timestamp: finish, timeZone: timeZone, strings: presentationData.strings)
|
||||
title = presentationData.strings.Chat_Giveaway_Info_EndedTitle
|
||||
|
||||
|
||||
Reference in New Issue
Block a user