Merge pull request #311 from taooceros/FixUntranslatedString

jjw24 · web-flow · commit 934bad6ba50c · 2021-01-26T15:34:53.000+11:00
Fix untranslated string
diff --git a/Flow.Launcher.Core/Updater.cs b/Flow.Launcher.Core/Updater.cs
@@ -35,7 +35,8 @@ public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)
                 UpdateInfo newUpdateInfo;
 
                 if (!silentUpdate)
-                    api.ShowMsg("Please wait...", "Checking for new update");
+                    api.ShowMsg(api.GetTranslation("pleaseWait"),
+                                api.GetTranslation("update_flowlauncher_update_check"));
 
                 using var updateManager = await GitHubUpdateManager(GitHubRepository).ConfigureAwait(false);
 
@@ -51,12 +52,13 @@ public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)
                 if (newReleaseVersion <= currentVersion)
                 {
                     if (!silentUpdate)
-                        MessageBox.Show("You already have the latest Flow Launcher version");
+                        MessageBox.Show(api.GetTranslation("update_flowlauncher_already_on_latest"));
                     return;
                 }
 
                 if (!silentUpdate)
-                    api.ShowMsg("Update found", "Updating...");
+                    api.ShowMsg(api.GetTranslation("update_flowlauncher_update_found"),
+                                api.GetTranslation("update_flowlauncher_updating"));
 
                 await updateManager.DownloadReleases(newUpdateInfo.ReleasesToApply).ConfigureAwait(false);
 
@@ -67,8 +69,9 @@ public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)
                     var targetDestination = updateManager.RootAppDirectory + $"\\app-{newReleaseVersion.ToString()}\\{DataLocation.PortableFolderName}";
                     FilesFolders.CopyAll(DataLocation.PortableDataPath, targetDestination);
                     if (!FilesFolders.VerifyBothFolderFilesEqual(DataLocation.PortableDataPath, targetDestination))
-                        MessageBox.Show("Flow Launcher was not able to move your user profile data to the new update version. Please manually " +
-                            $"move your profile data folder from {DataLocation.PortableDataPath} to {targetDestination}");
+                        MessageBox.Show(string.Format(api.GetTranslation("update_flowlauncher_fail_moving_portable_user_profile_data"),
+                                                      DataLocation.PortableDataPath,
+                                                      targetDestination));
                 }
                 else
                 {
@@ -79,15 +82,16 @@ public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)
 
                 Log.Info($"|Updater.UpdateApp|Update success:{newVersionTips}");
 
-                if (MessageBox.Show(newVersionTips, "New Update", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+                if (MessageBox.Show(newVersionTips, api.GetTranslation("update_flowlauncher_new_update"), MessageBoxButton.YesNo) == MessageBoxResult.Yes)
                 {
                     UpdateManager.RestartApp(Constant.ApplicationFileName);
                 }
             }
             catch (Exception e) when (e is HttpRequestException || e is WebException || e is SocketException)
             {
                 Log.Exception($"|Updater.UpdateApp|Check your connection and proxy settings to github-cloud.s3.amazonaws.com.", e);
-                api.ShowMsg("Update Failed", "Check your connection and try updating proxy settings to github-cloud.s3.amazonaws.com.");
+                api.ShowMsg(api.GetTranslation("update_flowlauncher_fail"),
+                            api.GetTranslation("update_flowlauncher_check_connection"));
                 return;
             }
         }
diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -5,7 +5,7 @@
         Icon="Images\app.png"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
-        Title="Custom Plugin Hotkey" Height="200" Width="674.766">
+        Title="{DynamicResource customeQueryHotkeyTitle}" Height="200" Width="674.766">
     <Window.InputBindings>
         <KeyBinding Key="Escape" Command="Close"/>
     </Window.InputBindings>
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
@@ -17,6 +17,7 @@
     <!--Setting General-->
     <system:String x:Key="flowlauncher_settings">Flow Launcher Settings</system:String>
     <system:String x:Key="general">General</system:String>
+    <system:String x:Key="portableMode">Portable Mode</system:String>
     <system:String x:Key="startFlowLauncherOnSystemStartup">Start Flow Launcher on system startup</system:String>
     <system:String x:Key="hideFlowLauncherWhenLoseFocus">Hide Flow Launcher when focus is lost</system:String>
     <system:String x:Key="dontPromptUpdateMsg">Do not show new version notifications</system:String>
@@ -39,12 +40,13 @@
     <!--Setting Plugin-->
     <system:String x:Key="plugin">Plugin</system:String>
     <system:String x:Key="browserMorePlugins">Find more plugins</system:String>
