diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs index f1424a416a..50675e6e07 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs +++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs @@ -56,7 +56,7 @@ namespace AbpDesk.Web.Mvc //services.Configure(configuration); //Needed when we use Volo.Abp.Identity.HttpApi.Client - services.AddMvc(); + services.AddMvc().AddViewLocalization(); //TODO: Move to AbpAspNetCoreMvcModule! services.AddAssemblyOf(); diff --git a/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/Index.cshtml b/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/Index.cshtml index 147f7fd546..49ec8cbb0c 100644 --- a/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/Index.cshtml +++ b/src/Volo.Abp.Identity.Web/Areas/Identity/Views/Users/Index.cshtml @@ -1,6 +1,6 @@ -@using Microsoft.Extensions.Localization +@using Microsoft.AspNetCore.Mvc.Localization @using Volo.Abp.Identity.Web.Areas.Identity.Localization.Resource -@inject IStringLocalizer Localizer +@inject IHtmlLocalizer L @section styles { @@ -15,12 +15,12 @@
-

@Localizer["Users"]

+

@L["Users"]

@@ -28,10 +28,10 @@ - - - - + + + +
@Localizer["Actions"]@Localizer["UserName"]@Localizer["EmailAddress"]@Localizer["PhoneNumber"]@L["Actions"]@L["UserName"]@L["EmailAddress"]@L["PhoneNumber"]
diff --git a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js index bf314ed1c9..adbd86dc69 100644 --- a/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js +++ b/src/Volo.Abp.Identity.Web/wwwroot/modules/identity/views/users/index.js @@ -164,19 +164,20 @@ $.fn.serializeFormToObject = function () { var currentLanguage = 'English'; //TODO: Get from current culture! - $.extend(true, $.fn.dataTable.defaults, { - language: { - url: '/modules/identity/libs/datatables/localizations/' + currentLanguage + '.json' - }, - lengthMenu: [5, 10, 25, 50, 100, 250, 500], - pageLength: 10, - paging: true, - serverSide: true, - processing: true, - responsive: true, - pagingType: "bootstrap_full_number", - dom: 'rt<"bottom"ilp><"clear">', - order: [] - }); + //TODO: This does not work! + //$.extend(true, $.fn.dataTable.defaults, { + // language: { + // url: '/modules/identity/libs/datatables/localizations/' + currentLanguage + '.json' + // }, + // lengthMenu: [5, 10, 25, 50, 100, 250, 500], + // pageLength: 10, + // paging: true, + // serverSide: true, + // processing: true, + // responsive: true, + // pagingType: "bootstrap_full_number", + // dom: 'rt<"bottom"ilp><"clear">', + // order: [] + //}); })(jQuery); \ No newline at end of file