From 93c6a9d5b88e2ce86dbbe91641952673772035b5 Mon Sep 17 00:00:00 2001 From: cKey <35512826+colinin@users.noreply.github.com> Date: Sat, 25 Jun 2022 16:54:32 +0800 Subject: [PATCH] fix: add missing localizer text. --- .../Abp/Notifications/Localization/Resources/en.json | 10 ++++++++++ .../Notifications/Localization/Resources/zh-Hans.json | 10 ++++++++++ .../Notifications/Dto/NotificationGetByIdDto.cs | 4 +++- .../Dto/NotificationMarkReadStateInput.cs | 3 +++ .../Notifications/Dto/NotificationSendDto.cs | 9 ++++++++- .../Dto/UserNotificationChangeReadStateDto.cs | 3 +++ .../Notifications/Dto/UserNotificationGetByNameDto.cs | 4 +++- .../Notifications/Dto/UserNotificationGetByPagedDto.cs | 2 ++ .../Subscriptions/Dto/SubscriptionsGetByNameDto.cs | 2 ++ .../Abp/TextTemplating/Localization/Resources/en.json | 7 ++++++- .../TextTemplating/Localization/Resources/zh-Hans.json | 7 ++++++- 11 files changed, 56 insertions(+), 5 deletions(-) diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN/Abp/Notifications/Localization/Resources/en.json b/aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN/Abp/Notifications/Localization/Resources/en.json index a45236c6c..8e7bddce6 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN/Abp/Notifications/Localization/Resources/en.json +++ b/aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN/Abp/Notifications/Localization/Resources/en.json @@ -6,7 +6,17 @@ "Notifications:Content": "Content", "Notifications:Type": "Type", "Notifications:SendTime": "SendTime", + "Notifications:Name": "Name", + "Notifications:Description": "Description", + "Notifications:Culture": "Culture", + "Notifications:Data": "Data", + "Notifications:ToUserId": "To UserId", + "Notifications:ToUserName": "To User", + "Notifications:Severity": "Severity", + "Notifications:State": "State", + "Notifications:Lifetime": "Lifetime", "Notifications:System": "System", + "Notifications:Id": "Id", "Notifications:Application": "Platform", "Notifications:User": "User", "Notifications:Internal": "Internal", diff --git a/aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN/Abp/Notifications/Localization/Resources/zh-Hans.json b/aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN/Abp/Notifications/Localization/Resources/zh-Hans.json index 65fdcd866..522ebd549 100644 --- a/aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN/Abp/Notifications/Localization/Resources/zh-Hans.json +++ b/aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN/Abp/Notifications/Localization/Resources/zh-Hans.json @@ -6,6 +6,16 @@ "Notifications:Content": "内容", "Notifications:Type": "类型", "Notifications:SendTime": "发送时间", + "Notifications:Name": "名称", + "Notifications:Description": "描述", + "Notifications:Culture": "区域", + "Notifications:Data": "数据", + "Notifications:ToUserId": "接收用户标识", + "Notifications:ToUserName": "接收用户", + "Notifications:Severity": "告警级别", + "Notifications:State": "状态", + "Notifications:Lifetime": "存活周期", + "Notifications:Id": "标识", "Notifications:System": "系统", "Notifications:Application": "平台", "Notifications:User": "用户", diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/NotificationGetByIdDto.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/NotificationGetByIdDto.cs index 0e6b8a902..1820eb7b0 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/NotificationGetByIdDto.cs +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/NotificationGetByIdDto.cs @@ -1,10 +1,12 @@ -using System.ComponentModel.DataAnnotations; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; namespace LINGYUN.Abp.MessageService.Notifications { public class NotificationGetByIdDto { [Required] + [DisplayName("Notifications:Id")] public long NotificationId { get; set; } } } diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/NotificationMarkReadStateInput.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/NotificationMarkReadStateInput.cs index 8e28a3c97..1f2bf6675 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/NotificationMarkReadStateInput.cs +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/NotificationMarkReadStateInput.cs @@ -1,4 +1,5 @@ using LINGYUN.Abp.Notifications; +using System.ComponentModel; using System.ComponentModel.DataAnnotations; namespace LINGYUN.Abp.MessageService.Notifications; @@ -6,7 +7,9 @@ namespace LINGYUN.Abp.MessageService.Notifications; public class NotificationMarkReadStateInput { [Required] + [DisplayName("Notifications:Id")] public long[] IdList { get; set; } + [DisplayName("Notifications:State")] public NotificationReadState State { get; set; } } diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/NotificationSendDto.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/NotificationSendDto.cs index a6a9ef506..b7a3ef2d9 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/NotificationSendDto.cs +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/NotificationSendDto.cs @@ -1,6 +1,7 @@ using LINGYUN.Abp.Notifications; using System; using System.Collections.Generic; +using System.ComponentModel; using System.ComponentModel.DataAnnotations; namespace LINGYUN.Abp.MessageService.Notifications @@ -9,17 +10,23 @@ namespace LINGYUN.Abp.MessageService.Notifications { [Required] [StringLength(NotificationConsts.MaxNameLength)] + [DisplayName("Notifications:Name")] public string Name { get; set; } + [DisplayName("Notifications:Data")] public Dictionary Data { get; set; } = new Dictionary(); + [DisplayName("Notifications:Culture")] public string Culture { get; set; } + [DisplayName("Notifications:ToUserId")] public Guid? ToUserId { get; set; } - [StringLength(128)] + [StringLength(128)] + [DisplayName("Notifications:ToUserName")] public string ToUserName { get; set; } + [DisplayName("Notifications:Severity")] public NotificationSeverity Severity { get; set; } = NotificationSeverity.Info; } } diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/UserNotificationChangeReadStateDto.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/UserNotificationChangeReadStateDto.cs index aeb8e5dbe..e287a0c22 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/UserNotificationChangeReadStateDto.cs +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/UserNotificationChangeReadStateDto.cs @@ -1,4 +1,5 @@ using LINGYUN.Abp.Notifications; +using System.ComponentModel; using System.ComponentModel.DataAnnotations; namespace LINGYUN.Abp.MessageService.Notifications @@ -6,9 +7,11 @@ namespace LINGYUN.Abp.MessageService.Notifications public class UserNotificationChangeReadStateDto { [Required] + [DisplayName("Notifications:Id")] public long NotificationId { get; set; } [Required] + [DisplayName("Notifications:State")] public NotificationReadState ReadState { get; set; } = NotificationReadState.Read; } } diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/UserNotificationGetByNameDto.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/UserNotificationGetByNameDto.cs index 127710500..d1e49a1e4 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/UserNotificationGetByNameDto.cs +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/UserNotificationGetByNameDto.cs @@ -1,4 +1,5 @@ -using System.ComponentModel.DataAnnotations; +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; namespace LINGYUN.Abp.MessageService.Notifications { @@ -6,6 +7,7 @@ namespace LINGYUN.Abp.MessageService.Notifications { [Required] [StringLength(NotificationConsts.MaxNameLength)] + [DisplayName("Notifications:Name")] public string NotificationName { get; set; } } } diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/UserNotificationGetByPagedDto.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/UserNotificationGetByPagedDto.cs index 542d59d70..11f7616d3 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/UserNotificationGetByPagedDto.cs +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/UserNotificationGetByPagedDto.cs @@ -1,4 +1,5 @@ using LINGYUN.Abp.Notifications; +using System.ComponentModel; using Volo.Abp.Application.Dtos; namespace LINGYUN.Abp.MessageService.Notifications @@ -7,6 +8,7 @@ namespace LINGYUN.Abp.MessageService.Notifications { public string Filter { get; set; } + [DisplayName("Notifications:State")] public NotificationReadState? ReadState { get; set; } } } diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Subscriptions/Dto/SubscriptionsGetByNameDto.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Subscriptions/Dto/SubscriptionsGetByNameDto.cs index b4ceaad64..7ce9faa91 100644 --- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Subscriptions/Dto/SubscriptionsGetByNameDto.cs +++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Subscriptions/Dto/SubscriptionsGetByNameDto.cs @@ -1,4 +1,5 @@ using LINGYUN.Abp.MessageService.Notifications; +using System.ComponentModel; using System.ComponentModel.DataAnnotations; namespace LINGYUN.Abp.MessageService.Subscriptions @@ -7,6 +8,7 @@ namespace LINGYUN.Abp.MessageService.Subscriptions { [Required] [StringLength(NotificationConsts.MaxNameLength)] + [DisplayName("Notifications:Name")] public string Name { get; set; } } } diff --git a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN/Abp/TextTemplating/Localization/Resources/en.json b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN/Abp/TextTemplating/Localization/Resources/en.json index 0d71289af..d66e03f70 100644 --- a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN/Abp/TextTemplating/Localization/Resources/en.json +++ b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN/Abp/TextTemplating/Localization/Resources/en.json @@ -5,6 +5,11 @@ "Permission:TextTemplates": "Text Templates", "Permission:Create": "Create", "Permission:Edit": "Edit", - "Permission:Delete": "Delete" + "Permission:Delete": "Delete", + "TextTemplates": "Text Templates", + "DisplayName:Name": "Name", + "DisplayName:Culture": "Culture", + "DisplayName:Content": "Content", + "DisplayName:DisplayName": "DisplayName" } } \ No newline at end of file diff --git a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN/Abp/TextTemplating/Localization/Resources/zh-Hans.json b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN/Abp/TextTemplating/Localization/Resources/zh-Hans.json index d15105b05..bdd955a4b 100644 --- a/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN/Abp/TextTemplating/Localization/Resources/zh-Hans.json +++ b/aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN/Abp/TextTemplating/Localization/Resources/zh-Hans.json @@ -5,6 +5,11 @@ "Permission:TextTemplates": "文本模板", "Permission:Create": "新增", "Permission:Edit": "修改", - "Permission:Delete": "删除" + "Permission:Delete": "删除", + "TextTemplates": "文本模板", + "DisplayName:Name": "名称", + "DisplayName:Culture": "区域", + "DisplayName:Content": "内容", + "DisplayName:DisplayName": "显示名称" } } \ No newline at end of file