diff --git a/OSCVRCWiz/Resources/StartUp/Updater.cs b/OSCVRCWiz/Resources/StartUp/Updater.cs index 9dfd57df..2f73c424 100644 --- a/OSCVRCWiz/Resources/StartUp/Updater.cs +++ b/OSCVRCWiz/Resources/StartUp/Updater.cs @@ -8,7 +8,7 @@ namespace OSCVRCWiz.Resources.StartUp public class Updater { - public static string currentVersion = "1.7.2"; + public static string currentVersion = "1.7.3"; public static string updateXMLName = "https://github.com/VRCWizard/TTS-Voice-Wizard/releases/latest/download/AutoUpdater-x64.xml"; public static async void getGithubInfo() diff --git a/OSCVRCWiz/Services/Integrations/Media/SpotifyAddon.cs b/OSCVRCWiz/Services/Integrations/Media/SpotifyAddon.cs index 3bfd35e5..f2854505 100644 --- a/OSCVRCWiz/Services/Integrations/Media/SpotifyAddon.cs +++ b/OSCVRCWiz/Services/Integrations/Media/SpotifyAddon.cs @@ -155,9 +155,10 @@ public static async Task spotifyGetCurrentSongInfo(bool playOnce) artist = m_currentTrack.Artists[0].Name.ToString(); - if(title == "Advertisement" && artist =="") + if(title == "Advertisement") { title = ""; + artist = ""; } diff --git a/OSCVRCWiz/Services/Integrations/WordReplacements.cs b/OSCVRCWiz/Services/Integrations/WordReplacements.cs index 85f61c7c..7c0885d2 100644 --- a/OSCVRCWiz/Services/Integrations/WordReplacements.cs +++ b/OSCVRCWiz/Services/Integrations/WordReplacements.cs @@ -1,6 +1,7 @@ using static OSCVRCWiz.VoiceWizardWindow; using System.Text.RegularExpressions; using OSCVRCWiz.Services.Text; +using System.Windows.Input; namespace OSCVRCWiz.Services.Integrations { @@ -28,9 +29,23 @@ public static string MainDoWordReplacement(string text) { string pattern = Regex.Escape(kvp.Key.ToString()); + string key = kvp.Key.ToString(); if (VoiceWizardWindow.MainFormGlobal.rjToggleUseWordBoundaries.Checked) { - pattern = $@"\b{Regex.Escape(kvp.Key.ToString())}\b"; + // pattern = $@"\b{Regex.Escape(kvp.Key.ToString())}\b"; //does not work if the word starts with a special character like $ + // pattern = $@"(? translateTextDeepL(string text) catch (Exception ex) { //MessageBox.Show("DeepL Translation Error: " + ex.Message); - OutputText.outputLog("[Translation API Error: " + ex.Message + "]", Color.Red); + // OutputText.outputLog("[Translation API Error: " + ex.Message + "]", Color.Red); + var errorMsg = ex.Message + "\n" + ex.TargetSite + "\n\nStack Trace:\n" + ex.StackTrace; + + try + { + errorMsg += "\n\n" + ex.InnerException.Message + "\n" + ex.InnerException.TargetSite + "\n\nStack Trace:\n" + ex.InnerException.StackTrace; + + } + catch { } + OutputText.outputLog("[DeepL Translation Error: " + errorMsg + "]", Color.Red); OutputText.outputLog("[You are attempting to translate from one language to another. If this is not your intent then switch 'Translation Language' back to 'No Translation (Default)'. If you are intending to translate then get a VoiceWizardPro key or a DeepL key. ]", Color.DarkOrange); OutputText.outputLog("[Learn how to get a Language Translation Key: https://ttsvoicewizard.com/docs/Translation/DeepL ]", Color.DarkOrange); return ""; diff --git a/OSCVRCWiz/VoiceWizardWindow.Designer.cs b/OSCVRCWiz/VoiceWizardWindow.Designer.cs index 889a3d5c..7cefbe4f 100644 --- a/OSCVRCWiz/VoiceWizardWindow.Designer.cs +++ b/OSCVRCWiz/VoiceWizardWindow.Designer.cs @@ -8258,7 +8258,7 @@ private void InitializeComponent() iconButton47.IconFont = FontAwesome.Sharp.IconFont.Auto; iconButton47.IconSize = 40; iconButton47.ImageAlign = ContentAlignment.MiddleLeft; - iconButton47.Location = new Point(355, 9); + iconButton47.Location = new Point(338, 9); iconButton47.Margin = new Padding(3, 2, 3, 2); iconButton47.Name = "iconButton47"; iconButton47.Size = new Size(44, 46); @@ -10165,7 +10165,7 @@ private void InitializeComponent() comboBoxLabsModelID.DropDownStyle = ComboBoxStyle.DropDownList; comboBoxLabsModelID.FlatStyle = FlatStyle.Flat; comboBoxLabsModelID.FormattingEnabled = true; - comboBoxLabsModelID.Items.AddRange(new object[] { "eleven_monolingual_v1", "eleven_multilingual_v1", "eleven_multilingual_v2", "eleven_turbo_v2", "eleven_turbo_v2_5" }); + comboBoxLabsModelID.Items.AddRange(new object[] { "eleven_monolingual_v1", "eleven_multilingual_v1", "eleven_multilingual_v2", "eleven_turbo_v2", "eleven_turbo_v2_5", "eleven_flash_v2", "eleven_flash_v2_5" }); comboBoxLabsModelID.Location = new Point(21, 40); comboBoxLabsModelID.Margin = new Padding(3, 2, 3, 2); comboBoxLabsModelID.Name = "comboBoxLabsModelID";