mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-11-07 01:10:09 +00:00
Merge commit 'b41ec120245b26e50e369c6f510e85c4cd29c9ed' into beta
This commit is contained in:
commit
70aa29c46b
@ -845,7 +845,8 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
|
|||||||
case let .giftStars(currency, amount, count, _, _, _):
|
case let .giftStars(currency, amount, count, _, _, _):
|
||||||
let _ = count
|
let _ = count
|
||||||
if !forAdditionalServiceMessage {
|
if !forAdditionalServiceMessage {
|
||||||
attributedString = NSAttributedString(string: strings.Notification_Gift, font: titleFont, textColor: primaryTextColor)
|
let starsPrice = strings.Notification_GiftStars_Stars(Int32(clamping: count))
|
||||||
|
attributedString = NSAttributedString(string: strings.Notification_GiftStars(starsPrice).string, font: titleFont, textColor: primaryTextColor)
|
||||||
} else {
|
} else {
|
||||||
let price = formatCurrencyAmount(amount, currency: currency)
|
let price = formatCurrencyAmount(amount, currency: currency)
|
||||||
if message.author?.id == accountPeerId {
|
if message.author?.id == accountPeerId {
|
||||||
@ -1176,9 +1177,6 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
|
|||||||
if isPrepaidUpgrade {
|
if isPrepaidUpgrade {
|
||||||
let starsPrice = strings.Notification_PrepaidGiftUpgrade_Stars(Int32(clamping: upgradeStars ?? 0))
|
let starsPrice = strings.Notification_PrepaidGiftUpgrade_Stars(Int32(clamping: upgradeStars ?? 0))
|
||||||
attributedString = NSAttributedString(string: strings.Notification_PrepaidGiftUpgrade(starsPrice).string, font: titleFont, textColor: primaryTextColor)
|
attributedString = NSAttributedString(string: strings.Notification_PrepaidGiftUpgrade(starsPrice).string, font: titleFont, textColor: primaryTextColor)
|
||||||
} else if case let .generic(gift) = gift {
|
|
||||||
let starsPrice = strings.Notification_GiftStars_Stars(Int32(clamping: gift.price))
|
|
||||||
attributedString = NSAttributedString(string: strings.Notification_GiftStars(starsPrice).string, font: titleFont, textColor: primaryTextColor)
|
|
||||||
} else {
|
} else {
|
||||||
attributedString = NSAttributedString(string: strings.Notification_Gift, font: titleFont, textColor: primaryTextColor)
|
attributedString = NSAttributedString(string: strings.Notification_Gift, font: titleFont, textColor: primaryTextColor)
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user