Skip to content

Commit 626ce90

Browse files
Michael-HerzogMichael-Herzog
committed
Updated resources for 4.2.0
1 parent dda76e7 commit 626ce90

File tree

9 files changed

+228
-17
lines changed

9 files changed

+228
-17
lines changed

‎src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.Designer.cs‎

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.cs‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
namespace SmartStore.Data.Migrations
2+
{
3+
using System;
4+
using System.Data.Entity.Migrations;
5+
using SmartStore.Core.Data;
6+
using SmartStore.Data.Setup;
7+
8+
public partial class V420Resources : DbMigration, ILocaleResourcesProvider, IDataSeeder<SmartObjectContext>
9+
{
10+
public override void Up()
11+
{
12+
}
13+
14+
public override void Down()
15+
{
16+
}
17+
18+
19+
public bool RollbackOnFailure => false;
20+
21+
public void Seed(SmartObjectContext context)
22+
{
23+
context.MigrateLocaleResources(MigrateLocaleResources);
24+
context.SaveChanges();
25+
26+
if (DataSettings.DatabaseIsInstalled())
27+
{
28+
var logTypeMigrator = new ActivityLogTypeMigrator(context);
29+
logTypeMigrator.AddActivityLogType("EditOrder", "Edit an order", "Auftrag bearbeitet");
30+
}
31+
}
32+
33+
public void MigrateLocaleResources(LocaleResourcesBuilder builder)
34+
{
35+
builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.SocialSettings.TwitterSite.Error",
36+
"The Twitter username must begin with an '@'.",
37+
"Der Twitter-Benutzername muss mit einem '@' beginnen.");
38+
39+
builder.AddOrUpdate("Admin.Configuration.Settings.ShoppingCart.AddProductsToBasketInSinglePositions",
40+
"Add products to cart in single positions",
41+
"Produkte in einzelnen Positionen in den Warenkorb legen",
42+
"Enable this option if you want products with different quantities to be added to the shopping cart in single position.",
43+
"Aktivieren Sie diese Option, wenn Produkte mit verschiedenen Mengenangaben als Einzelpositionen in den Warenkorb gelegt werden sollen.");
44+
}
45+
}
46+
}

‎src/Libraries/SmartStore.Data/Migrations/202112171231491_V420Resources.resx‎

Lines changed: 126 additions & 0 deletions
Large diffs are not rendered by default.

‎src/Libraries/SmartStore.Data/Migrations/MigrationsConfiguration.cs‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,6 @@ protected override void Seed(SmartObjectContext context)
4040
{
4141
context.MigrateLocaleResources(MigrateLocaleResources);
4242
MigrateSettings(context);
43-
44-
if (DataSettings.DatabaseIsInstalled())
45-
{
46-
var logTypeMigrator = new ActivityLogTypeMigrator(context);
47-
logTypeMigrator.AddActivityLogType("EditOrder", "Edit an order", "Auftrag bearbeitet");
48-
}
4943
}
5044

5145
public void MigrateSettings(SmartObjectContext context)
@@ -55,15 +49,6 @@ public void MigrateSettings(SmartObjectContext context)
5549

5650
public void MigrateLocaleResources(LocaleResourcesBuilder builder)
5751
{
58-
builder.AddOrUpdate("Admin.Configuration.Settings.GeneralCommon.SocialSettings.TwitterSite.Error",
59-
"The Twitter username must begin with an '@'.",
60-
"Der Twitter-Benutzername muss mit einem '@' beginnen.");
61-
62-
builder.AddOrUpdate("Admin.Configuration.Settings.ShoppingCart.AddProductsToBasketInSinglePositions",
63-
"Add products to cart in single positions",
64-
"Produkte in einzelnen Positionen in den Warenkorb legen",
65-
"Enable this option if you want products with different quantities to be added to the shopping cart in single position.",
66-
"Aktivieren Sie diese Option, wenn Produkte mit verschiedenen Mengenangaben als Einzelpositionen in den Warenkorb gelegt werden sollen.");
6752
}
6853
}
6954
}

