Skip to content

Commit 50fe471

Browse files
committed
Show extended auction round info
1 parent 4a571de commit 50fe471

File tree

2 files changed

+18
-2
lines changed

2 files changed

+18
-2
lines changed

Telegram/Telegram-iOS/en.lproj/Localizable.strings

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15494,9 +15494,12 @@ Error: %8$@";
1549415494
"Gift.Auction.Hours_any" = "%@ hours";
1549515495
"Gift.Auction.Minutes_1" = "%@ minute";
1549615496
"Gift.Auction.Minutes_any" = "%@ minutes";
15497+
"Gift.Auction.Seconds_1" = "%@ second";
15498+
"Gift.Auction.Seconds_any" = "%@ seconds";
1549715499
"Gift.Auction.HoursEach_1" = "%@ hour each";
1549815500
"Gift.Auction.HoursEach_any" = "%@ hours each";
1549915501
"Gift.Auction.MinutesEach_1" = "%@ minute each";
1550015502
"Gift.Auction.MinutesEach_any" = "%@ minutes each";
15503+
"Gift.Auction.Extension" = "+ %1$@ for late bids in top %2$@";
1550115504

1550215505
"ChatList.Auctions.UpcomingAuction" = "Upcoming Auction";

submodules/TelegramUI/Components/Gifts/GiftViewScreen/Sources/GiftAuctionViewScreen.swift

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,7 @@ private final class GiftAuctionViewSheetContent: CombinedComponent {
620620
}
621621

622622
let title: String = start == end ? strings.Gift_Auction_TimeRound("\(start)").string : strings.Gift_Auction_TimeRounds("\(start)-\(end)").string
623-
let value: String
623+
var value: String
624624
if round.duration % 3600 == 0 {
625625
let hours = round.duration / 3600
626626
value = start == end ? strings.Gift_Auction_Hours(hours) : strings.Gift_Auction_HoursEach(hours)
@@ -629,11 +629,24 @@ private final class GiftAuctionViewSheetContent: CombinedComponent {
629629
value = start == end ? strings.Gift_Auction_Minutes(minutes) : strings.Gift_Auction_MinutesEach(minutes)
630630
}
631631

632+
if case let .extendable(_, _, top, window) = round {
633+
var windowString: String
634+
if window % 60 == 0 {
635+
windowString = strings.Gift_Auction_Minutes(window)
636+
} else {
637+
windowString = strings.Gift_Auction_Seconds(window)
638+
}
639+
value += " \(strings.Gift_Auction_Extension(windowString, "\(top)").string)"
640+
}
641+
632642
tableItems.append(.init(
633643
id: "round_\(i)",
634644
title: title,
635645
component: AnyComponent(
636-
MultilineTextComponent(text: .plain(NSAttributedString(string: value, font: tableFont, textColor: tableTextColor)))
646+
MultilineTextComponent(
647+
text: .plain(NSAttributedString(string: value, font: tableFont, textColor: tableTextColor)),
648+
maximumNumberOfLines: 3
649+
)
637650
)
638651
))
639652
}

0 commit comments

Comments
 (0)