From 5c33a9293c53416bba9a3d64a6627d1fe76620ec Mon Sep 17 00:00:00 2001 From: MahdiyarGHD Date: Mon, 29 Jan 2024 22:31:52 +0330 Subject: [PATCH] Change GetLanguage to GetInnerTranslatedByKey & Update core packages --- .../AddOrUpdateCountingUnit.razor | 6 ++-- .../FilterCountingUnitsList.razor | 32 ++++++++--------- .../Pages/Orders/AddOrUpdateOrder.razor | 8 ++--- .../Pages/Orders/FilterOrdersList.razor | 14 ++++---- .../Pages/Products/AddOrUpdateProduct.razor | 16 ++++----- .../Pages/Products/FilterProductsList.razor | 34 +++++++++---------- ...icroservices.UI.Ordering.ViewModels.csproj | 2 +- 7 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/CountingUnits/AddOrUpdateCountingUnit.razor b/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/CountingUnits/AddOrUpdateCountingUnit.razor index bb1294d..7891c1a 100644 --- a/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/CountingUnits/AddOrUpdateCountingUnit.razor +++ b/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/CountingUnits/AddOrUpdateCountingUnit.razor @@ -11,18 +11,18 @@ - + @if (viewModel.IsBusy) { - @viewModel.GetLanguage("Saving") + @viewModel.GetInnerTranslatedByKey("Saving") } else { - @viewModel.GetLanguage("Save") + @viewModel.GetInnerTranslatedByKey("Save") } diff --git a/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/CountingUnits/FilterCountingUnitsList.razor b/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/CountingUnits/FilterCountingUnitsList.razor index e729c35..78c129f 100644 --- a/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/CountingUnits/FilterCountingUnitsList.razor +++ b/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/CountingUnits/FilterCountingUnitsList.razor @@ -15,29 +15,29 @@ - @viewModel.GetLanguage("Ordering_CountingUnit_Title") + @viewModel.GetInnerTranslatedByKey("Ordering_CountingUnit_Title") - @if (viewModel.IsBusy) { - @viewModel.GetLanguage("Processing") + @viewModel.GetInnerTranslatedByKey("Processing") } else { - @viewModel.GetLanguage("Search") + @viewModel.GetInnerTranslatedByKey("Search") } - - - + + + @@ -61,26 +61,26 @@ - @viewModel.GetLanguage("Ordering_DeleteCountingUnit_Title") + @viewModel.GetInnerTranslatedByKey("Ordering_DeleteCountingUnit_Title") - @viewModel.GetLanguage("DeleteQuestion_Content") + @viewModel.GetInnerTranslatedByKey("DeleteQuestion_Content") @if (!viewModel.IsBusy) { - @viewModel.GetLanguage("Cancel") + @viewModel.GetInnerTranslatedByKey("Cancel") } @if (viewModel.IsBusy) { - @viewModel.GetLanguage("Deleting") + @viewModel.GetInnerTranslatedByKey("Deleting") } else { - @viewModel.GetLanguage("Delete") + @viewModel.GetInnerTranslatedByKey("Delete") } @@ -138,16 +138,16 @@ void ShowUpdateDialog(CountingUnitContract countingUnitContract) { - _AddOrUpdateTitle = @viewModel.GetLanguage("Ordering_UpdateCountingUnit_Title"); - _AddOrUpdatedMessage = @viewModel.GetLanguage("Ordering_UpdateCountingUnit_Message"); + _AddOrUpdateTitle = @viewModel.GetInnerTranslatedByKey("Ordering_UpdateCountingUnit_Title"); + _AddOrUpdatedMessage = @viewModel.GetInnerTranslatedByKey("Ordering_UpdateCountingUnit_Message"); addOrUpdateCountingUnitView.ViewModel.UpdateCountingUnitContract = countingUnitContract; ShowAddOrUpdateDialog(); } void ShowAddDialog() { - _AddOrUpdateTitle = @viewModel.GetLanguage("Ordering_AddCountingUnit_Title"); - _AddOrUpdatedMessage = @viewModel.GetLanguage("Ordering_AddCountingUnit_Message"); + _AddOrUpdateTitle = @viewModel.GetInnerTranslatedByKey("Ordering_AddCountingUnit_Title"); + _AddOrUpdatedMessage = @viewModel.GetInnerTranslatedByKey("Ordering_AddCountingUnit_Message"); addOrUpdateCountingUnitView.ViewModel.Clear(); ShowAddOrUpdateDialog(); } diff --git a/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Orders/AddOrUpdateOrder.razor b/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Orders/AddOrUpdateOrder.razor index f3a2078..48f73b3 100644 --- a/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Orders/AddOrUpdateOrder.razor +++ b/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Orders/AddOrUpdateOrder.razor @@ -8,19 +8,19 @@ - - + + @if (viewModel.IsBusy) { - @viewModel.GetLanguage("Saving") + @viewModel.GetInnerTranslatedByKey("Saving") } else { - @viewModel.GetLanguage("Save") + @viewModel.GetInnerTranslatedByKey("Save") } diff --git a/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Orders/FilterOrdersList.razor b/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Orders/FilterOrdersList.razor index 2027c88..113b833 100644 --- a/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Orders/FilterOrdersList.razor +++ b/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Orders/FilterOrdersList.razor @@ -11,27 +11,27 @@ - @viewModel.GetLanguage("Orders") + @viewModel.GetInnerTranslatedByKey("Orders") - @if (viewModel.IsBusy) { - @viewModel.GetLanguage("Processing") + @viewModel.GetInnerTranslatedByKey("Processing") } else { - @viewModel.GetLanguage("Search") + @viewModel.GetInnerTranslatedByKey("Search") } - - - + + + @* *@ diff --git a/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Products/AddOrUpdateProduct.razor b/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Products/AddOrUpdateProduct.razor index 73b0654..bf15caf 100644 --- a/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Products/AddOrUpdateProduct.razor +++ b/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Products/AddOrUpdateProduct.razor @@ -10,20 +10,20 @@ - - - - + + + + @foreach (AmountType item in Enum.GetValues()) { if ((int)item < 6) continue; - @viewModel.GetLanguage($"Ordering_{item.ToString()}_Title") + @viewModel.GetInnerTranslatedByKey($"Ordering_{item.ToString()}_Title") } @if (viewModel.CountingUnits is not null) { - + @foreach (var item in viewModel.CountingUnits) { @item.Name @@ -36,11 +36,11 @@ @if (viewModel.IsBusy) { - @viewModel.GetLanguage("Saving") + @viewModel.GetInnerTranslatedByKey("Saving") } else { - @viewModel.GetLanguage("Save") + @viewModel.GetInnerTranslatedByKey("Save") } diff --git a/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Products/FilterProductsList.razor b/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Products/FilterProductsList.razor index 9ba6335..4e5ef9e 100644 --- a/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Products/FilterProductsList.razor +++ b/src/CSharp/Blazor/EasyMicroservices.UI.Ordering.Blazor/Pages/Products/FilterProductsList.razor @@ -17,26 +17,26 @@ - @if (viewModel.IsBusy) { - @viewModel.GetLanguage("Processing") + @viewModel.GetInnerTranslatedByKey("Processing") } else { - @viewModel.GetLanguage("Search") + @viewModel.GetInnerTranslatedByKey("Search") } - - - - + + + + @* *@ @@ -62,26 +62,26 @@ - @viewModel.GetLanguage("Ordering_DeleteProduct_Title") + @viewModel.GetInnerTranslatedByKey("Ordering_DeleteProduct_Title") - @viewModel.GetLanguage("DeleteQuestion_Content") + @viewModel.GetInnerTranslatedByKey("DeleteQuestion_Content") @if (!viewModel.IsBusy) { - @viewModel.GetLanguage("Cancel") + @viewModel.GetInnerTranslatedByKey("Cancel") } @if (viewModel.IsBusy) { - @viewModel.GetLanguage("Deleting") + @viewModel.GetInnerTranslatedByKey("Deleting") } else { - @viewModel.GetLanguage("Delete") + @viewModel.GetInnerTranslatedByKey("Delete") } @@ -139,16 +139,16 @@ void ShowUpdateDialog(ProductContract productContract) { - _AddOrUpdateTitle = @viewModel.GetLanguage("Ordering_UpdateProduct_Title"); - _AddOrUpdatedMessage = @viewModel.GetLanguage("Ordering_UpdateProduct_Message"); + _AddOrUpdateTitle = @viewModel.GetInnerTranslatedByKey("Ordering_UpdateProduct_Title"); + _AddOrUpdatedMessage = @viewModel.GetInnerTranslatedByKey("Ordering_UpdateProduct_Message"); AddOrUpdateProductView.ViewModel.UpdateProductContract = productContract; ShowAddOrUpdateDialog(); } void ShowAddDialog() { - _AddOrUpdateTitle = @viewModel.GetLanguage("Ordering_AddProduct_Title"); - _AddOrUpdatedMessage = @viewModel.GetLanguage("Ordering_AddProduct_Message"); + _AddOrUpdateTitle = @viewModel.GetInnerTranslatedByKey("Ordering_AddProduct_Title"); + _AddOrUpdatedMessage = @viewModel.GetInnerTranslatedByKey("Ordering_AddProduct_Message"); AddOrUpdateProductView.ViewModel.Clear(); ShowAddOrUpdateDialog(); } @@ -177,7 +177,7 @@ { IsShowDeleteDialog = false; StateHasChanged(); - Snackbar.Add(@viewModel.GetLanguage("Ordering_DeleteProduct_Message"), Severity.Success); + Snackbar.Add(@viewModel.GetInnerTranslatedByKey("Ordering_DeleteProduct_Message"), Severity.Success); }; viewModel.DeleteCommand.Execute(viewModel.SelectedProductContract); } diff --git a/src/CSharp/Cores/EasyMicroservices.UI.Ordering.ViewModels/EasyMicroservices.UI.Ordering.ViewModels.csproj b/src/CSharp/Cores/EasyMicroservices.UI.Ordering.ViewModels/EasyMicroservices.UI.Ordering.ViewModels.csproj index 673651d..6b23735 100644 --- a/src/CSharp/Cores/EasyMicroservices.UI.Ordering.ViewModels/EasyMicroservices.UI.Ordering.ViewModels.csproj +++ b/src/CSharp/Cores/EasyMicroservices.UI.Ordering.ViewModels/EasyMicroservices.UI.Ordering.ViewModels.csproj @@ -20,7 +20,7 @@ - +