Browse Source

Merge pull request #18487 from abpframework/TimezoneHelpText

Add `TimezoneHelpText` to timezone setting.
pull/18488/head
Sinan Öztürk 3 years ago
committed by GitHub
parent
commit
8c46ff3700
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/TimeZoneSettingGroup/TimeZoneSettingGroupViewComponent.razor
  2. 1
      modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json
  3. 1
      modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json
  4. 1
      modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json
  5. 1
      modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json
  6. 1
      modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hant.json
  7. 2
      modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/TimeZoneSettingGroup/Default.cshtml

1
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/TimeZoneSettingGroup/TimeZoneSettingGroupViewComponent.razor

@ -15,6 +15,7 @@
<SelectItem Value="item.Value">@item.Name</SelectItem> <SelectItem Value="item.Value">@item.Name</SelectItem>
} }
</Select> </Select>
<div class="form-text">@L["TimezoneHelpText"].Value</div>
</Field> </Field>
</Column> </Column>
</Row> </Row>

1
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/de-DE.json

@ -19,6 +19,7 @@
"Menu:Emailing": "E-Mail", "Menu:Emailing": "E-Mail",
"Menu:TimeZone": "Zeitzone", "Menu:TimeZone": "Zeitzone",
"DisplayName:Timezone": "Zeitzone", "DisplayName:Timezone": "Zeitzone",
"TimezoneHelpText": "Diese Einstellung wird für die Anwendung oder den Mandanten verwendet.",
"SmtpHost": "Host", "SmtpHost": "Host",
"SmtpPort": "Port", "SmtpPort": "Port",
"SmtpUserName": "Benutzername", "SmtpUserName": "Benutzername",

1
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/en.json

@ -19,6 +19,7 @@
"Menu:Emailing": "Emailing", "Menu:Emailing": "Emailing",
"Menu:TimeZone": "Time zone", "Menu:TimeZone": "Time zone",
"DisplayName:Timezone": "Time zone", "DisplayName:Timezone": "Time zone",
"TimezoneHelpText": "This setting is used for application-wide or tenant-based.",
"SmtpHost": "Host", "SmtpHost": "Host",
"SmtpPort": "Port", "SmtpPort": "Port",
"SmtpUserName": "User name", "SmtpUserName": "User name",

1
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/tr.json

@ -19,6 +19,7 @@
"Menu:Emailing": "Email", "Menu:Emailing": "Email",
"Menu:TimeZone": "Zaman dilimi", "Menu:TimeZone": "Zaman dilimi",
"DisplayName:Timezone": "Zaman dilimi", "DisplayName:Timezone": "Zaman dilimi",
"TimezoneHelpText": "Bu ayar uygulama genelinde veya kiracı tabanlı olarak kullanılır.",
"SmtpHost": "Sunucu", "SmtpHost": "Sunucu",
"SmtpPort": "Port", "SmtpPort": "Port",
"SmtpUserName": "Kullanıcı adı", "SmtpUserName": "Kullanıcı adı",

1
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hans.json

@ -19,6 +19,7 @@
"Menu:Emailing": "邮件", "Menu:Emailing": "邮件",
"Menu:TimeZone": "时区", "Menu:TimeZone": "时区",
"DisplayName:Timezone": "时区", "DisplayName:Timezone": "时区",
"TimezoneHelpText": "此设置用于应用程序范围或基于租户.",
"SmtpHost": "主机", "SmtpHost": "主机",
"SmtpPort": "端口", "SmtpPort": "端口",
"SmtpUserName": "用户名", "SmtpUserName": "用户名",

1
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/Localization/Resources/AbpSettingManagement/zh-Hant.json

@ -19,6 +19,7 @@
"Menu:Emailing": "信箱", "Menu:Emailing": "信箱",
"Menu:TimeZone": "時區", "Menu:TimeZone": "時區",
"DisplayName:Timezone": "時區", "DisplayName:Timezone": "時區",
"TimezoneHelpText": "此設置用於應用程序範圍或基於租戶。",
"SmtpHost": "主機", "SmtpHost": "主機",
"SmtpPort": "Port", "SmtpPort": "Port",
"SmtpUserName": "帳號", "SmtpUserName": "帳號",

2
modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/TimeZoneSettingGroup/Default.cshtml

@ -9,7 +9,7 @@
<abp-row> <abp-row>
<abp-column size-md="_12"> <abp-column size-md="_12">
<div> <div>
<abp-select asp-for="Timezone" asp-items="@Model.TimeZoneItems"/> <abp-select asp-for="Timezone" asp-items="@Model.TimeZoneItems" info="@L["TimezoneHelpText"].Value" />
</div> </div>
<div> <div>
<abp-button button-type="Primary" type="submit"> <abp-button button-type="Primary" type="submit">

Loading…
Cancel
Save