Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

Minor improvements for migration process / add update resource string for version 2.0

KrzysztofPajakf0601ad009f7
diff --git a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.cs b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.cs
index f7b6a4ac2..7321fab25 100644
--- a/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.cs
+++ b/src/Business/Grand.Business.System/Services/Migrations/1.1/MigrationUpdateResourceString.cs
@@ -1,10 +1,5 @@
-using Grand.Business.Common.Interfaces.Localization;
-using Grand.Business.Common.Interfaces.Logging;
-using Grand.Domain.Data;
-using Grand.Domain.Localization;
+using Grand.Domain.Data;
using Grand.Infrastructure.Migrations;
-using Grand.SharedKernel.Extensions;
-using Microsoft.Extensions.DependencyInjection;
namespace Grand.Business.System.Services.Migrations._1._1
{
@@ -23,26 +18,7 @@ namespace Grand.Business.System.Services.Migrations._1._1
/// <returns></returns>
public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
{
- var langRepository = serviceProvider.GetRequiredService<IRepository<Language>>();
- var logService = serviceProvider.GetRequiredService<ILogger>();
- var translationService = serviceProvider.GetRequiredService<ITranslationService>();
-
- try
- {
- var language = langRepository.Table.FirstOrDefault(l => l.Name == "English");
-
- if (language == null)
- language = langRepository.Table.FirstOrDefault();
-
- var filePath = CommonPath.MapPath("App_Data/Resources/Upgrade/en_110.xml");
- var localesXml = File.ReadAllText(filePath);
- translationService.ImportResourcesFromXmlInstall(language, localesXml).GetAwaiter().GetResult();
- }
- catch (Exception ex)
- {
- logService.InsertLog(Domain.Logging.LogLevel.Error, "UpgradeProcess - MigrationUpdateResourceString", ex.Message).GetAwaiter().GetResult();
- }
- return true;
+ return serviceProvider.ImportLanguageResourcesFromXml("App_Data/Resources/Upgrade/en_110.xml");
}
}
}
diff --git a/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpdateResourceString.cs b/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpdateResourceString.cs
new file mode 100644
index 000000000..ac5cbde03
--- /dev/null
+++ b/src/Business/Grand.Business.System/Services/Migrations/2.0/MigrationUpdateResourceString.cs
@@ -0,0 +1,24 @@
+using Grand.Domain.Data;
+using Grand.Infrastructure.Migrations;
+
+namespace Grand.Business.System.Services.Migrations._2._2
+{
+ public class MigrationUpdateResourceString : IMigration
+ {
+ public int Priority => 0;
+ public DbVersion Version => new(2, 0);
+ public Guid Identity => new("DC357BA8-B998-429A-8E22-9FE07BCB287D");
+ public string Name => "Update resource string for english language 2.0";
+
+ /// <summary>
+ /// Upgrade process
+ /// </summary>
+ /// <param name="database"></param>
+ /// <param name="serviceProvider"></param>
+ /// <returns></returns>
+ public bool UpgradeProcess(IDatabaseContext database, IServiceProvider serviceProvider)
+ {
+ return serviceProvider.ImportLanguageResourcesFromXml("App_Data/Resources/Upgrade/en_200.xml");
+ }
+ }
+}
diff --git a/src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.cs b/src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.cs
new file mode 100644
index 000000000..c77e4748b
--- /dev/null
+++ b/src/Business/Grand.Business.System/Services/Migrations/MigrationUpdateResource.cs
@@ -0,0 +1,37 @@
+using Grand.Business.Common.Interfaces.Localization;
+using Grand.Business.Common.Interfaces.Logging;
+using Grand.Domain.Data;
+using Grand.Domain.Localization;
+using Grand.SharedKernel.Extensions;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace Grand.Business.System.Services.Migrations
+{
+ public static class MigrationUpdateResource
+ {
+ public static bool ImportLanguageResourcesFromXml(this IServiceProvider serviceProvider,
+ string filename)
+ {
+ var langRepository = serviceProvider.GetRequiredService<IRepository<Language>>();
+ var logService = serviceProvider.GetRequiredService<ILogger>();
+ var translationService = serviceProvider.GetRequiredService<ITranslationService>();
+
+ try
+ {
+ var language = langRepository.Table.FirstOrDefault(l => l.Name == "English");
+
+ if (language == null)
+ language = langRepository.Table.FirstOrDefault();
+
+ var filePath = CommonPath.MapPath(filename);
+ var localesXml = File.ReadAllText(filePath);
+ translationService.ImportResourcesFromXmlInstall(language, localesXml).GetAwaiter().GetResult();
+ }
+ catch (Exception ex)
+ {
+ logService.InsertLog(Domain.Logging.LogLevel.Error, "UpgradeProcess - MigrationUpdateResourceString", ex.Message).GetAwaiter().GetResult();
+ }
+ return true;
+ }
+ }
+}
diff --git a/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_200.xml b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_200.xml
new file mode 100644
index 000000000..47ce1cf75
--- /dev/null
+++ b/src/Web/Grand.Web/App_Data/Resources/Upgrade/en_200.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Language Name="English">
+ <Resource Name="Admin.Catalog.Picture.Fields.ExtraField">
+ <Value>Extra field</Value>
+ </Resource>
+ <Resource Name="Admin.Catalog.Picture.Fields.Style">
+ <Value>Style</Value>
+ </Resource>
+ <Resource Name="Admin.Catalog.Products.Pictures.Fields.ExtraField">
+ <Value>Extra field</Value>
+ </Resource>
+ <Resource Name="Admin.Catalog.Products.Pictures.Fields.Style">
+ <Value>Style</Value>
+ </Resource>
+ <Resource Name="Admin.Catalog.Products.Pictures.Fields.ExtraField">
+ <Value>Extra field</Value>
+ </Resource>
+ <Resource Name="Admin.GiftVouchers.Fields.StoreId">
+ <Value>Store</Value>
+ </Resource>
+ <Resource Name="Admin.Settings.Order.GiftVouchers_Assign_StoreId">
+ <Value>Gift voucher assign to the current store</Value>
+ </Resource>
+ <Resource Name="Address.Fields.AddressName">
+ <Value>Address name</Value>
+ </Resource>
+ <Resource Name="Admin.Address.Fields.AddressName">
+ <Value>Address name</Value>
+ </Resource>
+ <Resource Name="Admin.Settings.Customer.AddressFormFields.NameEnabled">
+ <Value>'Address name' enabled</Value>
+ </Resource>
+ <Resource Name="Admin.Catalog.Attributes.SpecificationAttributes.UsedByProducts">
+ <Value>Used by products</Value>
+ </Resource>
+ <Resource Name="Admin.Catalog.Attributes.SpecificationAttributes.UsedByProducts.OptionName">
+ <Value>Name</Value>
+ </Resource>
+ <Resource Name="Admin.Catalog.Attributes.SpecificationAttributes.UsedByProducts.Product">
+ <Value>Product</Value>
+ </Resource>
+ <Resource Name="Admin.Catalog.Attributes.SpecificationAttributes.UsedByProducts.Published">
+ <Value>Published</Value>
+ </Resource>
+ <Resource Name="Products.Mpn">
+ <Value>Manufacturer part number</Value>
+ </Resource>
+</Language>
\ No newline at end of file