Browse Source

Merge pull request #607 from colinin/add-missing-localizer-text

fix: add missing localizer text.
pull/645/head
yx lin 4 years ago
committed by GitHub
parent
commit
c04d65eead
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN/Abp/Notifications/Localization/Resources/en.json
  2. 10
      aspnet-core/modules/common/LINGYUN.Abp.Notifications/LINGYUN/Abp/Notifications/Localization/Resources/zh-Hans.json
  3. 4
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/NotificationGetByIdDto.cs
  4. 3
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/NotificationMarkReadStateInput.cs
  5. 9
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/NotificationSendDto.cs
  6. 3
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/UserNotificationChangeReadStateDto.cs
  7. 4
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/UserNotificationGetByNameDto.cs
  8. 2
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Notifications/Dto/UserNotificationGetByPagedDto.cs
  9. 2
      aspnet-core/modules/message/LINGYUN.Abp.MessageService.Application.Contracts/LINGYUN/Abp/MessageService/Subscriptions/Dto/SubscriptionsGetByNameDto.cs
  10. 7
      aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN/Abp/TextTemplating/Localization/Resources/en.json
  11. 7
      aspnet-core/modules/text-templating/LINGYUN.Abp.TextTemplating.Domain.Shared/LINGYUN/Abp/TextTemplating/Localization/Resources/zh-Hans.json

10
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",

10
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": "用户",

4
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; }
}
}

3
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; }
}

9
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<string, object> Data { get; set; } = new Dictionary<string, object>();
[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;
}
}

3
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;
}
}

4
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; }
}
}

2
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; }
}
}

2
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; }
}
}

7
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"
}
}

7
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": "显示名称"
}
}
Loading…
Cancel
Save