From 16e01fa3dbd8a341b055b95a33af306baac19142 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Mon, 13 Apr 2020 12:07:10 +0300
Subject: [PATCH] fix: Localization error for PagerInfo on Volo.Abp.UI

resolves https://github.com/abpframework/abp/issues/3277
---
 .../TagHelpers/Pagination/AbpPaginationTagHelperService.cs      | 2 +-
 framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json  | 1 +
 framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json  | 1 +
 framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json  | 1 +
 framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json  | 1 +
 framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pl.json  | 1 +
 .../src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json     | 1 +
 framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sl.json  | 1 +
 framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json  | 1 +
 framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/vi.json  | 1 +
 .../src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hans.json   | 1 +
 .../src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hant.json   | 1 +
 12 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Pagination/AbpPaginationTagHelperService.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Pagination/AbpPaginationTagHelperService.cs
index 25307c3fee..2ab9ccef96 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Pagination/AbpPaginationTagHelperService.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Pagination/AbpPaginationTagHelperService.cs
@@ -155,7 +155,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Pagination
             var localizer = _tagHelperLocalizer.GetLocalizer(typeof(AbpUiResource));
 
             var pagerInfo = (TagHelper.ShowInfo ?? false) ?
-                "    <div class=\"col-sm-12 col-md-5\"> " + localizer["PagerInfo", TagHelper.Model.ShowingFrom, TagHelper.Model.ShowingTo, TagHelper.Model.TotalItemsCount] + "</div>\r\n"
+                "    <div class=\"col-sm-12 col-md-5\"> " + localizer["PagerInfo{0}{1}{2}", TagHelper.Model.ShowingFrom, TagHelper.Model.ShowingTo, TagHelper.Model.TotalItemsCount] + "</div>\r\n"
                 : "";
 
             return
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json
index 3fb22139b7..8fdc29ad8c 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/ar.json
@@ -43,6 +43,7 @@
     "PagerFirst": "الأول",
     "PagerLast": "الاخير",
     "PagerInfo": "عرض _START_ الي _END_ من _TOTAL_ إدخالات",
+    "PagerInfo{0}{1}{2}": "عرض {0} الي {1} من {2} إدخالات",
     "PagerInfoEmpty": "عرض 0 الي 0 من 0 إدخالات",
     "PagerInfoFiltered": "(تمت تصفيته من _MAX_ مجموع الإدخالات)",
     "NoDataAvailableInDatatable": "لا توجد بيانات متاحة في الجدول",
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json
index 28c9a5e33f..3fba79a2b3 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/cs.json
@@ -39,6 +39,7 @@
     "PagerFirst": "První",
     "PagerLast": "Poslední",
     "PagerInfo": "Zobrazeno od _START_ do _END_ z celkem _TOTAL_ záznamů",
+    "PagerInfo{0}{1}{2}": "Zobrazeno od {0} do {1} z celkem {2} záznamů",
     "PagerInfoEmpty": "Zobrazeno od 0 do 0 z celkem 0 záznamů",
     "PagerInfoFiltered": "(filtrováno ze všech _MAX_ záznamů)",
     "NoDataAvailableInDatatable": "V tabulce nejsou žádná data",
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json
index e2547eb67a..77e3e37570 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json
@@ -43,6 +43,7 @@
     "PagerFirst": "First",
     "PagerLast": "Last",
     "PagerInfo": "Showing _START_ to _END_ of _TOTAL_ entries",
+    "PagerInfo{0}{1}{2}": "Showing {0} to {1} of {2} entries",
     "PagerInfoEmpty": "Showing 0 to 0 of 0 entries",
     "PagerInfoFiltered": "(filtered from _MAX_ total entries)",
     "NoDataAvailableInDatatable": "No data available",
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json
index 4997156c8d..b52c56510b 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/es.json
@@ -39,6 +39,7 @@
     "PagerFirst": "Primero",
     "PagerLast": "�ltimo",
     "PagerInfo": "Mostrando desde _START_ hasta _END_ total _TOTAL_",
+    "PagerInfo{0}{1}{2}": "Mostrando desde {0} hasta {1} total {2}",
     "PagerInfoEmpty": "Mostrando desde 0 hasta 0 de 0 registros",
     "PagerInfoFiltered": "(filtrado de un total de _MAX_ registros)",
     "NoDataAvailableInDatatable": "No hay datos",
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pl.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pl.json
index 5f369760a1..cdaf556168 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pl.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pl.json
@@ -39,6 +39,7 @@
     "PagerFirst": "Pierwsza",
     "PagerLast": "Ostatnia",
     "PagerInfo": "Pokaż od _START_ do _END_ z _TOTAL_ rekordów",