+    <system:String x:Key="enable">Enable</system:String>
     <system:String x:Key="disable">Disable</system:String>
     <system:String x:Key="actionKeywords">Action keyword:</system:String>
     <system:String x:Key="currentActionKeywords">Current action keyword:</system:String>
     <system:String x:Key="newActionKeyword">New action keyword:</system:String>
-    <system:String x:Key="currentPriority">Current Priority: </system:String>
-    <system:String x:Key="newPriority">New Priority: </system:String>
+    <system:String x:Key="currentPriority">Current Priority:</system:String>
+    <system:String x:Key="newPriority">New Priority:</system:String>
     <system:String x:Key="pluginDirectory">Plugin Directory</system:String>
     <system:String x:Key="author">Author</system:String>
     <system:String x:Key="plugin_init_time">Init time:</system:String>
@@ -109,7 +111,7 @@
     <!--Priority Setting Dialog-->
     <system:String x:Key="priority_tips">Greater the number, the higher the result will be ranked. Try setting it as 5. If you want the results to be lower than any other plugin's, provide a negative number</system:String>
     <system:String x:Key="invalidPriority">Please provide an valid integer for Priority!</system:String>
-    
+
     <!--Action Keyword Setting Dialog-->
     <system:String x:Key="oldActionKeywords">Old Action Keyword</system:String>
     <system:String x:Key="newActionKeywords">New Action Keyword</system:String>
@@ -122,6 +124,7 @@
     <system:String x:Key="actionkeyword_tips">Use * if you don't want to specify an action keyword</system:String>
 
     <!--Custom Query Hotkey Dialog-->
+    <system:String x:Key="customeQueryHotkeyTitle">Custom Plugin Hotkey</system:String>
     <system:String x:Key="preview">Preview</system:String>
     <system:String x:Key="hotkeyIsNotUnavailable">Hotkey is unavailable, please select a new hotkey</system:String>
     <system:String x:Key="invalidPluginHotkey">Invalid plugin hotkey</system:String>
@@ -146,11 +149,23 @@
     <system:String x:Key="reportWindow_report_failed">Failed to send report</system:String>
     <system:String x:Key="reportWindow_flowlauncher_got_an_error">Flow Launcher got an error</system:String>
 
+    <!--General Notice-->
+    <system:String x:Key="pleaseWait">Please wait...</system:String>
+
     <!--update-->
+    <system:String x:Key="update_flowlauncher_update_check">Checking for new update</system:String>
+    <system:String x:Key="update_flowlauncher_already_on_latest">You already have the latest Flow Launcher version</system:String>
+    <system:String x:Key="update_flowlauncher_update_found">Update found</system:String>
+    <system:String x:Key="update_flowlauncher_updating">Updating...</system:String>
+    <system:String x:Key="update_flowlauncher_fail_moving_portable_user_profile_data">Flow Launcher was not able to move your user profile data to the new update version.
+        Please manually move your profile data folder from {0} to {1}</system:String>
+    <system:String x:Key="update_flowlauncher_new_update">New Update</system:String>
     <system:String x:Key="update_flowlauncher_update_new_version_available">New Flow Launcher release {0} is now available</system:String>
     <system:String x:Key="update_flowlauncher_update_error">An error occurred while trying to install software updates</system:String>
     <system:String x:Key="update_flowlauncher_update">Update</system:String>
     <system:String x:Key="update_flowlauncher_update_cancel">Cancel</system:String>
+    <system:String x:Key="update_flowlauncher_fail">Update Failed</system:String>
+    <system:String x:Key="update_flowlauncher_check_connection">Check your connection and try updating proxy settings to github-cloud.s3.amazonaws.com.</system:String>
     <system:String x:Key="update_flowlauncher_update_restart_flowlauncher_tip">This upgrade will restart Flow Launcher</system:String>
     <system:String x:Key="update_flowlauncher_update_upadte_files">Following files will be updated</system:String>
     <system:String x:Key="update_flowlauncher_update_files">Update files</system:String>
diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
@@ -37,7 +37,7 @@
             <ScrollViewer ui:ScrollViewerHelper.AutoHideScrollBars="True" Margin="60,30,0,30">
                 <StackPanel Orientation="Vertical">
                     <ui:ToggleSwitch Margin="10" IsOn="{Binding PortableMode}">
-                        <TextBlock Text="Portable Mode" />
+                        <TextBlock Text="{DynamicResource portableMode}" />
                     </ui:ToggleSwitch>
                     <CheckBox Margin="10" IsChecked="{Binding Settings.StartFlowLauncherOnSystemStartup}"
                           Checked="OnAutoStartupChecked" Unchecked="OnAutoStartupUncheck">
@@ -166,7 +166,7 @@
                                                 </TextBlock>
                                             </ToolTipService.ToolTip>
                                      </TextBlock>
