Added machine translations

Raised version number Fixed a small issue that prevented to load other languages
songify-rocks · Apr 8, 2023 · 921043f · 921043f
1 parent fcce5a0
commit 921043f
Show file tree

Hide file tree

Showing 13 changed files with 86 additions and 21 deletions.
diff --git a/Songify Slim/App.xaml.cs b/Songify Slim/App.xaml.cs
@@ -31,8 +31,14 @@ private App()
                 ConfigHandler.LoadConfig(Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location) + "/config.xml");
             else
                 ConfigHandler.ReadConfig();
-            Thread.CurrentThread.CurrentUICulture = new CultureInfo(Settings.Language);
-            Thread.CurrentThread.CurrentUICulture = new CultureInfo("en");
+            try
+            {
+                Thread.CurrentThread.CurrentUICulture = new CultureInfo(Settings.Language);
+            }
+            catch (Exception e)
+            {
+                Thread.CurrentThread.CurrentUICulture = new CultureInfo("en");
+            }
             //  Adding the RegKey for Songify in startup(autostart with windows)
 
             RegistryKey registryKey = Registry.LocalMachine.OpenSubKey(

diff --git a/Songify Slim/Properties/AssemblyInfo.cs b/Songify Slim/Properties/AssemblyInfo.cs
@@ -50,7 +50,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.9.21")]
-[assembly: AssemblyFileVersion("1.3.9.21")]
+[assembly: AssemblyVersion("1.4.0.0")]
+[assembly: AssemblyFileVersion("1.4.0.0")]
 [assembly: NeutralResourcesLanguage("en")]
 [assembly: Guid("442379e3-32d8-42d1-ab09-cba229672453")]
diff --git a/Songify Slim/Properties/Resources.Designer.cs b/Songify Slim/Properties/Resources.Designer.cs
diff --git a/Songify Slim/Properties/Resources.de-DE.resx b/Songify Slim/Properties/Resources.de-DE.resx
@@ -649,4 +649,10 @@
   <data name="brw_cmd_playpause" xml:space="preserve">
     <value>Setzt die aktuelle Wiedergabe fort oder hält sie an.</value>
   </data>
+  <data name="sw_SpotifySR_Userlevel_command" xml:space="preserve">
+    <value>Userlevel für SR-Befehl</value>
+  </data>
+  <data name="sw_SpotifySR_Userlevel_reward" xml:space="preserve">
+    <value>Userlevel für SR-Kanalbelohnung</value>
+  </data>
 </root>
diff --git a/Songify Slim/Properties/Resources.en.resx b/Songify Slim/Properties/Resources.en.resx
@@ -649,4 +649,10 @@
   <data name="brw_cmd_playpause" xml:space="preserve">
     <value>Resumes or pauses the current playback.</value>
   </data>
+  <data name="sw_SpotifySR_Userlevel_reward" xml:space="preserve">
+    <value>Allowed user levels for SR reward</value>
+  </data>
+  <data name="sw_SpotifySR_Userlevel_command" xml:space="preserve">
+    <value>Allowed user levels for SR command</value>
+  </data>
 </root>
diff --git a/Songify Slim/Properties/Resources.es.resx b/Songify Slim/Properties/Resources.es.resx
@@ -649,4 +649,10 @@
   <data name="brw_cmd_playpause" xml:space="preserve">
     <value>Reanuda o pausa la reproducción actual.</value>
   </data>
+  <data name="sw_SpotifySR_Userlevel_command" xml:space="preserve">
+    <value>Niveles de usuario permitidos para el comando SR</value>
+  </data>
+  <data name="sw_SpotifySR_Userlevel_reward" xml:space="preserve">
+    <value>Niveles de usuario permitidos para la recompensa SR</value>
+  </data>
 </root>
diff --git a/Songify Slim/Properties/Resources.fr.resx b/Songify Slim/Properties/Resources.fr.resx
@@ -649,4 +649,10 @@
   <data name="brw_cmd_playpause" xml:space="preserve">
     <value>Reprend ou met en pause la lecture en cours.</value>
   </data>
+  <data name="sw_SpotifySR_Userlevel_command" xml:space="preserve">
+    <value>Niveaux d'utilisateurs autorisés pour la commande SR</value>
+  </data>
+  <data name="sw_SpotifySR_Userlevel_reward" xml:space="preserve">
+    <value>Niveaux d'utilisateurs autorisés pour la récompense SR</value>
+  </data>
 </root>
diff --git a/Songify Slim/Properties/Resources.resx b/Songify Slim/Properties/Resources.resx
@@ -813,4 +813,10 @@
   <data name="brw_cmd_playpause" xml:space="preserve">
     <value>Resumes or pauses the current playback.</value>
   </data>
+  <data name="sw_SpotifySR_Userlevel_command" xml:space="preserve">
+    <value>Allowed user levels for SR command</value>
+  </data>
+  <data name="sw_SpotifySR_Userlevel_reward" xml:space="preserve">
+    <value>Allowed user levels for SR reward</value>
+  </data>
 </root>
diff --git a/Songify Slim/Properties/Resources.ru-RU.resx b/Songify Slim/Properties/Resources.ru-RU.resx
@@ -649,4 +649,10 @@
   <data name="brw_cmd_playpause" xml:space="preserve">
     <value>Возобновляет или приостанавливает текущее воспроизведение.</value>
   </data>
+  <data name="sw_SpotifySR_Userlevel_command" xml:space="preserve">
+    <value>Разрешенные уровни пользователей для команды SR</value>
+  </data>
+  <data name="sw_SpotifySR_Userlevel_reward" xml:space="preserve">
+    <value>Разрешенные уровни пользователей для вознаграждения SR</value>
+  </data>
 </root>
diff --git a/Songify Slim/Util/General/GlobalObjects.cs b/Songify Slim/Util/General/GlobalObjects.cs
@@ -18,7 +18,7 @@ public static class GlobalObjects
         public static FlowDocument ConsoleDocument = new FlowDocument();
         public static TrackInfo CurrentSong;
         public static bool DetachConsole = false;
-        public static bool IsBeta = true;
+        public static bool IsBeta = false;
         public static bool IsInPlaylist;
         public static ObservableCollection<RequestObject> ReqList = new ObservableCollection<RequestObject>();
         public static string Requester = "";

diff --git a/Songify Slim/Util/Songify/TwitchOAuth/ImplicitOAuth.cs b/Songify Slim/Util/Songify/TwitchOAuth/ImplicitOAuth.cs
@@ -9,8 +9,6 @@ namespace Songify_Slim.Util.Songify.TwitchOAuth
 {
     public class ImplicitOAuth
     {
-
-
         #region Variables
         // Privates
         private const string TwitchAuthUrl = "https://id.twitch.tv/oauth2/authorize";
@@ -64,14 +62,21 @@ public string RequestClientAuthorization()
             InitializeLocalWebServers();
 
             // Open the browser and send the user to the implicit autentication page on Twitch.
-            //Process.Start($"{twitchAuthUrl}?{queryParams}");
-            var process = new Process();
-            process.StartInfo = new ProcessStartInfo
+            try
+            {
+                var process = new Process();
+                process.StartInfo = new ProcessStartInfo
+                {
+                    FileName = @"C:\Program Files (x86)\Microsoft\Edge\Application\msedge1.exe",
+                    Arguments = $"--inprivate {TwitchAuthUrl}?{queryParams}"
+                };
+                process.Start();
+            }
+            catch (Exception e)
             {
-                FileName = @"C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe",
-                Arguments = $"--inprivate {TwitchAuthUrl}?{queryParams}"
-            };
-            process.Start();
+                Process.Start($"{TwitchAuthUrl}?{queryParams}");
+            }
+
             return authStateVerify;
         }
         #endregion
@@ -186,12 +191,12 @@ void IncommingTwitchRequest(IAsyncResult result)
                               <img src=""https://songify.overcode.tv/img/ms-icon-310x310.png"" style="" height: 50px;""/> + <img src=""https://songify.overcode.tv/img/TwitchGlitchPurple.png"" style="" height: 50px;""/>
                           </div>
                         </div>
-                          <h1>Success</h1> 
+                          <h1>Success</h1>
                           <p>Twitch and Songify are now connected!<br/>This page closes itself in 5 seconds.</p>
                         </div>
 
 						<script>
-							let values = 
+							let values =
 							{
 								access_token:""TOKEN"",
 								state: ""STATE""
@@ -208,7 +213,7 @@ void IncommingTwitchRequest(IAsyncResult result)
                             setTimeout(function () {
                                 window.close();
                                 }, 5000);
-                            
+
 						</script>
 					</body>
 				</html>

diff --git a/Songify Slim/Views/MainWindow.xaml.cs b/Songify Slim/Views/MainWindow.xaml.cs
@@ -626,14 +626,14 @@ private async void MetroWindowLoaded(object sender, RoutedEventArgs e)
             await SendTelemetry();
             await TwitchHandler.CheckStreamIsUp();
 
-            if (!Settings.UpdateRequired) return;
+            ApiHandler.DoAuthAsync();
 
+            if (!Settings.UpdateRequired) return;
             List<int> userLevels = new List<int>();
             for (int i = 0; i <= Settings.TwSrUserLevel; i++)
             {
                 userLevels.Add(i);
             }
-
             if (Settings.UserLevelsCommand.Count == 0) Settings.UserLevelsCommand = userLevels;
             if (Settings.UserLevelsReward.Count == 0) Settings.UserLevelsReward = userLevels;
 

diff --git a/Songify Slim/Views/SettingsWindow.xaml b/Songify Slim/Views/SettingsWindow.xaml
@@ -624,7 +624,7 @@
                             </StackPanel>
                             <StackPanel Orientation="Vertical" VerticalAlignment="Top">
                                 <DockPanel LastChildFill="True">
-                                    <Label Content="Allowed user levels for SR command" Padding="0,5,5,5" VerticalAlignment="Center"/>
+                                    <Label Content="{x:Static local:Resources.sw_SpotifySR_Userlevel_command}" Padding="0,5,5,5" VerticalAlignment="Center"/>
                                     <ComboBox x:Name="CbxAllowedUserLevelsCommand" SelectionChanged="Selector_OnSelectionChanged" IsReadOnly="True" SelectedIndex="0" HorizontalAlignment="Right" Width="185">
                                         <ComboBox.Items>
                                             <ComboBoxItem Content="User Levels (Command)">
@@ -654,7 +654,7 @@
                                     </ComboBox>
                                 </DockPanel>
                                 <DockPanel LastChildFill="True" Margin="0,6,0,0">
-                                    <Label Content="Allowed user levels for SR reward" Padding="0,5,5,5" VerticalAlignment="Center"/>
+                                    <Label Content="{x:Static local:Resources.sw_SpotifySR_Userlevel_reward}" Padding="0,5,5,5" VerticalAlignment="Center"/>
                                     <ComboBox x:Name="CbxAllowedUserLevelsReward" SelectionChanged="Selector_OnSelectionChanged" IsReadOnly="True" SelectedIndex="0" HorizontalAlignment="Right" Width="185">
                                         <ComboBox.Items>
                                             <ComboBoxItem Content="User Levels (Reward)">