Skip to content

Commit 94df8d9

Browse files
authored
Merge branch 'dev' into 240514ResizableWindow
2 parents a6de6c7 + 5c829e2 commit 94df8d9

File tree

45 files changed

+97
-2979
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+97
-2979
lines changed

Flow.Launcher.Core/Resource/Internationalization.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,10 @@ public void ChangeLanguage(Language language)
9696
{
9797
LoadLanguage(language);
9898
}
99-
// Culture of this thread
100-
// Use CreateSpecificCulture to preserve possible user-override settings in Windows
99+
// Culture of main thread
100+
// Use CreateSpecificCulture to preserve possible user-override settings in Windows, if Flow's language culture is the same as Windows's
101101
CultureInfo.CurrentCulture = CultureInfo.CreateSpecificCulture(language.LanguageCode);
102102
CultureInfo.CurrentUICulture = CultureInfo.CurrentCulture;
103-
// App domain
104-
CultureInfo.DefaultThreadCurrentCulture = CultureInfo.CreateSpecificCulture(language.LanguageCode);
105-
CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.DefaultThreadCurrentCulture;
106103

107104
// Raise event after culture is set
108105
Settings.Language = language.LanguageCode;
@@ -193,7 +190,7 @@ private void UpdatePluginMetadataTranslations()
193190
{
194191
p.Metadata.Name = pluginI18N.GetTranslatedPluginTitle();
195192
p.Metadata.Description = pluginI18N.GetTranslatedPluginDescription();
196-
pluginI18N.OnCultureInfoChanged(CultureInfo.DefaultThreadCurrentCulture);
193+
pluginI18N.OnCultureInfoChanged(CultureInfo.CurrentCulture);
197194
}
198195
catch (Exception e)
199196
{

Flow.Launcher.Infrastructure/Flow.Launcher.Infrastructure.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@
5757
<PackageReference Include="MemoryPack" Version="1.21.1" />
5858
<PackageReference Include="Microsoft.VisualStudio.Threading" Version="17.7.30" />
5959
<PackageReference Include="NLog" Version="4.7.10" />
60-
<PackageReference Include="NLog.Schema" Version="4.7.10" />
61-
<PackageReference Include="NLog.Web.AspNetCore" Version="4.13.0" />
6260
<PackageReference Include="PropertyChanged.Fody" Version="3.4.0" />
6361
<PackageReference Include="System.Drawing.Common" Version="7.0.0" />
6462
<!--ToolGood.Words.Pinyin v3.0.2.6 results in high memory usage when search with pinyin is enabled-->

Flow.Launcher/Converters/QuerySuggestionBoxConverter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ values[2] is not string queryText ||
4444
// Check if Text will be larger than our QueryTextBox
4545
Typeface typeface = new Typeface(queryTextBox.FontFamily, queryTextBox.FontStyle, queryTextBox.FontWeight, queryTextBox.FontStretch);
4646
// TODO: Obsolete warning?
47-
var ft = new FormattedText(queryTextBox.Text, CultureInfo.DefaultThreadCurrentCulture, System.Windows.FlowDirection.LeftToRight, typeface, queryTextBox.FontSize, Brushes.Black);
47+
var ft = new FormattedText(queryTextBox.Text, CultureInfo.CurrentCulture, System.Windows.FlowDirection.LeftToRight, typeface, queryTextBox.FontSize, Brushes.Black);
4848

4949
var offset = queryTextBox.Padding.Right;
5050

Flow.Launcher/Properties/Resources.ar-SA.resx

Lines changed: 0 additions & 127 deletions
This file was deleted.

Flow.Launcher/Properties/Resources.cs-CZ.resx

Lines changed: 0 additions & 127 deletions
This file was deleted.

0 commit comments

Comments
 (0)