-                                    <ui:ToggleSwitch Grid.Column="1" OffContent="Disabled" OnContent="Enabled" 
+                                    <ui:ToggleSwitch Grid.Column="1" OffContent="{DynamicResource disable}" OnContent="{DynamicResource enable}" 
                                                      MaxWidth="110" HorizontalAlignment="Right"
                                                      IsOn="{Binding PluginState}"/>
                                 </Grid>
diff --git a/Plugins/Flow.Launcher.Plugin.Url/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Url/Languages/en.xaml
@@ -2,6 +2,10 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
+    <system:String x:Key="flowlauncher_plugin_url_open_search_in">Open search in:</system:String>
+    <system:String x:Key="flowlauncher_plugin_new_window">New Window</system:String>
+    <system:String x:Key="flowlauncher_plugin_new_tab">New Tab</system:String>
+    
     <system:String x:Key="flowlauncher_plugin_url_open_url">Open url:{0}</system:String>
     <system:String x:Key="flowlauncher_plugin_url_canot_open_url">Can't open url:{0}</system:String>
 
diff --git a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml
@@ -10,11 +10,11 @@
             <RowDefinition />
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal" Grid.Row="0">
-            <Label Content="Open search in:" Margin="0 10 15 0" />
+            <Label Content="{DynamicResource flowlauncher_plugin_url_open_search_in}" Margin="0 10 15 0" />
             <RadioButton x:Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" 
-                         Content="New window" Click="OnNewBrowserWindowClick" />
+                         Content="{DynamicResource flowlauncher_plugin_new_window}" Click="OnNewBrowserWindowClick" />
             <RadioButton x:Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" 
-                         Content="New tab" Click="OnNewTabClick" />
+                         Content="{DynamicResource flowlauncher_plugin_new_tab}" Click="OnNewTabClick" />
         </StackPanel>
         <StackPanel VerticalAlignment="Top" Grid.Row="1" Height="106" Margin="0 20 0 0">
             <Label Content="{DynamicResource flowlauncher_plugin_url_plugin_set_tip}" Height="28" Margin="0,0,155,0"
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml
@@ -2,6 +2,11 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
+    <system:String x:Key="flowlauncher_plugin_websearch_open_search_in">Open search in:</system:String>
+    <system:String x:Key="flowlauncher_plugin_websearch_new_window">New Window</system:String>
+    <system:String x:Key="flowlauncher_plugin_websearch_new_tab">New Tab</system:String>
+    <system:String x:Key="flowlaucnher_plugin_websearch_set_browser_path">Set browser from path:</system:String>
+    <system:String x:Key="flowlauncher_plugin_websearch_choose">Choose</system:String>
     <system:String x:Key="flowlauncher_plugin_websearch_delete">Delete</system:String>
     <system:String x:Key="flowlauncher_plugin_websearch_edit">Edit</system:String>
     <system:String x:Key="flowlauncher_plugin_websearch_add">Add</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml
@@ -33,17 +33,17 @@
             <!-- Not sure why binding IsEnabled directly to Settings.EnableWebSaerchSuggestion is not working -->
         </StackPanel>
         <StackPanel Grid.Row="1" HorizontalAlignment="Left" Orientation="Horizontal">
-            <Label Content="Open search in:" Margin="0 15 20 0"/>
-            <RadioButton Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" Content="New window" Click="OnNewBrowserWindowClick" 
+            <Label Content="{DynamicResource flowlauncher_plugin_websearch_open_search_in}" Margin="0 15 20 0"/>
+            <RadioButton Name="NewWindowBrowser" GroupName="OpenSearchBehaviour" Content="{DynamicResource flowlauncher_plugin_websearch_new_window}" Click="OnNewBrowserWindowClick" 
                          Margin="0 0 20 0"/>
-            <RadioButton Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" Content="New tab" Click="OnNewTabClick" />
+            <RadioButton Name="NewTabInBrowser" GroupName="OpenSearchBehaviour" Content="{DynamicResource flowlauncher_plugin_websearch_new_tab}" Click="OnNewTabClick" />
         </StackPanel>
         <StackPanel Grid.Row="2" HorizontalAlignment="Left" Margin="0 3 0 0">
-            <Label Content="Set browser from path:" Margin="0 0 350 0" HorizontalAlignment="Left" Width="140"/>
+            <Label Content="{DynamicResource flowlaucnher_plugin_websearch_set_browser_path}" Margin="0 0 350 0" HorizontalAlignment="Left" Width="140"/>
             <TextBox x:Name="browserPathBox" HorizontalAlignment="Left" Margin="160,-22,0,0" TextChanged="OnBrowserPathTextChanged"
                      Width="214" Style="{StaticResource BrowserPathBoxStyle}"/>
             <Button x:Name="viewButton" HorizontalAlignment="Left" Margin="400,-30,0,0"  
