SolarNetwork/DysonNetwork
2
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Bug fixes within the new localization engine

Browse Source
This commit is contained in:
LittleSheep
2026-02-05 15:53:25 +08:00
parent 541956d0e9
commit 769b0e0e9c
14 changed files with 283 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
DysonNetwork.Wallet/Payment/PaymentService.cs
View File

@@ -180,8 +180,9 @@ public class PaymentService(
{
// Due to ID is uuid, it longer than 8 words for sure
var readableTransactionId = transaction.Id.ToString().Replace("-", "")[..8];
var locale = System.Globalization.CultureInfo.CurrentUICulture.Name;
var readableTransactionRemark = transaction.Remarks ?? $"#{readableTransactionId}";
await pusher.SendPushNotificationToUserAsync(
new SendPushNotificationToUserRequest
{
@@ -189,13 +190,13 @@ public class PaymentService(
Notification = new PushNotification
{
Topic = "wallets.transactions",
Title = localizer.Get("transactionNewTitle", args: new { remark = readableTransactionRemark }),
Title = localizer.Get("transactionNewTitle", locale: locale, args: new { remark = readableTransactionRemark }),
Body = transaction.Amount > 0
? localizer.Get("transactionNewBodyMinus", args: new {
? localizer.Get("transactionNewBodyMinus", locale: locale, args: new {
amount = transaction.Amount.ToString(CultureInfo.InvariantCulture),
currency = transaction.Currency
})
: localizer.Get("transactionNewBodyPlus", args: new {
: localizer.Get("transactionNewBodyPlus", locale: locale, args: new {
amount = transaction.Amount.ToString(CultureInfo.InvariantCulture),
currency = transaction.Currency
}),
@@ -208,9 +209,10 @@ public class PaymentService(
if (payeeWallet is not null)
{
// Due to ID is uuid, it longer than 8 words for sure
var locale = System.Globalization.CultureInfo.CurrentUICulture.Name;
var readableTransactionId = transaction.Id.ToString().Replace("-", "")[..8];
var readableTransactionRemark = transaction.Remarks ?? $"#{readableTransactionId}";
await pusher.SendPushNotificationToUserAsync(
new SendPushNotificationToUserRequest
{
@@ -218,13 +220,13 @@ public class PaymentService(
Notification = new PushNotification
{
Topic = "wallets.transactions",
Title = localizer.Get("transactionNewTitle", args: new { remark = readableTransactionRemark }),
Title = localizer.Get("transactionNewTitle", locale: locale, args: new { remark = readableTransactionRemark }),
Body = transaction.Amount > 0
? localizer.Get("transactionNewBodyPlus", args: new {
? localizer.Get("transactionNewBodyPlus", locale: locale, args: new {
amount = transaction.Amount.ToString(CultureInfo.InvariantCulture),
currency = transaction.Currency
})
: localizer.Get("transactionNewBodyMinus", args: new {
: localizer.Get("transactionNewBodyMinus", locale: locale, args: new {
amount = transaction.Amount.ToString(CultureInfo.InvariantCulture),
currency = transaction.Currency
}),
@@ -339,9 +341,36 @@ public class PaymentService(
if (payeeWallet is not null)
{
// Due to ID is uuid, it longer than 8 words for sure
var locale = System.Globalization.CultureInfo.CurrentUICulture.Name;
var readableOrderId = order.Id.ToString().Replace("-", "")[..8];
var readableOrderRemark = order.Remarks ?? $"#{readableOrderId}";
await pusher.SendPushNotificationToUserAsync(
new SendPushNotificationToUserRequest
{
UserId = payerWallet.AccountId.ToString(),
Notification = new PushNotification
{
Topic = "wallets.orders.paid",
Title = localizer.Get("orderPaidTitle", locale: locale, args: new { orderId = $"#{readableOrderId}" }),
Body = localizer.Get("orderPaidBody", locale: locale, args: new {
amount = order.Amount.ToString(CultureInfo.InvariantCulture),
currency = order.Currency,
remark = readableOrderRemark
}),
IsSavable = true
}
}
);
}
if (payeeWallet is not null)
{
// Due to ID is uuid, it longer than 8 words for sure
var locale = System.Globalization.CultureInfo.CurrentUICulture.Name;
var readableOrderId = order.Id.ToString().Replace("-", "")[..8];
var readableOrderRemark = order.Remarks ?? $"#{readableOrderId}";
await pusher.SendPushNotificationToUserAsync(
new SendPushNotificationToUserRequest
{
@@ -349,8 +378,8 @@ public class PaymentService(
Notification = new PushNotification
{
Topic = "wallets.orders.received",
Title = localizer.Get("orderReceivedTitle", args: new { orderId = $"#{readableOrderId}" }),
Body = localizer.Get("orderReceivedBody", args: new {
Title = localizer.Get("orderReceivedTitle", locale: locale, args: new { orderId = $"#{readableOrderId}" }),
Body = localizer.Get("orderReceivedBody", locale: locale, args: new {
amount = order.Amount.ToString(CultureInfo.InvariantCulture),
currency = order.Currency,
remark = readableOrderRemark

10
DysonNetwork.Wallet/Payment/SubscriptionService.cs
View File

@@ -420,11 +420,12 @@ public class SubscriptionService(
? subscription.EndedAt.Value.Minus(subscription.BegunAt).Days.ToString()
: "infinite";
var locale = System.Globalization.CultureInfo.CurrentUICulture.Name;
var notification = new PushNotification
{
Topic = "subscriptions.begun",
Title = localizer.Get("subscriptionAppliedTitle", args: new { subscriptionName = humanReadableName }),
Body = localizer.Get("subscriptionAppliedBody", args: new { duration, subscriptionName = humanReadableName }),
Title = localizer.Get("subscriptionAppliedTitle", locale: locale, args: new { subscriptionName = humanReadableName }),
Body = localizer.Get("subscriptionAppliedBody", locale: locale, args: new { duration, subscriptionName = humanReadableName }),
Meta = GrpcTypeHelper.ConvertObjectToByteString(new Dictionary<string, object>
{
["subscription_id"] = subscription.Id.ToString()
@@ -917,11 +918,12 @@ public class SubscriptionService(
? humanReadable
: subscription.Identifier;
var locale = System.Globalization.CultureInfo.CurrentUICulture.Name;
var notification = new PushNotification
{
Topic = "gifts.claimed",
Title = localizer.Get("giftClaimedTitle"),
Body = localizer.Get("giftClaimedBody", args: new { subscriptionName = humanReadableName, redeemerName = redeemer.Name }),
Title = localizer.Get("giftClaimedTitle", locale: locale),
Body = localizer.Get("giftClaimedBody", locale: locale, args: new { subscriptionName = humanReadableName, redeemerName = redeemer.Name }),
Meta = GrpcTypeHelper.ConvertObjectToByteString(new Dictionary<string, object>
{
["gift_id"] = gift.Id.ToString(),