Skip to content

Fix incorrect text for "New Tab" and "New Window" buttons #951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jjw24 merged 3 commits into from
Jan 5, 2022
Merged

Fix incorrect text for "New Tab" and "New Window" buttons #951

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f6fd982
l10n/fix: "new browser/tab" keys are mixed up
JohnTheGr8 Jan 3, 2022
845d9e5
stop using obsolete SearchWeb methods internally
JohnTheGr8 Jan 3, 2022
21775c7
bump PluginsManager version
jjw24 Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Flow.Launcher/Languages/en.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@
<system:String x:Key="defaultBrowser_name">Browser</system:String>
<system:String x:Key="defaultBrowser_profile_name">Browser Name</system:String>
<system:String x:Key="defaultBrowser_path">Browser Path</system:String>
<system:String x:Key="defaultBrowser_newtab">New Window</system:String>
<system:String x:Key="defaultBrowser_newWindow">New Tab</system:String>
<system:String x:Key="defaultBrowser_newWindow">New Window</system:String>
<system:String x:Key="defaultBrowser_newTab">New Tab</system:String>
<system:String x:Key="defaultBrowser_parameter">Private Mode</system:String>

<!-- Priority Setting Dialog -->
Expand Down
4 changes: 2 additions & 2 deletions Flow.Launcher/Languages/ko.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,8 @@
<system:String x:Key="defaultBrowser_name">브라우저</system:String>
<system:String x:Key="defaultBrowser_profile_name">브라우저 이름</system:String>
<system:String x:Key="defaultBrowser_path">브라우저 경로</system:String>
<system:String x:Key="defaultBrowser_newtab">새 창</system:String>
<system:String x:Key="defaultBrowser_newWindow">새 탭</system:String>
<system:String x:Key="defaultBrowser_newWindow">새 창</system:String>
<system:String x:Key="defaultBrowser_newTab">새 탭</system:String>
<system:String x:Key="defaultBrowser_parameter">프라이빗 모드</system:String>

<!-- Priority Setting Dialog -->
Expand Down
4 changes: 2 additions & 2 deletions Flow.Launcher/Languages/pt-pt.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@
<system:String x:Key="defaultBrowser_name">Navegador</system:String>
<system:String x:Key="defaultBrowser_profile_name">Nome do navegador</system:String>
<system:String x:Key="defaultBrowser_path">Caminho do navegador</system:String>
<system:String x:Key="defaultBrowser_newtab">Nova janela</system:String>
<system:String x:Key="defaultBrowser_newWindow">Novo separador</system:String>
<system:String x:Key="defaultBrowser_newWindow">Nova janela</system:String>
<system:String x:Key="defaultBrowser_newTab">Novo separador</system:String>
<system:String x:Key="defaultBrowser_parameter">Modo privado</system:String>

<!-- Priority Setting Dialog -->
Expand Down
4 changes: 2 additions & 2 deletions Flow.Launcher/Languages/sk.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@
<system:String x:Key="defaultBrowser_name">Prehliadač</system:String>
<system:String x:Key="defaultBrowser_profile_name">Názov prehliadača</system:String>
<system:String x:Key="defaultBrowser_path">Cesta k prehliadaču</system:String>
<system:String x:Key="defaultBrowser_newtab">Nové okno</system:String>
<system:String x:Key="defaultBrowser_newWindow">Nová karta</system:String>
<system:String x:Key="defaultBrowser_newWindow">Nové okno</system:String>
<system:String x:Key="defaultBrowser_newTab">Nová karta</system:String>
<system:String x:Key="defaultBrowser_parameter">Privátny režim</system:String>

<!-- Priority Setting Dialog -->
Expand Down
4 changes: 2 additions & 2 deletions Flow.Launcher/ReportWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ private Paragraph Hyperlink(string textBeforeUrl, string url)
var link = new Hyperlink { IsEnabled = true };
link.Inlines.Add(url);
link.NavigateUri = new Uri(url);
link.RequestNavigate += (s, e) => SearchWeb.NewTabInBrowser(e.Uri.ToString());
link.Click += (s, e) => SearchWeb.NewTabInBrowser(url);
link.RequestNavigate += (s, e) => SearchWeb.OpenInBrowserTab(e.Uri.ToString());
link.Click += (s, e) => SearchWeb.OpenInBrowserTab(url);

paragraph.Inlines.Add(textBeforeUrl);
paragraph.Inlines.Add(link);
Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher/SelectBrowserWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
VerticalAlignment="Center"
Orientation="Horizontal">
<RadioButton IsChecked="{Binding OpenInTab}"
Content="{DynamicResource defaultBrowser_newWindow}"></RadioButton>
Content="{DynamicResource defaultBrowser_newTab}"></RadioButton>
<RadioButton IsChecked="{Binding OpenInNewWindow, Mode=OneTime}"
Content="{DynamicResource defaultBrowser_newWindow}"></RadioButton>
</StackPanel>
Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher/SettingWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ private void OnPluginNameClick(object sender, MouseButtonEventArgs e)
var uri = new Uri(website);
if (Uri.CheckSchemeName(uri.Scheme))
{
website.NewTabInBrowser();
website.OpenInBrowserTab();
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions Plugins/Flow.Launcher.Plugin.PluginsManager/PluginsManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ internal List<Result> InstallFromWeb(string url)
{
if (e.SpecialKeyState.CtrlPressed)
{
SearchWeb.NewTabInBrowser(plugin.UrlDownload);
SearchWeb.OpenInBrowserTab(plugin.UrlDownload);
return ShouldHideWindow;
}

Expand Down Expand Up @@ -397,7 +397,7 @@ internal async ValueTask<List<Result>> RequestInstallOrUpdate(string searchName,
{
if (e.SpecialKeyState.CtrlPressed)
{
SearchWeb.NewTabInBrowser(x.Website);
SearchWeb.OpenInBrowserTab(x.Website);
return ShouldHideWindow;
}

Expand Down