Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions src/.build/lessmsi.msbuild
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,14 @@
<!-- TheCulture is MSBuild's so-called "Item Metadata". See https://learn.microsoft.com/en-us/visualstudio/msbuild/msbuild-items?view=vs-2022&source=recommendations#item-metadata -->
<TheCulture>fi</TheCulture>
</DeployFiles>
<DeployFiles Include="$(RootDir)\LessMsi.Gui\bin\Release\sr-Cyrl\lessmsi-gui.resources.dll">
<!-- TheCulture is MSBuild's so-called "Item Metadata". See https://learn.microsoft.com/en-us/visualstudio/msbuild/msbuild-items?view=vs-2022&source=recommendations#item-metadata -->
<TheCulture>sr-Cyrl</TheCulture>
</DeployFiles>
<DeployFiles Include="$(RootDir)\LessMsi.Gui\bin\Release\sr-Latn\lessmsi-gui.resources.dll">
<!-- TheCulture is MSBuild's so-called "Item Metadata". See https://learn.microsoft.com/en-us/visualstudio/msbuild/msbuild-items?view=vs-2022&source=recommendations#item-metadata -->
<TheCulture>sr-Latn</TheCulture>
</DeployFiles>
<DeployFiles Include="$(RootDir)\packages\libmspack4n.0.9.10\lib\net40\libmspackn.dll"></DeployFiles>
<DeployFiles Include="$(RootDir)\packages\libmspack4n.0.9.10\build\x86\mspack.dll"></DeployFiles>
<DeployFiles Include="$(RootDir)\packages\LessIO.1.0.34\lib\net40\LessIO.dll"></DeployFiles>
Expand Down
17 changes: 9 additions & 8 deletions src/LessMsi.Gui/ChangeLanguageForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using System.Globalization;
using System.Windows.Forms;
using System.Collections.Generic;
using LessMsi.Gui.Extensions;

namespace LessMsi.Gui
{
Expand All @@ -21,7 +22,7 @@ public ChangeLanguageForm()
{
InitializeComponent();

m_CurrentCheckedLang = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName;
m_CurrentCheckedLang = Thread.CurrentThread.CurrentUICulture.Name;

setGUIData();

Expand Down Expand Up @@ -83,26 +84,26 @@ private void generateRadioButtons()
radioButtonsPanel.Controls.Clear();
m_RadioButtonDict = new Dictionary<string, RadioButton>();

string currentTwoLetterLang = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName;
var currentCulture = Thread.CurrentThread.CurrentUICulture;

for (int i = 0; i < m_CultureInfoDict.Count; i++)
{
var currentCultureKey = m_CultureInfoDict.ElementAt(i).Key;
var currentCultureInfo = m_CultureInfoDict.ElementAt(i).Value;
var cultureName = m_CultureInfoDict.ElementAt(i).Key;
var cultureInfo = m_CultureInfoDict.ElementAt(i).Value;

var radioButton = new RadioButton
{
Name = currentCultureKey,
Text = currentCultureInfo.DisplayName,
Name = cultureName,
Text = cultureInfo.DisplayName,
AutoSize = true,
Margin = new Padding(5),
Location = new System.Drawing.Point(10, 25 * i),
Checked = currentTwoLetterLang == currentCultureKey
Checked = currentCulture.BelongsTo(cultureInfo)
};

radioButton.CheckedChanged += OnRadioButtonCheckedChanged;

m_RadioButtonDict.Add(currentCultureKey, radioButton);
m_RadioButtonDict.Add(cultureName, radioButton);

radioButtonsPanel.Controls.Add(radioButton);
}
Expand Down
29 changes: 29 additions & 0 deletions src/LessMsi.Gui/Extensions/CultureInfoExtensions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
using System.Globalization;

namespace LessMsi.Gui.Extensions
{
public static class CultureInfoExtensions
{
public static bool BelongsTo(this CultureInfo culture, CultureInfo target)
{
if (culture == null || target == null)
{
return false;
}

var current = culture;

while (!current.Equals(CultureInfo.InvariantCulture))
{
if (current.Equals(target))
{
return true;
}

current = current.Parent;
}

return false;
}
}
}
3 changes: 3 additions & 0 deletions src/LessMsi.Gui/LessMsi.Gui.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
<Compile Include="ChangeLanguageForm.Designer.cs">
<DependentUpon>ChangeLanguageForm.cs</DependentUpon>
</Compile>
<Compile Include="Extensions\CultureInfoExtensions.cs" />
<Compile Include="Extensions\SummaryInformationExtensions.cs" />
<Compile Include="ExtractionProgressDialog.cs">
<SubType>Form</SubType>
Expand Down Expand Up @@ -168,6 +169,8 @@
<EmbeddedResource Include="Resources\Languages\Strings.es.resx" />
<EmbeddedResource Include="Resources\Languages\Strings.ru.resx" />
<EmbeddedResource Include="Resources\Languages\Strings.sq.resx" />
<EmbeddedResource Include="Resources\Languages\Strings.sr-Cyrl.resx" />
<EmbeddedResource Include="Resources\Languages\Strings.sr-Latn.resx" />
<EmbeddedResource Include="Resources\Languages\Strings.ko.resx" />
<EmbeddedResource Include="Resources\Languages\Strings.zh.resx" />
<EmbeddedResource Include="Resources\Languages\Strings.no.resx" />
Expand Down
2 changes: 1 addition & 1 deletion src/LessMsi.Gui/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1057,7 +1057,7 @@ private void changeLangToolStripMenuItem_Click(object sender, EventArgs e)
string newSelectedLanguage = changeLanguageForm.NewSelectedLanguage;
if (newSelectedLanguage != string.Empty)
{
Thread.CurrentThread.CurrentUICulture = CultureInfo.CreateSpecificCulture(newSelectedLanguage);
Thread.CurrentThread.CurrentUICulture = new CultureInfo(newSelectedLanguage);

Controls.Clear();
InitializeComponent();
Expand Down
Loading