From e11c7a7c12fb8a7df42c33221451b051468a5fab Mon Sep 17 00:00:00 2001 From: DB p Date: Fri, 23 Dec 2022 13:22:41 +0900 Subject: [PATCH 1/5] Remove Duplicated Key --- Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml index 8de75fe70..0ca2a9315 100644 --- a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml +++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/ko.xaml @@ -13,7 +13,6 @@ 삭제 편집 추가 - 사용 Disabled 확인 @@ -36,7 +35,7 @@ 이름 - 상태 + 사용 아이콘 선택 아이콘 From f97c9fe249368a15da1be06e71d20bb0302252b3 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Fri, 23 Dec 2022 13:14:54 +0800 Subject: [PATCH 2/5] Update wording for consistency --- Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml index 94b46b230..5678a3177 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml @@ -66,7 +66,7 @@ Copy path - Copy path of current result to clipboard + Copy path of current item to clipboard Copy Copy current file to clipboard Copy current folder to clipboard @@ -78,7 +78,7 @@ Run as different user Run the selected using a different user account Open containing folder - Opens the location that contains the item + Opens the location that contains current item Open With Editor: Failed to open file at {0} with Editor {1} at {2} Open With Shell: @@ -89,7 +89,7 @@ Manage indexed files and folders Failed to open Windows Indexing Options Add to Quick Access - Add current result to Quick Access + Add current item to Quick Access Successfully Added Successfully added to Quick Access Successfully Removed @@ -97,7 +97,7 @@ Add to Quick Access so it can be opened with Explorer's Search Activation action keyword Remove from Quick Access Remove from Quick Access - Remove current result from Quick Access + Remove current item from Quick Access Show Windows Context Menu From 599bdc42facad14f093ff593dc8c073b80ee0569 Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Fri, 23 Dec 2022 13:20:10 +0800 Subject: [PATCH 3/5] Remove quotation marks --- Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml index 5678a3177..acdb21471 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml @@ -130,6 +130,6 @@ Click here to start it Unable to find an Everything installation, would you like to manually select a location?{0}{0}Click no and Everything will be automatically installed for you Do you want to enable content search for Everything? - "It can be very slow without index (which is only supported in Everything v1.5+)" + It can be very slow without index (which is only supported in Everything v1.5+) From 87597625d59b9d4fad70c1687c7ddcec42148f3b Mon Sep 17 00:00:00 2001 From: Vic <10308169+VictoriousRaptor@users.noreply.github.com> Date: Fri, 23 Dec 2022 14:58:13 +0800 Subject: [PATCH 4/5] Remove Segoe UI to fix Chinese font --- Flow.Launcher/CustomShortcutSetting.xaml | 1 - 1 file changed, 1 deletion(-) diff --git a/Flow.Launcher/CustomShortcutSetting.xaml b/Flow.Launcher/CustomShortcutSetting.xaml index bbf6ff9f2..5a40a77b1 100644 --- a/Flow.Launcher/CustomShortcutSetting.xaml +++ b/Flow.Launcher/CustomShortcutSetting.xaml @@ -64,7 +64,6 @@ Date: Fri, 23 Dec 2022 15:15:11 +0800 Subject: [PATCH 5/5] Fix hardcoded strings --- .../Languages/en.xaml | 5 +++++ .../Search/ResultManager.cs | 22 +++++-------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml index 94b46b230..265b26296 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml @@ -99,6 +99,11 @@ Remove from Quick Access Remove current result from Quick Access Show Windows Context Menu + + + {0} free of {1} + Open in Default File Manager + Use '>' to search in this directory, '*' to search for file extensions or '>*' to combine both searches. Failed to load Everything SDK diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs index 88bfecc14..214a779e4 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs @@ -96,7 +96,9 @@ namespace Flow.Launcher.Plugin.Explorer.Search var driveLetter = path[..1].ToUpper(); var driveName = driveLetter + ":\\"; DriveInfo drv = new DriveInfo(driveLetter); - var subtitle = ToReadableSize(drv.AvailableFreeSpace, 2) + " free of " + ToReadableSize(drv.TotalSize, 2); + var freespace = ToReadableSize(drv.AvailableFreeSpace, 2); + var totalspace = ToReadableSize(drv.TotalSize, 2); + var subtitle = string.Format(Context.API.GetTranslation("plugin_explorer_diskfreespace"), freespace, totalspace); double usingSize = (Convert.ToDouble(drv.TotalSize) - Convert.ToDouble(drv.AvailableFreeSpace)) / Convert.ToDouble(drv.TotalSize) * 100; int? progressValue = Convert.ToInt32(usingSize); @@ -170,25 +172,11 @@ namespace Flow.Launcher.Plugin.Explorer.Search // Path passed from PathSearchAsync ends with Constants.DirectorySeperator ('\'), need to remove the seperator // so it's consistent with folder results returned by index search which does not end with one var folderPath = path.TrimEnd(Constants.DirectorySeperator); - - var folderName = folderPath.TrimEnd(Constants.DirectorySeperator).Split(new[] - { - Path.DirectorySeparatorChar - }, StringSplitOptions.None).Last(); - - var title = $"Open {folderName}"; - - var subtitleFolderName = folderName; - - // ie. max characters can be displayed without subtitle cutting off: "Program Files (x86)" - if (folderName.Length > 19) - subtitleFolderName = "the directory"; return new Result { - Title = title, - SubTitle = $"Use > to search within {subtitleFolderName}, " + - $"* to search for file extensions or >* to combine both searches.", + Title = Context.API.GetTranslation("plugin_explorer_openresultfolder"), + SubTitle = Context.API.GetTranslation("plugin_explorer_openresultfolder_subtitle"), AutoCompleteText = GetPathWithActionKeyword(folderPath, ResultType.Folder, actionKeyword), IcoPath = folderPath, Score = 500,