Browse Source

Merge pull request #4399 from abpframework/liangshiwei/patch-1

Fix datatables-entensions.js localized bug
pull/4420/head
maliming 6 years ago
committed by GitHub
parent
commit
0653da3942
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 34
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js

34
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js

@ -304,7 +304,7 @@
} }
} }
configuration.language = datatables.defaultConfigurations.language; configuration.language = datatables.defaultConfigurations.language();
if(configuration.dom){ if(configuration.dom){
configuration.dom += datatables.defaultConfigurations.dom; configuration.dom += datatables.defaultConfigurations.dom;
@ -352,21 +352,23 @@
datatables.defaultConfigurations.scrollX = true; datatables.defaultConfigurations.scrollX = true;
datatables.defaultConfigurations.language = { datatables.defaultConfigurations.language = function () {
info: localize("PagerInfo"), return {
infoFiltered: localize("PagerInfoFiltered"), info: localize("PagerInfo"),
infoEmpty: localize("PagerInfoEmpty"), infoFiltered: localize("PagerInfoFiltered"),
search: localize("PagerSearch"), infoEmpty: localize("PagerInfoEmpty"),
processing: localize("ProcessingWithThreeDot"), search: localize("PagerSearch"),
loadingRecords: localize("LoadingWithThreeDot"), processing: localize("ProcessingWithThreeDot"),
lengthMenu: localize("PagerShowMenuEntries"), loadingRecords: localize("LoadingWithThreeDot"),
emptyTable: localize("NoDataAvailableInDatatable"), lengthMenu: localize("PagerShowMenuEntries"),
paginate: { emptyTable: localize("NoDataAvailableInDatatable"),
first: localize("PagerFirst"), paginate: {
last: localize("PagerLast"), first: localize("PagerFirst"),
previous: localize("PagerPrevious"), last: localize("PagerLast"),
next: localize("PagerNext") previous: localize("PagerPrevious"),
} next: localize("PagerNext")
}
};
}; };
datatables.defaultConfigurations.dom = '<"dataTable_filters"f>rt<"row dataTable_footer"<"col-auto"l><"col-auto"i><"col"p>>'; datatables.defaultConfigurations.dom = '<"dataTable_filters"f>rt<"row dataTable_footer"<"col-auto"l><"col-auto"i><"col"p>>';

Loading…
Cancel
Save