‎src/Libraries/SmartStore.Data/SmartStore.Data.csproj‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,10 @@
541541
<Compile Include="Migrations\202101251149352_V411Resources.designer.cs">
542542
<DependentUpon>202101251149352_V411Resources.cs</DependentUpon>
543543
</Compile>
544+
<Compile Include="Migrations\202112171231491_V420Resources.cs" />
545+
<Compile Include="Migrations\202112171231491_V420Resources.designer.cs">
546+
<DependentUpon>202112171231491_V420Resources.cs</DependentUpon>
547+
</Compile>
544548
<Compile Include="ObjectContextBase.SaveChanges.cs" />
545549
<Compile Include="Setup\Builder\ActivityLogTypeMigrator.cs" />
546550
<Compile Include="Setup\Builder\SettingsBuilder.cs" />
@@ -975,6 +979,9 @@
975979
<EmbeddedResource Include="Migrations\202101251149352_V411Resources.resx">
976980
<DependentUpon>202101251149352_V411Resources.cs</DependentUpon>
977981
</EmbeddedResource>
982+
<EmbeddedResource Include="Migrations\202112171231491_V420Resources.resx">
983+
<DependentUpon>202112171231491_V420Resources.cs</DependentUpon>
984+
</EmbeddedResource>
978985
<EmbeddedResource Include="Sql\Indexes.sql" />
979986
<EmbeddedResource Include="Sql\StoredProcedures.sql" />
980987
</ItemGroup>

‎src/Presentation/SmartStore.Web/App_Data/Localization/App/de/all.smres.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6348,6 +6348,9 @@
63486348
<LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.SocialSettings.TwitterSite">
63496349
<Value>Twitter-Benutzername</Value>
63506350
</LocaleResource>
6351+
<LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.SocialSettings.TwitterSite.Error">
6352+
<Value>Der Twitter-Benutzername muss mit einem '@' beginnen.</Value>
6353+
</LocaleResource>
63516354
<LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.SocialSettings.TwitterSite.Hint">
63526355
<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>
63536356
</LocaleResource>
@@ -6984,6 +6987,12 @@
69846987
<LocaleResource Name="Admin.Configuration.Settings.ShoppingCart">
69856988
<Value>Warenkorb-Einstellungen</Value>
69866989
</LocaleResource>
6990+
<LocaleResource Name="Admin.Configuration.Settings.ShoppingCart.AddProductsToBasketInSinglePositions">
6991+
<Value>Produkte in einzelnen Positionen in den Warenkorb legen</Value>
6992+
</LocaleResource>
6993+
<LocaleResource Name="Admin.Configuration.Settings.ShoppingCart.AddProductsToBasketInSinglePositions.Hint">
6994+
<Value>Aktivieren Sie diese Option, wenn Produkte mit verschiedenen Mengenangaben als Einzelpositionen in den Warenkorb gelegt werden sollen.</Value>
6995+
</LocaleResource>
69876996
<LocaleResource Name="Admin.Configuration.Settings.ShoppingCart.AllowAnonymousUsersToEmailWishlist">
69886997
<Value>Gästen erlauben, ihre Wunschzettel per E-Mail zu versenden.</Value>
69896998
</LocaleResource>

‎src/Presentation/SmartStore.Web/App_Data/Localization/App/de/head.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
202101251149352_V411Resources
1+
202112171231491_V420Resources

‎src/Presentation/SmartStore.Web/App_Data/Localization/App/en/all.smres.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6510,6 +6510,9 @@
65106510
<LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.SocialSettings.TwitterSite">
65116511
<Value>Twitter Username</Value>
65126512
</LocaleResource>
6513+
<LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.SocialSettings.TwitterSite.Error">
6514+
<Value>The Twitter username must begin with an '@'.</Value>
6515+
</LocaleResource>
65136516
<LocaleResource Name="Admin.Configuration.Settings.GeneralCommon.SocialSettings.TwitterSite.Hint">
65146517
<Value>Twitter Username that gets displayed on Twitter cards when a product, category and manufacturer page is shared on Twitter. Starts with a '@'.</Value>
65156518
</LocaleResource>
@@ -7146,6 +7149,12 @@
71467149
<LocaleResource Name="Admin.Configuration.Settings.ShoppingCart">
71477150
<Value>Shopping cart settings</Value>
71487151
</LocaleResource>
7152+
<LocaleResource Name="Admin.Configuration.Settings.ShoppingCart.AddProductsToBasketInSinglePositions">
7153+
<Value>Add products to cart in single positions</Value>
7154+
</LocaleResource>
7155+
<LocaleResource Name="Admin.Configuration.Settings.ShoppingCart.AddProductsToBasketInSinglePositions.Hint">
7156+
<Value>Enable this option if you want products with different quantities to be added to the shopping cart in single position.</Value>
7157+
</LocaleResource>
71497158
<LocaleResource Name="Admin.Configuration.Settings.ShoppingCart.AllowAnonymousUsersToEmailWishlist">
71507159
<Value>Allow guests to email their wishlists</Value>
71517160
</LocaleResource>

‎src/Presentation/SmartStore.Web/App_Data/Localization/App/en/head.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
202101251149352_V411Resources
1+
202112171231491_V420Resources

0 commit comments

Comments
 (0)