Browse Source

Merge remote-tracking branch 'origin/rel-10.7' into auto-merge-forward/rel-10.7-to-dev-91

pull/26301/head
github-actions[bot] 1 month ago
parent
commit
aeccbf83e8
  1. 14
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LanguageSwitch.razor
  2. 14
      modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor

14
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.BasicTheme/Themes/Basic/LanguageSwitch.razor

@ -7,17 +7,17 @@
@inject IAbpRequestLocalizationOptionsProvider RequestLocalizationOptionsProvider
@if (_otherLanguages != null && _otherLanguages.Any())
{
<BarDropdown RightAligned="true">
<BarDropdownToggle>
<Dropdown EndAligned="true">
<DropdownToggle Color="Color.Default">
@_currentLanguage.DisplayName
</BarDropdownToggle>
<BarDropdownMenu>
</DropdownToggle>
<DropdownMenu>
@foreach (var language in _otherLanguages)
{
<BarDropdownItem Clicked="() => ChangeLanguage(language)">@language.DisplayName</BarDropdownItem>
<DropdownItem Clicked="() => ChangeLanguage(language)">@language.DisplayName</DropdownItem>
}
</BarDropdownMenu>
</BarDropdown>
</DropdownMenu>
</Dropdown>
}
@code {
private IReadOnlyList<LanguageInfo> _otherLanguages;

14
modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Themes/Basic/LanguageSwitch.razor

@ -12,17 +12,17 @@
@inject IRouteBasedCultureNavigationHelper CultureNavigationHelper
@if (_otherLanguages != null && _otherLanguages.Any())
{
<BarDropdown RightAligned="true">
<BarDropdownToggle>
<Dropdown EndAligned="true">
<DropdownToggle Color="Color.Default">
@_currentLanguage.DisplayName
</BarDropdownToggle>
<BarDropdownMenu>
</DropdownToggle>
<DropdownMenu>
@foreach (var language in _otherLanguages)
{
<BarDropdownItem Clicked="() => ChangeLanguageAsync(language)">@language.DisplayName</BarDropdownItem>
<DropdownItem Clicked="() => ChangeLanguageAsync(language)">@language.DisplayName</DropdownItem>
}
</BarDropdownMenu>
</BarDropdown>
</DropdownMenu>
</Dropdown>
}
@code {
private IReadOnlyList<LanguageInfo> _otherLanguages;

Loading…
Cancel
Save