-                    Click="OnChooseClick" FontSize="13" Content="Choose" Width="80"/>
+                    Click="OnChooseClick" FontSize="13" Content="{DynamicResource flowlauncher_plugin_websearch_choose}" Width="80"/>
         </StackPanel>
         <ListView ItemsSource="{Binding Settings.SearchSources}"
                   SelectedItem="{Binding Settings.SelectedSearchSource}"

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)`
`35`	`35`	`UpdateInfo newUpdateInfo;`
`36`	`36`
`37`	`37`	`if (!silentUpdate)`
`38`		`- api.ShowMsg("Please wait...", "Checking for new update");`
	`38`	`+ api.ShowMsg(api.GetTranslation("pleaseWait"),`
	`39`	`+ api.GetTranslation("update_flowlauncher_update_check"));`
`39`	`40`
`40`	`41`	`using var updateManager = await GitHubUpdateManager(GitHubRepository).ConfigureAwait(false);`
`41`	`42`
`@@ -51,12 +52,13 @@ public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)`
`51`	`52`	`if (newReleaseVersion <= currentVersion)`
`52`	`53`	`{`
`53`	`54`	`if (!silentUpdate)`
`54`		`- MessageBox.Show("You already have the latest Flow Launcher version");`
	`55`	`+ MessageBox.Show(api.GetTranslation("update_flowlauncher_already_on_latest"));`
`55`	`56`	`return;`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`if (!silentUpdate)`
`59`		`- api.ShowMsg("Update found", "Updating...");`
	`60`	`+ api.ShowMsg(api.GetTranslation("update_flowlauncher_update_found"),`
	`61`	`+ api.GetTranslation("update_flowlauncher_updating"));`
`60`	`62`
`61`	`63`	`await updateManager.DownloadReleases(newUpdateInfo.ReleasesToApply).ConfigureAwait(false);`
`62`	`64`
`@@ -67,8 +69,9 @@ public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)`
`67`	`69`	`var targetDestination = updateManager.RootAppDirectory + $"\\app-{newReleaseVersion.ToString()}\\{DataLocation.PortableFolderName}";`
`68`	`70`	`FilesFolders.CopyAll(DataLocation.PortableDataPath, targetDestination);`
`69`	`71`	`if (!FilesFolders.VerifyBothFolderFilesEqual(DataLocation.PortableDataPath, targetDestination))`
`70`		`- MessageBox.Show("Flow Launcher was not able to move your user profile data to the new update version. Please manually " +`
`71`		`- $"move your profile data folder from {DataLocation.PortableDataPath} to {targetDestination}");`
	`72`	`+ MessageBox.Show(string.Format(api.GetTranslation("update_flowlauncher_fail_moving_portable_user_profile_data"),`
	`73`	`+ DataLocation.PortableDataPath,`
	`74`	`+ targetDestination));`
`72`	`75`	`}`
`73`	`76`	`else`
`74`	`77`	`{`
`@@ -79,15 +82,16 @@ public async Task UpdateApp(IPublicAPI api, bool silentUpdate = true)`
`79`	`82`
`80`	`83`	`Log.Info($"\|Updater.UpdateApp\|Update success:{newVersionTips}");`
`81`	`84`
`82`		`- if (MessageBox.Show(newVersionTips, "New Update", MessageBoxButton.YesNo) == MessageBoxResult.Yes)`
	`85`	`+ if (MessageBox.Show(newVersionTips, api.GetTranslation("update_flowlauncher_new_update"), MessageBoxButton.YesNo) == MessageBoxResult.Yes)`
`83`	`86`	`{`
`84`	`87`	`UpdateManager.RestartApp(Constant.ApplicationFileName);`
`85`	`88`	`}`
`86`	`89`	`}`
`87`	`90`	`catch (Exception e) when (e is HttpRequestException \|\| e is WebException \|\| e is SocketException)`
`88`	`91`	`{`
`89`	`92`	`Log.Exception($"\|Updater.UpdateApp\|Check your connection and proxy settings to github-cloud.s3.amazonaws.com.", e);`
`90`		`- api.ShowMsg("Update Failed", "Check your connection and try updating proxy settings to github-cloud.s3.amazonaws.com.");`
	`93`	`+ api.ShowMsg(api.GetTranslation("update_flowlauncher_fail"),`
	`94`	`+ api.GetTranslation("update_flowlauncher_check_connection"));`
`91`	`95`	`return;`
`92`	`96`	`}`
`93`	`97`	`}`