Skip to content

Commit 1fa83bd

Browse files
mgesingmgesing
committed
Localized some hard-coded strings
1 parent 619e8dc commit 1fa83bd

8 files changed

Lines changed: 64 additions & 38 deletions

File tree

‎src/Libraries/SmartStore.Data/Migrations/201512151526290_ImportFramework.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder)
7676
"Legt die Anzahl der zu überspringenden Datensätze fest.");
7777

7878
builder.AddOrUpdate("Common.Unknown", "Unknown", "Unbekannt");
79+
builder.AddOrUpdate("Common.Unavailable", "Unavailable", "Nicht verfügbar");
7980
builder.AddOrUpdate("Common.Language", "Language", "Sprache");
8081
builder.AddOrUpdate("Admin.Common.ImportFile", "Import file", "Importdatei");
8182
builder.AddOrUpdate("Admin.Common.ImportFiles", "Import files", "Importdateien");
@@ -303,6 +304,14 @@ public void MigrateLocaleResources(LocaleResourcesBuilder builder)
303304
builder.AddOrUpdate("Admin.Configuration.Countries.States.CantDeleteWithAddresses",
304305
"The state\\province cannot be deleted because it has associated addresses.",
305306
"Das Bundesland\\Region kann nicht gelöscht werden, weil ihm Adressen zugeordnet sind.");
307+
308+
builder.AddOrUpdate("Admin.Configuration.Shipping.Methods.NoMethodsLoaded",
309+
"No shipping methods could be loaded.",
310+
"Es konnten keine Versandarten geladen werden.");
311+
312+
builder.AddOrUpdate("Admin.System.Warnings.NoShipmentItems",
313+
"No shipment items",
314+
"Keine Versand-Artikel");
306315
}
307316
}
308317
}

‎src/Plugins/SmartStore.Shipping/Controllers/ByTotalController.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public ActionResult Configure()
4343
var shippingMethods = _shippingService.GetAllShippingMethods();
4444
if (shippingMethods.Count == 0)
4545
{
46-
return Content("No shipping methods can be loaded");
46+
return Content(T("Admin.Configuration.Shipping.Methods.NoMethodsLoaded"));
4747
}
4848

