Skip to content

Commit

Permalink
Updated resources for 4.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Michael-Herzog committed Dec 17, 2021
1 parent dda76e7 commit 626ce90
Show file tree
Hide file tree
Showing 9 changed files with 228 additions and 17 deletions.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
namespace SmartStore.Data.Migrations
{
using System;
using System.Data.Entity.Migrations;
using SmartStore.Core.Data;
using SmartStore.Data.Setup;

public partial class V420Resources : DbMigration, ILocaleResourcesProvider, IDataSeeder<SmartObjectContext>
{
public override void Up()
{
}

public override void Down()
{
}


public bool RollbackOnFailure => false;

public void Seed(SmartObjectContext context)
{
context.MigrateLocaleResources(MigrateLocaleResources);
context.SaveChanges();

if (DataSettings.DatabaseIsInstalled())
{
var logTypeMigrator = new ActivityLogTypeMigrator(context);
logTypeMigrator.AddActivityLogType("EditOrder", "Edit an order", "Auftrag bearbeitet");
}
}

public void MigrateLocaleResources(LocaleResourcesBuilder builder)
{
builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.SocialSettings.TwitterSite.Error",
"The Twitter username must begin with an '@'.",
"Der Twitter-Benutzername muss mit einem '@' beginnen.");

builder.AddOrUpdate("Admin.Configuration.Settings.ShoppingCart.AddProductsToBasketInSinglePositions",
"Add products to cart in single positions",
"Produkte in einzelnen Positionen in den Warenkorb legen",
"Enable this option if you want products with different quantities to be added to the shopping cart in single position.",
"Aktivieren Sie diese Option, wenn Produkte mit verschiedenen Mengenangaben als Einzelpositionen in den Warenkorb gelegt werden sollen.");
}
}
}

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@ protected override void Seed(SmartObjectContext context)
{
context.MigrateLocaleResources(MigrateLocaleResources);
MigrateSettings(context);

if (DataSettings.DatabaseIsInstalled())
{
var logTypeMigrator = new ActivityLogTypeMigrator(context);
logTypeMigrator.AddActivityLogType("EditOrder", "Edit an order", "Auftrag bearbeitet");
}
}

public void MigrateSettings(SmartObjectContext context)
Expand All @@ -55,15 +49,6 @@ public void MigrateSettings(SmartObjectContext context)

public void MigrateLocaleResources(LocaleResourcesBuilder builder)
{
builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.SocialSettings.TwitterSite.Error",
"The Twitter username must begin with an '@'.",
"Der Twitter-Benutzername muss mit einem '@' beginnen.");

builder.AddOrUpdate("Admin.Configuration.Settings.ShoppingCart.AddProductsToBasketInSinglePositions",
"Add products to cart in single positions",
"Produkte in einzelnen Positionen in den Warenkorb legen",
"Enable this option if you want products with different quantities to be added to the shopping cart in single position.",
"Aktivieren Sie diese Option, wenn Produkte mit verschiedenen Mengenangaben als Einzelpositionen in den Warenkorb gelegt werden sollen.");
}
}
}
7 changes: 7 additions & 0 deletions src/Libraries/SmartStore.Data/SmartStore.Data.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,10 @@
<Compile Include="Migrations\202101251149352_V411Resources.designer.cs">
<DependentUpon>202101251149352_V411Resources.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\202112171231491_V420Resources.cs" />
<Compile Include="Migrations\202112171231491_V420Resources.designer.cs">
<DependentUpon>202112171231491_V420Resources.cs</DependentUpon>
</Compile>
<Compile Include="ObjectContextBase.SaveChanges.cs" />
<Compile Include="Setup\Builder\ActivityLogTypeMigrator.cs" />
<Compile Include="Setup\Builder\SettingsBuilder.cs" />
Expand Down Expand Up @@ -975,6 +979,9 @@
<EmbeddedResource Include="Migrations\202101251149352_V411Resources.resx">
<DependentUpon>202101251149352_V411Resources.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Migrations\202112171231491_V420Resources.resx">
<DependentUpon>202112171231491_V420Resources.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Sql\Indexes.sql" />
<EmbeddedResource Include="Sql\StoredProcedures.sql" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6348,6 +6348,9 @@
<LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.SocialSettings.TwitterSite">
<Value>Twitter-Benutzername</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.SocialSettings.TwitterSite.Error">
<Value>Der Twitter-Benutzername muss mit einem '@' beginnen.</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.SocialSettings.TwitterSite.Hint">
<Value>Twitter-Benutzername, der auf Twitter-Karten angezeigt wird, wenn ein Produkt, eine Kategorie oder eine Herstellerseite auf Twitter geteilt wird. Beginnt mit einem '@'.</Value>
</LocaleResource>
Expand Down Expand Up @@ -6984,6 +6987,12 @@
<LocaleResource Name="Admin.Configuration.Settings.ShoppingCart">
<Value>Warenkorb-Einstellungen</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Settings.ShoppingCart.AddProductsToBasketInSinglePositions">
<Value>Produkte in einzelnen Positionen in den Warenkorb legen</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Settings.ShoppingCart.AddProductsToBasketInSinglePositions.Hint">
<Value>Aktivieren Sie diese Option, wenn Produkte mit verschiedenen Mengenangaben als Einzelpositionen in den Warenkorb gelegt werden sollen.</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Settings.ShoppingCart.AllowAnonymousUsersToEmailWishlist">
<Value>Gästen erlauben, ihre Wunschzettel per E-Mail zu versenden.</Value>
</LocaleResource>
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
202101251149352_V411Resources
202112171231491_V420Resources
Original file line number Diff line number Diff line change
Expand Up @@ -6510,6 +6510,9 @@
<LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.SocialSettings.TwitterSite">
<Value>Twitter Username</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.SocialSettings.TwitterSite.Error">
<Value>The Twitter username must begin with an '@'.</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.SocialSettings.TwitterSite.Hint">
<Value>Twitter Username that gets displayed on Twitter cards when a product, category and manufacturer page is shared on Twitter. Starts with a '@'.</Value>
</LocaleResource>
Expand Down Expand Up @@ -7146,6 +7149,12 @@
<LocaleResource Name="Admin.Configuration.Settings.ShoppingCart">
<Value>Shopping cart settings</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Settings.ShoppingCart.AddProductsToBasketInSinglePositions">
<Value>Add products to cart in single positions</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Settings.ShoppingCart.AddProductsToBasketInSinglePositions.Hint">
<Value>Enable this option if you want products with different quantities to be added to the shopping cart in single position.</Value>
</LocaleResource>
<LocaleResource Name="Admin.Configuration.Settings.ShoppingCart.AllowAnonymousUsersToEmailWishlist">
<Value>Allow guests to email their wishlists</Value>
</LocaleResource>
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
202101251149352_V411Resources
202112171231491_V420Resources

0 comments on commit 626ce90

Please sign in to comment.