Fix Localization of Datagrid FilterMethods

- Remove hardcoded "Filter" and "Clear Filter" localizations - Add custom localizers for GreaterThan, GreaterThanOrEqual, LessThan, LessThanOrEqual - Fix localization resource name of GreaterThanOrEqual and LessThanOrEqual - Add FilterMode to DataGrid demo for easier testing
Megabit · Apr 23, 2024 · 44e5561 · 44e5561
1 parent 6c45280
commit 44e5561
Show file tree

Hide file tree

Showing 20 changed files with 65 additions and 9 deletions.
diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataGridPage.razor b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataGridPage.razor
@@ -64,7 +64,7 @@
                             </Field>
                             <Field>
                                 <FieldLabel>
-                                    <Tooltip Text="Defines if DataGrid can be filtered through the column headers.">
+                                    <Tooltip Text="Defines if DataGrid can be filtered.">
                                         <Icon Name="IconName.QuestionCircle" />
                                     </Tooltip>
                                 </FieldLabel>
@@ -175,6 +175,17 @@
                                     </Select>
                                 </FieldBody>
                             </Field>
+                            <Field>
+                                <FieldLabel>
+                                    Filter mode
+                                </FieldLabel>
+                                <FieldBody>
+                                    <Select @bind-SelectedValue="@filterMode">
+                                        <SelectItem Value="@DataGridFilterMode.Default">Default</SelectItem>
+                                        <SelectItem Value="@DataGridFilterMode.Menu">Menu</SelectItem>
+                                    </Select>
+                                </FieldBody>
+                            </Field>
                             <Field>
                                 <FieldLabel>
                                     Custom Search
@@ -205,6 +216,7 @@
                           SelectionMode="@selectionMode"
                           CommandMode="@commandsMode"
                           Filterable="@filterable"
+                          FilterMode="@filterMode"
                           ShowPager="@showPager"
                           PagerPosition="DataGridPagerPosition.TopAndBottom"
                           ShowPageSizes="@showPageSizes"

diff --git a/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataGridPage.razor.cs b/Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataGridPage.razor.cs
@@ -23,6 +23,7 @@ public partial class DataGridPage
     private DataGridSelectionMode selectionMode = DataGridSelectionMode.Single;
     private DataGridCommandMode commandsMode = DataGridCommandMode.Commands;
     private TableResizeMode resizableMode = TableResizeMode.Header;
+    private DataGridFilterMode filterMode = DataGridFilterMode.Default;
 
     private DataGrid<Employee> dataGrid;
     public int currentPage { get; set; } = 1;

diff --git a/Source/Extensions/Blazorise.DataGrid/DataGridLocalizers.cs b/Source/Extensions/Blazorise.DataGrid/DataGridLocalizers.cs
@@ -1,5 +1,7 @@
 #region Using directives
+
 using Blazorise.Localization;
+
 #endregion
 
 namespace Blazorise.DataGrid;
@@ -45,7 +47,12 @@ public class DataGridLocalizers
     public TextLocalizerHandler CancelButtonLocalizer { get; set; }
 
     /// <summary>
-    /// Custom localization handler for 'clear filter' button text.
+    /// Custom localization handler for 'Filter' button text.
+    /// </summary>
+    public TextLocalizerHandler FilterButtonLocalizer { get; set; }
+
+    /// <summary>
+    /// Custom localization handler for 'Clear Filter' button text.
     /// </summary>
     public TextLocalizerHandler ClearFilterButtonLocalizer { get; set; }
 
@@ -133,4 +140,24 @@ public class DataGridLocalizers
     /// Custom localization handler for FilterMethod 'Not Equals' text.
     /// </summary>
     public TextLocalizerHandler FilterMethodNotEqualsLocalizer { get; set; }
+
+    /// <summary>
+    /// Custom localization handler for FilterMethod 'Greater Than' text.
+    /// </summary>
+    public TextLocalizerHandler FilterMethodGreaterThanLocalizer { get; set; }
+
+    /// <summary>
+    /// Custom localization handler for FilterMethod 'Greater Than or Equal' text.
+    /// </summary>
+    public TextLocalizerHandler FilterMethodGreaterThanOrEqualLocalizer { get; set; }
+
+    /// <summary>
+    /// Custom localization handler for FilterMethod 'Less Than' text.
+    /// </summary>
+    public TextLocalizerHandler FilterMethodLessThanLocalizer { get; set; }
+
+    /// <summary>
+    /// Custom localization handler for FilterMethod 'Less Than or Equal' text.
+    /// </summary>
+    public TextLocalizerHandler FilterMethodLessThanOrEqualLocalizer { get; set; }
 }
