Merge pull request #18488 from abpframework/auto-merge/rel-8-0/2359

Merge branch dev with rel-8.0

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

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

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:TimeZone": "Zeitzone",
     "DisplayName:Timezone": "Zeitzone",
+    "TimezoneHelpText": "Diese Einstellung wird für die Anwendung oder den Mandanten verwendet.",
     "SmtpHost": "Host",
     "SmtpPort": "Port",
     "SmtpUserName": "Benutzername",

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:TimeZone": "Time zone",
     "DisplayName:Timezone": "Time zone",
+    "TimezoneHelpText": "This setting is used for application-wide or tenant-based.",
     "SmtpHost": "Host",
     "SmtpPort": "Port",
     "SmtpUserName": "User name",

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:TimeZone": "Zaman dilimi",
     "DisplayName:Timezone": "Zaman dilimi",
+    "TimezoneHelpText": "Bu ayar uygulama genelinde veya kiracı tabanlı olarak kullanılır.",
     "SmtpHost": "Sunucu",
     "SmtpPort": "Port",
     "SmtpUserName": "Kullanıcı adı",

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:TimeZone": "时区",
     "DisplayName:Timezone": "时区",
+    "TimezoneHelpText": "此设置用于应用程序范围或基于租户.",
     "SmtpHost": "主机",
     "SmtpPort": "端口",
     "SmtpUserName": "用户名",

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:TimeZone": "時區",
     "DisplayName:Timezone": "時區",
+    "TimezoneHelpText": "此設置用於應用程序範圍或基於租戶。",
     "SmtpHost": "主機",
     "SmtpPort": "Port",
     "SmtpUserName": "帳號",

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

@@ -9,7 +9,7 @@
     <abp-row>
         <abp-column size-md="_12">
             <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>
                 <abp-button button-type="Primary" type="submit">