Merge branch 'master' of https://github.com/volosoft/abp

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

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

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json

@@ -25,14 +25,23 @@
     "Delete": "Delete",
     "Edit": "Edit",
     "ProcessingWithThreeDot": "Processing...",
+    "LoadingWithThreeDot": "Loading...",
+    "Welcome": "Welcome",
     "Login": "Login",
     "Register": "Register",
     "Logout": "Log out",
     "Submit": "Submit",
     "Back": "Back",
+    "PagerSearch": "Search",
     "PagerNext": "Next",
     "PagerPrevious": "Previous",
-    "PagerInfo": "Showing {0} to {1} of {2} entries.",
+    "PagerFirst": "First",
+    "PagerLast": "Last",
+    "PagerInfo": "Showing _START_ to _END_ of _TOTAL_ entries",
+    "PagerInfoEmpty": "Showing 0 to 0 of 0 entries",
+    "PagerInfoFiltered": "(filtered from _MAX_ total entries)",
+    "NoDataAvailableInDatatable": "No data available in table",
+    "PagerShowMenuEntries": "Show _MENU_ entries",
     "DatatableActionDropdownDefaultText": "Actions",
     "ChangePassword": "Change password",
     "PersonalInfo": "My profile"

framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json

@@ -25,14 +25,23 @@
     "Delete": "Sil",
     "Edit": "Düzenle",
     "ProcessingWithThreeDot": "İşleniyor...",
+    "LoadingWithThreeDot": "Yükleniyor...",
+    "Welcome": "Hoşgeldiniz",
     "Login": "Giriş",
     "Register": "Kaydol",
     "Logout": "Çıkış",
     "Submit": "Gönder",
     "Back": "Geri",
+    "PagerSearch": "Ara",
     "PagerNext": "Sonraki",
     "PagerPrevious": "Önceki",
-    "PagerInfo": "{2} kayıttan {0} ile {1} arası gösteriliyor.",
+    "PagerFirst": "İlk",
+    "PagerLast": "Son",
+    "PagerInfo": "_TOTAL_ kayıttan _START_ ile _END_ arası gösteriliyor.",
+    "PagerInfoEmpty": "0 kayıttan 0 ile 0 arası gösteriliyor.",
+    "PagerInfoFiltered": "(_MAX_ kayıt arasından filtrelendi)",
+    "NoDataAvailableInDatatable": "Tabloda kayır mevcut değil.",
+    "PagerShowMenuEntries": "Sayfada _MENU_ kayıt göster.",
     "DatatableActionDropdownDefaultText": "İşlemler",
     "ChangePassword": "Şifre değiştir",
     "PersonalInfo": "Profilim"