diff --git a/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/cs.json b/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/cs.json
@@ -6,6 +6,7 @@
     "Delete": "Vymazat",
     "Save": "Uložit",
     "Cancel": "Zrušit",
+    "Filter": "Filtr",
     "Clear Filter": "Vymazat filtr",
     "First": "První",
     "Last": "Poslední",

diff --git a/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/da.json b/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/da.json
@@ -6,6 +6,7 @@
     "Delete": "Slet",
     "Save": "Gem",
     "Cancel": "Annuller",
+    "Filter": "Filter",
     "Clear Filter": "Fjern filter",
     "First": "Første",
     "Last": "Sidste",

diff --git a/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/de.json b/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/de.json
@@ -6,6 +6,7 @@
     "Delete": "Löschen",
     "Save": "Speichern",
     "Cancel": "Abbrechen",
+    "Filter": "Filtern",
     "Clear Filter": "Filter löschen",
     "First": "Anfang",
     "Last": "Ende",

diff --git a/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/en.json b/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/en.json
@@ -6,6 +6,7 @@
     "Delete": "Delete",
     "Save": "Save",
     "Cancel": "Cancel",
+    "Filter": "Filter",
     "Clear Filter": "Clear Filter",
     "First": "First",
     "Last": "Last",

diff --git a/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/es.json b/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/es.json
@@ -6,6 +6,7 @@
     "Delete": "Eliminar",
     "Save": "Salvar",
     "Cancel": "Cancelar",
+    "Filter": "Filtrar",
     "Clear Filter": "Filtro claro",
     "First": "Primero",
     "Last": "Último",

diff --git a/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/fr.json b/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/fr.json
@@ -6,6 +6,7 @@
     "Delete": "Supprimer",
     "Save": "Sauvegarder",
     "Cancel": "Annuler",
+    "Filter": "Filtre",
     "Clear Filter": "Supprimer le filtre",
     "First": "Premier",
     "Last": "Dernier",

diff --git a/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/hr.json b/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/hr.json
@@ -6,6 +6,7 @@
     "Delete": "Izbriši",
     "Save": "Spremi",
     "Cancel": "Odustani",
+    "Filter": "Filtar",
     "Clear Filter": "Očisti filter",
     "First": "Prva",
     "Last": "Zadnja",

diff --git a/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/is.json b/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/is.json
@@ -6,6 +6,7 @@
     "Delete": "Eyða",
     "Save": "Vista",
     "Cancel": "Hætta við",
+    "Filter": "Sía",
     "Clear Filter": "Hreinsa síu",
     "First": "Fyrsta",
     "Last": "Síðasta",

diff --git a/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/it.json b/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/it.json
@@ -6,6 +6,7 @@
     "Delete": "Elimina",
     "Save": "Salva",
     "Cancel": "Annulla",
+    "Filter": "Filtro",
     "Clear Filter": "Pulisci filtro",
     "First": "Primo",
     "Last": "Ultimo",

diff --git a/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/nl.json b/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/nl.json
@@ -6,6 +6,7 @@
     "Delete": "Verwijderen",
     "Save": "Opslaan",
     "Cancel": "Annuleren",
+    "Filter": "Filter",
     "Clear Filter": "Filter legen",
     "First": "Eerste",
     "Last": "Laatste",

diff --git a/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/pl.json b/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/pl.json
@@ -6,6 +6,7 @@
     "Delete": "Usuń",
     "Save": "Zapisz",
     "Cancel": "Anuluj",
+    "Filter": "Filtr",
     "Clear Filter": "Wyczyść filtr",
     "First": "Pierwsza",
     "Last": "Ostatnia",
@@ -21,7 +22,7 @@
     "Contains": "Zawiera",
     "Starts With": "Zaczynać z",
     "Ends With": "Kończy się na",
-    "Equals": "EqualsRówna się",
+    "Equals": "Równa się",
     "Not Equals": "Nie równe",
     "Greater Than": "Lepszy niż",
     "Greater Than or Equal": "Większe lub równe",

diff --git a/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/pt.json b/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/pt.json
@@ -7,6 +7,7 @@
     "Save": "Salvar",
     "Cancel": "Cancelar",
     "Clear Filter": "Limpar filtro",
+    "Filter": "Filtro",
     "First": "Primeiro",
     "Last": "Último",
     "Prev": "Anterior",

diff --git a/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/ru.json b/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/ru.json
@@ -6,6 +6,7 @@
     "Delete": "Удалить",
     "Save": "Сохранить",
     "Cancel": "Отменить",
+    "Filter": "Фильтр",
     "Clear Filter": "Очистить фильтры",
     "First": "Первая",
     "Last": "Последняя",

diff --git a/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/sk.json b/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/sk.json
@@ -6,6 +6,7 @@
     "Delete": "Zmazať",
     "Save": "Uložiť",
     "Cancel": "Zrušiť",
