Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DataGrid: Fix Localization FilterMethods #5475

Merged
merged 1 commit into from
May 5, 2024
Merged

DataGrid: Fix Localization FilterMethods #5475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 12 additions & 0 deletions Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataGridPage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -205,6 +216,7 @@
SelectionMode="@selectionMode"
CommandMode="@commandsMode"
Filterable="@filterable"
FilterMode="@filterMode"
ShowPager="@showPager"
PagerPosition="DataGridPagerPosition.TopAndBottom"
ShowPageSizes="@showPageSizes"
Expand Down
1 change: 1 addition & 0 deletions Demos/Blazorise.Demo/Pages/Tests/DataGrid/DataGridPage.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
27 changes: 26 additions & 1 deletion Source/Extensions/Blazorise.DataGrid/DataGridLocalizers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,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; }

Expand Down Expand Up @@ -133,4 +138,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; }
}
1 change: 1 addition & 0 deletions Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/cs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Delete": "Vymazat",
"Save": "Uložit",
"Cancel": "Zrušit",
"Filter": "Filtr",
"Clear Filter": "Vymazat filtr",
"First": "První",
"Last": "Poslední",
Expand Down
1 change: 1 addition & 0 deletions Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/da.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Delete": "Slet",
"Save": "Gem",
"Cancel": "Annuller",
"Filter": "Filter",
"Clear Filter": "Fjern filter",
"First": "Første",
"Last": "Sidste",
Expand Down
1 change: 1 addition & 0 deletions Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Delete": "Löschen",
"Save": "Speichern",
"Cancel": "Abbrechen",
"Filter": "Filtern",
"Clear Filter": "Filter löschen",
"First": "Anfang",
"Last": "Ende",
Expand Down
1 change: 1 addition & 0 deletions Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Delete": "Delete",
"Save": "Save",
"Cancel": "Cancel",
"Filter": "Filter",
"Clear Filter": "Clear Filter",
"First": "First",
"Last": "Last",
Expand Down
1 change: 1 addition & 0 deletions Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Delete": "Eliminar",
"Save": "Salvar",
"Cancel": "Cancelar",
"Filter": "Filtrar",
"Clear Filter": "Filtro claro",
"First": "Primero",
"Last": "Último",
Expand Down
1 change: 1 addition & 0 deletions Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Delete": "Supprimer",
"Save": "Sauvegarder",
"Cancel": "Annuler",
"Filter": "Filtre",
"Clear Filter": "Supprimer le filtre",
"First": "Premier",
"Last": "Dernier",
Expand Down
1 change: 1 addition & 0 deletions Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/hr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Delete": "Izbriši",
"Save": "Spremi",
"Cancel": "Odustani",
"Filter": "Filtar",
"Clear Filter": "Očisti filter",
"First": "Prva",
"Last": "Zadnja",
Expand Down
1 change: 1 addition & 0 deletions Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/is.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Delete": "Elimina",
"Save": "Salva",
"Cancel": "Annulla",
"Filter": "Filtro",
"Clear Filter": "Pulisci filtro",
"First": "Primo",
"Last": "Ultimo",
Expand Down
1 change: 1 addition & 0 deletions Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/nl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Delete": "Verwijderen",
"Save": "Opslaan",
"Cancel": "Annuleren",
"Filter": "Filter",
"Clear Filter": "Filter legen",
"First": "Eerste",
"Last": "Laatste",
Expand Down
3 changes: 2 additions & 1 deletion Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/pl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Delete": "Usuń",
"Save": "Zapisz",
"Cancel": "Anuluj",
"Filter": "Filtr",
"Clear Filter": "Wyczyść filtr",
"First": "Pierwsza",
"Last": "Ostatnia",
Expand All @@ -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",
Expand Down
1 change: 1 addition & 0 deletions Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/pt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"Save": "Salvar",
"Cancel": "Cancelar",
"Clear Filter": "Limpar filtro",
"Filter": "Filtro",
"First": "Primeiro",
"Last": "Último",
"Prev": "Anterior",
Expand Down
1 change: 1 addition & 0 deletions Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Delete": "Удалить",
"Save": "Сохранить",
"Cancel": "Отменить",
"Filter": "Фильтр",
"Clear Filter": "Очистить фильтры",
"First": "Первая",
"Last": "Последняя",
Expand Down
1 change: 1 addition & 0 deletions Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/sk.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Delete": "Zmazať",
"Save": "Uložiť",
"Cancel": "Zrušiť",
"Filter": "Filter",
"Clear Filter": "Vyčistiť filter",
"First": "Prvá",
"Last": "Posledná",
Expand Down
1 change: 1 addition & 0 deletions Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/tr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Delete": "Sil",
"Save": "Kaydet",
"Cancel": "İptal",
"Filter": "Filtre",
"Clear Filter": "Filtreleri Temizle",
"First": "İlk",
"Last": "Son",
Expand Down
1 change: 1 addition & 0 deletions Source/Extensions/Blazorise.DataGrid/Resources/Localization/DataGrid/zh.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"Delete": "删除",
"Save": "保存",
"Cancel": "取消",
"Filter": "筛选",
"Clear Filter": "清除过滤",
"First": "首页",
"Last": "尾页",
Expand Down
12 changes: 6 additions & 6 deletions Source/Extensions/Blazorise.DataGrid/_DataGridMenuFilter.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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
Expand Down