4949
var model = new ByTotalListModel();
@@ -100,10 +100,11 @@ public ActionResult RateUpdate(ByTotalModel model, GridCommand command)
100100
{
101101
if (!ModelState.IsValid)
102102
{
103-
return new JsonResult { Data = "error" };
103+
return new JsonResult { Data = T("Admin.Common.UnknownError").Text };
104104
}
105105

106106
var shippingByTotalRecord = _shippingByTotalService.GetShippingByTotalRecordById(model.Id);
107+
107108
shippingByTotalRecord.Zip = model.Zip == "*" ? null : model.Zip;
108109
shippingByTotalRecord.From = model.From;
109110
shippingByTotalRecord.To = model.To;
@@ -112,6 +113,7 @@ public ActionResult RateUpdate(ByTotalModel model, GridCommand command)
112113
shippingByTotalRecord.ShippingChargePercentage = model.ShippingChargePercentage;
113114
shippingByTotalRecord.BaseCharge = model.BaseCharge;
114115
shippingByTotalRecord.MaxCharge = model.MaxCharge;
116+
115117
_shippingByTotalService.UpdateShippingByTotalRecord(shippingByTotalRecord);
116118

117119
return RatesList(command);

‎src/Plugins/SmartStore.Shipping/Controllers/FixedRateController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public ActionResult Configure()
2929
{
3030
var shippingMethods = _shippingService.GetAllShippingMethods();
3131
if (shippingMethods.Count == 0)
32-
return Content("No shipping methods can be loaded");
32+
return Content(T("Admin.Configuration.Shipping.Methods.NoMethodsLoaded"));
3333

3434
var tmp = new List<FixedRateModel>();
3535
foreach (var shippingMethod in shippingMethods)

‎src/Plugins/SmartStore.Shipping/Providers/ByTotalProvider.cs‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
using System;
2-
using System.Data.Entity.Migrations;
32
using System.Web.Routing;
43
using SmartStore.Core;
54
using SmartStore.Core.Domain.Shipping;
5+
using SmartStore.Core.Localization;
6+
using SmartStore.Core.Logging;
67
using SmartStore.Core.Plugins;
7-
using SmartStore.Shipping.Services;
88
using SmartStore.Services.Catalog;
99
using SmartStore.Services.Configuration;
1010
using SmartStore.Services.Localization;
11-
using SmartStore.Core.Logging;
1211
using SmartStore.Services.Shipping;
1312
using SmartStore.Services.Shipping.Tracking;
13+
using SmartStore.Shipping.Services;
1414

1515
namespace SmartStore.Shipping
1616
{
17-
[SystemName("Shipping.ByTotal")]
17+
[SystemName("Shipping.ByTotal")]
1818
[FriendlyName("Shipping by total")]
1919
[DisplayOrder(1)]
2020
public class ByTotalProvider : IShippingRateComputationMethod, IConfigurable
@@ -28,7 +28,6 @@ public class ByTotalProvider : IShippingRateComputationMethod, IConfigurable
2828
private readonly ISettingService _settingService;
2929
private readonly ILocalizationService _localizationService;
3030

31-
3231
/// <summary>
3332
/// Ctor
3433
/// </summary>
@@ -56,14 +55,18 @@ public ByTotalProvider(IShippingService shippingService,
5655
this._logger = logger;
5756
this._settingService = settingService;
5857
this._localizationService = localizationService;
59-
}
6058

61-
#region Properties
59+
T = NullLocalizer.Instance;
60+
}
6261

63-
/// <summary>
64-
/// Gets a shipping rate computation method type
65-
/// </summary>
66-
public ShippingRateComputationMethodType ShippingRateComputationMethodType
62+
#region Properties
63+
64+
public Localizer T { get; set; }
65+
66+
/// <summary>
67+
/// Gets a shipping rate computation method type
68+
/// </summary>
69+
public ShippingRateComputationMethodType ShippingRateComputationMethodType
6770
{
6871
get
6972
{
@@ -158,7 +161,7 @@ public GetShippingOptionResponse GetShippingOptions(GetShippingOptionRequest get
158161

159162
if (getShippingOptionRequest.Items == null || getShippingOptionRequest.Items.Count == 0)
160163
{
161-
response.AddError("No shipment items");
164+
response.AddError(T("Admin.System.Warnings.NoShipmentItems"));
162165
return response;
163166
}
164167

‎src/Plugins/SmartStore.Shipping/Providers/FixedRateProvider.cs‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.Collections.Generic;
33
using System.Web.Routing;
44
using SmartStore.Core.Domain.Shipping;
5+
using SmartStore.Core.Localization;
56
using SmartStore.Core.Plugins;
67
using SmartStore.Services.Configuration;
78
using SmartStore.Services.Localization;
@@ -10,27 +11,29 @@
1011

1112
namespace SmartStore.Shipping
1213
{
13-
/// <summary>
14-
/// Fixed rate shipping computation provider
15-
/// </summary>
16-
[SystemName("Shipping.FixedRate")]
14+
/// <summary>
15+
/// Fixed rate shipping computation provider
16+
/// </summary>
17+
[SystemName("Shipping.FixedRate")]
1718
[FriendlyName("Fixed Rate Shipping")]
1819
[DisplayOrder(0)]
1920
public class FixedRateProvider : IShippingRateComputationMethod, IConfigurable
2021
{
2122
private readonly ISettingService _settingService;
2223
private readonly IShippingService _shippingService;
23-
private readonly ILocalizationService _localizationService;
2424

2525
public FixedRateProvider(ISettingService settingService,
26-
IShippingService shippingService, ILocalizationService localizationService)
26+
IShippingService shippingService)
2727
{
2828
this._settingService = settingService;
2929
this._shippingService = shippingService;
30-
_localizationService = localizationService;
31-
}
32-
33-
private decimal GetRate(int shippingMethodId)
30+
31+
T = NullLocalizer.Instance;
32+
}
33+
34+
public Localizer T { get; set; }
35+
36+
private decimal GetRate(int shippingMethodId)
3437
{
3538
string key = string.Format("ShippingRateComputationMethod.FixedRate.Rate.ShippingMethodId{0}", shippingMethodId);
3639
decimal rate = this._settingService.GetSettingByKey<decimal>(key);
@@ -51,7 +54,7 @@ public GetShippingOptionResponse GetShippingOptions(GetShippingOptionRequest get
5154

5255
if (getShippingOptionRequest.Items == null || getShippingOptionRequest.Items.Count == 0)
5356
{
54-
response.AddError("No shipment items");
57+
response.AddError(T("Admin.System.Warnings.NoShipmentItems"));
5558
return response;
5659
}
5760

‎src/Plugins/SmartStore.ShippingByWeight/ByWeightShippingComputationMethod.cs‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,16 @@
33
using System.Web.Routing;
44
using SmartStore.Core;
55
using SmartStore.Core.Domain.Shipping;
6+
using SmartStore.Core.Localization;
67
using SmartStore.Core.Plugins;
7-
using SmartStore.ShippingByWeight.Data;
8-
using SmartStore.ShippingByWeight.Data.Migrations;
9-
using SmartStore.ShippingByWeight.Services;
108
using SmartStore.Services;
119
using SmartStore.Services.Catalog;
1210
using SmartStore.Services.Localization;
1311
using SmartStore.Services.Shipping;
1412
using SmartStore.Services.Shipping.Tracking;
13+
using SmartStore.ShippingByWeight.Data;
14+
using SmartStore.ShippingByWeight.Data.Migrations;
15+
using SmartStore.ShippingByWeight.Services;
1516

1617
namespace SmartStore.ShippingByWeight
1718
{
@@ -32,6 +33,7 @@ public class ByWeightShippingComputationMethod : BasePlugin, IShippingRateComput
3233
#endregion
3334

3435
#region Ctor
36+
3537
public ByWeightShippingComputationMethod(IShippingService shippingService,
3638
IStoreContext storeContext,
3739
IShippingByWeightService shippingByWeightService,
@@ -51,12 +53,17 @@ public ByWeightShippingComputationMethod(IShippingService shippingService,
5153
this._localizationService = localizationService;
5254
this._priceFormatter = priceFormatter;
5355
this._services = services;
54-
}
55-
#endregion
5656

57-
#region Utilities
57+
T = NullLocalizer.Instance;
58+
}
59+
60+
public Localizer T { get; set; }
61+
62+
#endregion
63+
64+
#region Utilities
5865

59-
private decimal? GetRate(decimal subTotal, decimal weight, int shippingMethodId, int storeId, int countryId, string zip)
66+
private decimal? GetRate(decimal subTotal, decimal weight, int shippingMethodId, int storeId, int countryId, string zip)
6067
{
6168
decimal? shippingTotal = null;
6269

@@ -120,7 +127,7 @@ public GetShippingOptionResponse GetShippingOptions(GetShippingOptionRequest get
120127

121128
if (getShippingOptionRequest.Items == null || getShippingOptionRequest.Items.Count == 0)
122129
{
123-
response.AddError("No shipment items");
130+
response.AddError(T("Admin.System.Warnings.NoShipmentItems"));
124131
return response;
125132
}
126133

‎src/Plugins/SmartStore.ShippingByWeight/Controllers/ShippingByWeightController.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@ public ShippingByWeightController(
5050
public ActionResult Configure()
5151
{
5252
var shippingMethods = _shippingService.GetAllShippingMethods();
53-
if (shippingMethods.Count == 0)
54-
return Content("No shipping methods can be loaded");
53+
if (shippingMethods.Count == 0)
54+
{
55+
return Content(T("Admin.Configuration.Shipping.Methods.NoMethodsLoaded"));
56+
}
5557

5658
var model = new ShippingByWeightListModel();
5759
var countries = _countryService.GetAllCountries(true);

‎src/Plugins/SmartStore.Tax/Controllers/TaxByRegionController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public ActionResult Configure()
7070
var tc = _taxCategoryService.GetTaxCategoryById(x.TaxCategoryId);
7171
m.TaxCategoryName = (tc != null) ? tc.Name : "";
7272
var c = _countryService.GetCountryById(x.CountryId);
73-
m.CountryName = (c != null) ? c.Name : "Unavailable";
73+
m.CountryName = (c != null) ? c.Name : T("Common.Unavailable").Text;
7474
var s = _stateProvinceService.GetStateProvinceById(x.StateProvinceId);
7575
m.StateProvinceName = (s != null) ? s.Name : "*";
7676
m.Zip = (!String.IsNullOrEmpty(x.Zip)) ? x.Zip : "*";
@@ -99,7 +99,7 @@ public ActionResult RatesList(GridCommand command)
9999
var tc = _taxCategoryService.GetTaxCategoryById(x.TaxCategoryId);
100100
m.TaxCategoryName = (tc != null) ? tc.Name : "";
101101
var c = _countryService.GetCountryById(x.CountryId);
102-
m.CountryName = (c != null) ? c.Name : "Unavailable";
102+
m.CountryName = (c != null) ? c.Name : T("Common.Unavailable").Text;
103103
var s = _stateProvinceService.GetStateProvinceById(x.StateProvinceId);
104104
m.StateProvinceName = (s != null) ? s.Name : "*";
105105
m.Zip = (!String.IsNullOrEmpty(x.Zip)) ? x.Zip : "*";

0 commit comments

Comments
 (0)