Resolved #73: Filter active languages on language switch areas.

Author: hikalkan

angular/src/account/layout/account-languages.component.ts

@@ -1,6 +1,8 @@
 import { Component, OnInit, Injector } from '@angular/core';
 import { AppComponentBase } from '@shared/app-component-base';
 
+import * as _ from 'lodash';
+
 @Component({
     selector: 'account-languages',
     templateUrl: './account-languages.component.html',
@@ -15,11 +17,12 @@ export class AccountLanguagesComponent extends AppComponentBase implements OnIni
 
     constructor(
         injector: Injector
-    ) { 
+    ) {
         super(injector);
     }
 
     ngOnInit() {
+        this.languages = _.filter(this.localization.languages, l => !l.isDisabled);
         this.languages = this.localization.languages;
         this.currentLanguage = this.localization.currentLanguage;
     }

angular/src/app/layout/topbar-languageswitch.component.ts

@@ -1,6 +1,8 @@
 import { Component, OnInit, Injector, ViewEncapsulation } from '@angular/core';
 import { AppComponentBase } from '@shared/app-component-base';
 
+import * as _ from 'lodash';
+
 @Component({
   templateUrl: './topbar-languageswitch.component.html',
   selector: 'topbar-languageswitch',
@@ -18,7 +20,7 @@ export class TopBarLanguageSwitchComponent extends AppComponentBase implements O
   }
 
   ngOnInit() {
-    this.languages = this.localization.languages;
+    this.languages = _.filter(this.localization.languages, l => !l.isDisabled);
     this.currentLanguage = this.localization.currentLanguage;
   }
 

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/AccountLanguages/AccountLanguagesViewComponent.cs

@@ -19,7 +19,7 @@ public Task<IViewComponentResult> InvokeAsync()
             var model = new LanguageSelectionViewModel
             {
                 CurrentLanguage = _languageManager.CurrentLanguage,
-                Languages = _languageManager.GetLanguages()
+                Languages = _languageManager.GetLanguages().Where(l => !l.IsDisabled).ToList()
                 .Where(l => !l.IsDisabled)
                 .ToList(),
                 CurrentUrl = Request.Path

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/TopBarLanguageSwitch/TopBarLanguageSwitchViewComponent.cs

@@ -1,4 +1,5 @@
-using Abp.Localization;
+using System.Linq;
+using Abp.Localization;
 using Microsoft.AspNetCore.Mvc;
 
 namespace AbpCompanyName.AbpProjectName.Web.Views.Shared.Components.TopBarLanguageSwitch
@@ -17,7 +18,7 @@ public IViewComponentResult Invoke()
             var model = new TopBarLanguageSwitchViewModel
             {
                 CurrentLanguage = _languageManager.CurrentLanguage,
-                Languages = _languageManager.GetLanguages()
+                Languages = _languageManager.GetLanguages().Where(l => !l.IsDisabled).ToList()
             };
 
             return View(model);