Add new locale

hnql · Apr 30, 2020 · 5b05443 · 5b05443
1 parent f1aee2f
commit 5b05443
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/Presentation/Nop.Web/App_Data/Localization/defaultResources.nopres.xml b/src/Presentation/Nop.Web/App_Data/Localization/defaultResources.nopres.xml
@@ -4122,6 +4122,9 @@
   <LocaleResource Name="Admin.Common.Edit">
     <Value>Edit</Value>
   </LocaleResource>
+  <LocaleResource Name="Admin.Common.EmptyItemText">
+    <Value>---</Value>
+  </LocaleResource>
   <LocaleResource Name="Admin.Common.ExcelFile">
     <Value>Excel file</Value>
   </LocaleResource>
@@ -8934,9 +8937,6 @@
   <LocaleResource Name="Admin.Configuration.Stores.Fields.DefaultLanguage">
     <Value>Default language</Value>
   </LocaleResource>
-  <LocaleResource Name="Admin.Configuration.Stores.Fields.DefaultLanguage.DefaultItemText">
-    <Value>---</Value>
-  </LocaleResource>
   <LocaleResource Name="Admin.Configuration.Stores.Fields.DefaultLanguage.Hint">
     <Value>This property allows a store owner to specify a default language for a store. If not specified, then the default language display order will be used.</Value>
   </LocaleResource>

diff --git a/src/Presentation/Nop.Web/Areas/Admin/Factories/LanguageModelFactory.cs b/src/Presentation/Nop.Web/Areas/Admin/Factories/LanguageModelFactory.cs
@@ -135,8 +135,8 @@ public virtual LanguageModel PrepareLanguageModel(LanguageModel model, Language
             }
 
             //prepare available currencies
-            //TODO: add locale resource for "---"
-            _baseAdminModelFactory.PrepareCurrencies(model.AvailableCurrencies, defaultItemText: "---");
+            _baseAdminModelFactory.PrepareCurrencies(model.AvailableCurrencies, 
+                defaultItemText: _localizationService.GetResource("Admin.Common.EmptyItemText"));
 
             //prepare available stores
             _storeMappingSupportedModelFactory.PrepareModelStores(model, language, excludeProperties);

diff --git a/src/Presentation/Nop.Web/Areas/Admin/Factories/StoreModelFactory.cs b/src/Presentation/Nop.Web/Areas/Admin/Factories/StoreModelFactory.cs
@@ -104,7 +104,8 @@ public virtual StoreModel PrepareStoreModel(StoreModel model, Store store, bool
             }
 
             //prepare available languages
-            _baseAdminModelFactory.PrepareLanguages(model.AvailableLanguages, defaultItemText: _localizationService.GetResource("Admin.Configuration.Stores.Fields.DefaultLanguage.DefaultItemText"));
+            _baseAdminModelFactory.PrepareLanguages(model.AvailableLanguages, 
+                defaultItemText: _localizationService.GetResource("Admin.Common.EmptyItemText"));
 
             //prepare localized models
             if (!excludeProperties)

diff --git a/upgradescripts/4.20-4.30 (under development)/upgrade.sql b/upgradescripts/4.20-4.30 (under development)/upgrade.sql
@@ -874,6 +874,12 @@ set @resources='
   <LocaleResource Name="Account.AssociatedExternalAuth.AccountAlreadyAssigned">
     <Value>Account is already assigned</Value>
   </LocaleResource>
+  <LocaleResource Name="Admin.Configuration.Stores.Fields.DefaultLanguage.DefaultItemText">
+    <Value></Value>
+  </LocaleResource>
+  <LocaleResource Name="Admin.Common.EmptyItemText">
+    <Value>---</Value>
+  </LocaleResource>
 </Language>
 '