Merge pull request #219 from jwallet/german

Updated i18n strings and added German
jwallet · Apr 29, 2020 · bf50195 · bf50195
2 parents 4f3c38a + d19a733
commit bf50195
Show file tree

Hide file tree

Showing 17 changed files with 1,124 additions and 86 deletions.
diff --git a/EspionSpotify.Tests/TranslationTests.cs b/EspionSpotify.Tests/TranslationTests.cs
@@ -11,6 +11,7 @@ namespace EspionSpotify.Tests
     public class TranslationTests
     {
         private readonly Type _en;
+        private readonly Type _de;
         private readonly Type _fr;
         private readonly Type _nl;
         private static ResourceManager RM;
@@ -19,17 +20,22 @@ public class TranslationTests
         public TranslationTests()
         {
             _en = Translations.Languages.getResourcesManagerLanguageType(Enums.LanguageType.en);
+
+            _de = Translations.Languages.getResourcesManagerLanguageType(Enums.LanguageType.de);
             _fr = Translations.Languages.getResourcesManagerLanguageType(Enums.LanguageType.fr);
             _nl = Translations.Languages.getResourcesManagerLanguageType(Enums.LanguageType.nl);
+
             _keysCount = Enum.GetNames(typeof(Enums.TranslationKeys)).Count();
         }
 
         [Fact]
         internal void TranslationSetup_ShouldBeReady()
         {
             Assert.NotNull(_en);
+
+            Assert.NotNull(_de);
             Assert.NotNull(_fr);
-            //Assert.NotNull(_nl);
+            Assert.NotNull(_nl);
         }
 
         [Fact]
@@ -50,6 +56,24 @@ internal void English_ShouldGetTranslations()
             Assert.Equal(count, _keysCount);
         }
 
+        [Fact]
+        internal void German_ShouldGetTranslations()
+        {
+            RM = new ResourceManager(_de);
+            var resourceSet = RM.GetResourceSet(CultureInfo.InvariantCulture, true, true);
+            var count = 0;
+
+            foreach (DictionaryEntry o in resourceSet)
+            {
+                count++;
+                var actual = (string)o.Key;
+                var expected = actual.ToEnum<Enums.TranslationKeys>(ignoreCase: false)?.ToString();
+                Assert.Equal(expected, actual);
+            }
+
+            Assert.Equal(count, _keysCount);
+        }
+
         [Fact]
         internal void French_ShouldGetTranslations()
         {

diff --git a/EspionSpotify/App.config b/EspionSpotify/App.config
@@ -77,10 +77,12 @@
       </setting>
       <setting name="SpotifyAPISecretId" serializeAs="String">
         <value>
+          ced9c679a66641f484e6740fff479e14
         </value>
       </setting>
       <setting name="SpotifyAPIClientId" serializeAs="String">
         <value>
+          412ea2302d86443e854740ba35e869cb
         </value>
       </setting>
     </EspionSpotify.Properties.Settings>

diff --git a/EspionSpotify/Enums/LanguageType.cs b/EspionSpotify/Enums/LanguageType.cs
@@ -2,8 +2,9 @@
 {
     public enum LanguageType
     {
-         en = 0,
-         fr,
-         nl
+        en = 0,
+        de, // German
+        fr, // French
+        nl // Dutch
     }
 }
diff --git a/EspionSpotify/Enums/TranslationKeys.cs b/EspionSpotify/Enums/TranslationKeys.cs
@@ -55,7 +55,6 @@ public enum TranslationKeys
         msgNewVersionContent,
         msgNewVersionTitle,
         msgTitleCantQuit,
-        msgTitleDriverInstallationFailed,
         msgTitlePathNotFound,
         tabAdvanced,
         tabRecord,

diff --git a/EspionSpotify/EspionSpotify.csproj b/EspionSpotify/EspionSpotify.csproj
@@ -204,6 +204,11 @@
     <Compile Include="MediaTags\ILastFMAPI.cs" />
     <Compile Include="MediaTags\ISpotifyAPI.cs" />
     <Compile Include="Models\OutputFile.cs" />
+    <Compile Include="Translations\de.Designer.cs">
+      <DependentUpon>de.resx</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
     <Compile Include="Translations\I18nKeys.cs" />
     <Compile Include="Translations\nl.Designer.cs">
       <DependentUpon>nl.resx</DependentUpon>
@@ -264,6 +269,11 @@
     </Compile>
     <Compile Include="Translations\Languages.cs" />
     <Compile Include="Watcher.cs" />
+    <EmbeddedResource Include="Translations\de.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>de.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Translations\nl.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>nl.Designer.cs</LastGenOutput>

diff --git a/EspionSpotify/Translations/I18nKeys.cs b/EspionSpotify/Translations/I18nKeys.cs
@@ -60,7 +60,6 @@ public static class I18nKeys
         public static TranslationKeys MsgNewVersionContent { get => TranslationKeys.msgNewVersionContent; }
         public static TranslationKeys MsgNewVersionTitle { get => TranslationKeys.msgNewVersionTitle; }
         public static TranslationKeys MsgTitleCantQuit { get => TranslationKeys.msgTitleCantQuit; }
-        public static TranslationKeys MsgTitleDriverInstallationFailed { get => TranslationKeys.msgTitleDriverInstallationFailed; }
         public static TranslationKeys MsgTitlePathNotFound { get => TranslationKeys.msgTitlePathNotFound; }
 
         public static TranslationKeys TabAdvanced { get => TranslationKeys.tabAdvanced; }

diff --git a/EspionSpotify/Translations/Languages.cs b/EspionSpotify/Translations/Languages.cs
@@ -9,6 +9,7 @@ public static class Languages
     {
         public static readonly Dictionary<LanguageType, Type> availableResourcesManager = new Dictionary<LanguageType, Type>
         {
+            { LanguageType.de, typeof(de) },
             { LanguageType.en, typeof(en) },
             { LanguageType.fr, typeof(fr) },
             { LanguageType.nl, typeof(nl) }
@@ -22,8 +23,9 @@ public static Type getResourcesManagerLanguageType(LanguageType languageType)
         internal static readonly Dictionary<LanguageType, string> dropdownListValues = new Dictionary<LanguageType, string>
         {
             { LanguageType.en, "English" },
-            { LanguageType.fr, "Français" },
-            { LanguageType.nl, "Nederlands" }
+            { LanguageType.de, "Deutsch" }, // German
+            { LanguageType.fr, "Français" }, // French
+            { LanguageType.nl, "Nederlands" }, // Dutch
         };
     }
 }