+    "PagerInfo{0}{1}{2}": "Pokaż od {0} do {1} z {2} rekordów",
     "PagerInfoEmpty": "Pokaż od 0 do 0 z 0 rekordów",
     "PagerInfoFiltered": "(filtruj od _MAX_ wszystkich rekordów)",
     "NoDataAvailableInDatatable": "Nie znaleziono danych w tabeli",
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json
index 34682c9d28..6966b565c2 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/pt-BR.json
@@ -39,6 +39,7 @@
     "PagerFirst": "Primeira",
     "PagerLast": "Última",
     "PagerInfo": "Mostrando _START_ até _END_ de _TOTAL_ registros",
+    "PagerInfo{0}{1}{2}": "Mostrando {0} até {1} de {2} registros",
     "PagerInfoEmpty": "Mostrando 0 até 0 de 0 registros",
     "PagerInfoFiltered": "(filtrado de um total de _MAX_ registros)",
     "NoDataAvailableInDatatable": "Nenhum dado disponível",
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sl.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sl.json
index 641de8a242..7fffcb73c6 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sl.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/sl.json
@@ -43,6 +43,7 @@
     "PagerFirst": "Prva",
     "PagerLast": "Zadnja",
     "PagerInfo": "Prikazanih _START_ do _END_ od _TOTAL_ zapisov",
+    "PagerInfo{0}{1}{2}": "Prikazanih {0} do {1} od {2} zapisov",
     "PagerInfoEmpty": "Prikazanih 0 do 0 od 0 zapisov",
     "PagerInfoFiltered": "(filtrirano od vseh _MAX_ zapisov)",
     "NoDataAvailableInDatatable": "V tabeli ni na voljo podatkov",
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json
index 4fe44a40c6..1369491bc4 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json
@@ -43,6 +43,7 @@
     "PagerFirst": "İlk",
     "PagerLast": "Son",
     "PagerInfo": "_TOTAL_ kayıttan _START_ ile _END_ arası gösteriliyor.",
+    "PagerInfo{0}{1}{2}": "{2} kayıttan {0} ile {1} arası gösteriliyor.",
     "PagerInfoEmpty": "0 kayıttan 0 ile 0 arası gösteriliyor.",
     "PagerInfoFiltered": "(_MAX_ kayıt arasından filtrelendi)",
     "NoDataAvailableInDatatable": "Tabloda kayıt mevcut değil.",
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/vi.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/vi.json
index 21a466ccda..00f6c8f195 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/vi.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/vi.json
@@ -39,6 +39,7 @@
     "PagerFirst": "Trang đầu",
     "PagerLast": "Trang cuối",
     "PagerInfo": "Hiển thị từ _START_ đến _END_ trong _TOTAL_ mục",
+    "PagerInfo{0}{1}{2}": "Hiển thị từ {0} đến {1} trong {2} mục",
     "PagerInfoEmpty": "Hiển thị từ 0 đến 0 trong 0 mục",
     "PagerInfoFiltered": "(được lọc từ tổng số _MAX_ mục)",
     "NoDataAvailableInDatatable": "Không có dữ liệu trong bảng",
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hans.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hans.json
index d71cac388c..d1d6aa1b81 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hans.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hans.json
@@ -40,6 +40,7 @@
     "PagerFirst": "首页",
     "PagerLast": "尾页",
     "PagerInfo": "显示 _TOTAL_ 个条目中的 _START_ 到 _END_ 个.",
+    "PagerInfo{0}{1}{2}": "显示 {2} 个条目中的 {0} 到 {1} 个.",
     "PagerInfoEmpty": "显示0个条目中的0到0",
     "PagerInfoFiltered": "(从 _MAX_ 总条目中过滤掉)",
     "NoDataAvailableInDatatable": "表中没有数据",
diff --git a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hant.json b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hant.json
index d19dc7cbc6..7839409b4c 100644
--- a/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hant.json
+++ b/framework/src/Volo.Abp.UI/Localization/Resources/AbpUi/zh-Hant.json
@@ -39,6 +39,7 @@
     "PagerFirst": "首頁",
     "PagerLast": "末頁",
     "PagerInfo": "顯示 _TOTAL_ 個紀錄的 _START_ 到 _END_ 個.",
+    "PagerInfo{0}{1}{2}": "顯示 {2} 個紀錄的 {0} 到 {1} 個.",
     "PagerInfoEmpty": "顯示0個紀錄中的0到0",
     "PagerInfoFiltered": "(從 _MAX_ 所有紀錄中過濾掉)",
     "NoDataAvailableInDatatable": "資料表中沒有資料",