+    "Filter": "Filter",
     "Clear Filter": "Vyčistiť filter",
     "First": "Prvá",
     "Last": "Posledná",

diff --git a/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/tr.json b/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/tr.json
@@ -6,6 +6,7 @@
     "Delete": "Sil",
     "Save": "Kaydet",
     "Cancel": "İptal",
+    "Filter": "Filtre",
     "Clear Filter": "Filtreleri Temizle",
     "First": "İlk",
     "Last": "Son",

diff --git a/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/zh.json b/Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/zh.json
@@ -6,6 +6,7 @@
     "Delete": "删除",
     "Save": "保存",
     "Cancel": "取消",
+    "Filter": "筛选",
     "Clear Filter": "清除过滤",
     "First": "首页",
     "Last": "尾页",

diff --git a/Source/Extensions/Blazorise.DataGrid/_DataGridMenuFilter.razor b/Source/Extensions/Blazorise.DataGrid/_DataGridMenuFilter.razor
@@ -25,10 +25,10 @@
                             <SelectItem TValue="DataGridColumnFilterMethod" Value="@DataGridColumnFilterMethod.NotEquals">@Localizer.Localize( ParentDataGrid.Localizers?.FilterMethodNotEqualsLocalizer, "Not Equals" )</SelectItem>
                             @if ( isNumericOrDate )
                             {
-                                <SelectItem TValue="DataGridColumnFilterMethod" Value="@DataGridColumnFilterMethod.GreaterThan">@Localizer.Localize( ParentDataGrid.Localizers?.FilterMethodContainsLocalizer, "Greater Than" )</SelectItem>
-                                <SelectItem TValue="DataGridColumnFilterMethod" Value="@DataGridColumnFilterMethod.GreaterThanOrEqual">@Localizer.Localize( ParentDataGrid.Localizers?.FilterMethodContainsLocalizer, "Greater Than Or Equal" )</SelectItem>
-                                <SelectItem TValue="DataGridColumnFilterMethod" Value="@DataGridColumnFilterMethod.LessThan">@Localizer.Localize( ParentDataGrid.Localizers?.FilterMethodContainsLocalizer, "Less Than" )</SelectItem>
-                                <SelectItem TValue="DataGridColumnFilterMethod" Value="@DataGridColumnFilterMethod.LessThanOrEqual">@Localizer.Localize( ParentDataGrid.Localizers?.FilterMethodContainsLocalizer, "Less Than Or Equal" )</SelectItem>
+                                <SelectItem TValue="DataGridColumnFilterMethod" Value="@DataGridColumnFilterMethod.GreaterThan">@Localizer.Localize( ParentDataGrid.Localizers?.FilterMethodGreaterThanLocalizer, "Greater Than" )</SelectItem>
+                                <SelectItem TValue="DataGridColumnFilterMethod" Value="@DataGridColumnFilterMethod.GreaterThanOrEqual">@Localizer.Localize( ParentDataGrid.Localizers?.FilterMethodGreaterThanOrEqualLocalizer, "Greater Than or Equal" )</SelectItem>
+                                <SelectItem TValue="DataGridColumnFilterMethod" Value="@DataGridColumnFilterMethod.LessThan">@Localizer.Localize( ParentDataGrid.Localizers?.FilterMethodLessThanLocalizer, "Less Than" )</SelectItem>
+                                <SelectItem TValue="DataGridColumnFilterMethod" Value="@DataGridColumnFilterMethod.LessThanOrEqual">@Localizer.Localize( ParentDataGrid.Localizers?.FilterMethodLessThanOrEqualLocalizer, "Less Than or Equal" )</SelectItem>
                             }
                         </Select>
                     </Field>
@@ -39,8 +39,8 @@
                     </Field>
                 </Column>
                 <Column ColumnSize="ColumnSize.Is12" Flex="Flex.JustifyContent.End.AlignItems.Center" Gap="Gap.Is2">
-                    <Button Clicked="@ParentDataGrid.FilterData" Color="Color.Primary">Filter</Button>
-                    <Button Clicked="@(() => ParentDataGrid.ClearFilter(Column.Field))" Color="Color.Light">Clear</Button>
+                    <Button Clicked="@ParentDataGrid.FilterData" Color="Color.Primary">@Localizer.Localize( ParentDataGrid.Localizers?.FilterButtonLocalizer, "Filter" )</Button>
+                    <Button Clicked="@(() => ParentDataGrid.ClearFilter(Column.Field))" Color="Color.Light">@Localizer.Localize( ParentDataGrid.Localizers?.ClearFilterButtonLocalizer, "Clear Filter" )</Button>
                 </Column>
             }
             else