AnnoDesigner · FroggieFrog · Sep 10, 2021 · Sep 2, 2021 · Sep 2, 2021 · Sep 2, 2021
diff --git a/AnnoDesigner/Commons.cs b/AnnoDesigner/Commons.cs
@@ -21,10 +21,10 @@ public class Commons : ICommons
         public static Commons Instance
         {
             get { return lazy.Value; }
-        }        
+        }
 
         private Commons()
-        {        }
+        { }
 
         #endregion
 
@@ -56,8 +56,8 @@ public string CurrentLanguage
             { "Français","fra" },
             { "Polski", "pol" },
             { "Русский", "rus" },
+            { "Español", "esp" },
             /* We currently do not support these languages */
-            //{ "Español", "esp" },
             //{ "Italiano", "ita" },
             //{ "český", "cze" },
         };

diff --git a/AnnoDesigner/Flags/France.png b/AnnoDesigner/Flags/France.png
diff --git a/AnnoDesigner/Flags/Germany.png b/AnnoDesigner/Flags/Germany.png
diff --git a/AnnoDesigner/Flags/Poland.png b/AnnoDesigner/Flags/Poland.png
diff --git a/AnnoDesigner/Flags/Russia.png b/AnnoDesigner/Flags/Russia.png
diff --git a/AnnoDesigner/Flags/Spain.png b/AnnoDesigner/Flags/Spain.png
diff --git a/AnnoDesigner/Flags/United Kingdom.png b/AnnoDesigner/Flags/United Kingdom.png
diff --git a/AnnoDesigner/Localization/Localization.cs b/AnnoDesigner/Localization/Localization.cs
diff --git a/AnnoDesigner/Localization/TreeLocalization.cs b/AnnoDesigner/Localization/TreeLocalization.cs
@@ -70,8 +70,10 @@ public string GetLocalization(string valueToTranslate, string languageCode = nul
                 languageCode = _commons.CurrentLanguageCode;
             }
 
-            if (!_commons.LanguageCodeMap.ContainsValue(languageCode))
+            // use english as default language
+            if (!_commons.LanguageCodeMap.ContainsValue(languageCode) || !Translations.ContainsKey(languageCode))
             {
+                _logger.Trace($"language ({languageCode}) has no translations or is not supported");
                 languageCode = "eng";
             }
 

diff --git a/AnnoDesigner/ViewModels/MainViewModel.cs b/AnnoDesigner/ViewModels/MainViewModel.cs
@@ -201,7 +201,10 @@ public MainViewModel(ICommons commonsToUse,
             {
                 FlagPath = "Flags/Russia.png"
             });
-            //Languages.Add(new SupportedLanguage("Español"));
+            Languages.Add(new SupportedLanguage("Español")
+            {
+                FlagPath = "Flags/Spain.png"
+            });            
             //Languages.Add(new SupportedLanguage("Italiano"));
             //Languages.Add(new SupportedLanguage("český"));
 

diff --git a/AnnoDesigner/ViewModels/WelcomeViewModel.cs b/AnnoDesigner/ViewModels/WelcomeViewModel.cs
@@ -44,6 +44,10 @@ public WelcomeViewModel(ICommons commonsToUse, IAppSettings appSettingsToUse)
             {
                 FlagPath = "Flags/Russia.png"
             });
+            Languages.Add(new SupportedLanguage("Español")
+            {
+                FlagPath = "Flags/Spain.png"
+            });
 
             ContinueCommand = new RelayCommand(Continue, CanContinue);
         }

diff --git a/Tests/AnnoDesigner.Tests/WelcomeViewModelTests.cs b/Tests/AnnoDesigner.Tests/WelcomeViewModelTests.cs
@@ -48,7 +48,7 @@ public void Ctor_ShouldSetCorrectNumberOfLanguages()
             var viewModel = GetViewModel();
 
             // Assert
-            Assert.Equal(5, viewModel.Languages.Count);
+            Assert.Equal(6, viewModel.Languages.Count);
         }
 
         #endregion