A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Added language setting
Etienne Baudoux89ce0dcb9e82
diff --git a/src/dev/def/DevTools.Core/Settings/PredefinedSettings.cs b/src/dev/def/DevTools.Core/Settings/PredefinedSettings.csindex 28b6089cf..c5de56bf5 100644--- a/src/dev/def/DevTools.Core/Settings/PredefinedSettings.cs+++ b/src/dev/def/DevTools.Core/Settings/PredefinedSettings.cs@@ -4,6 +4,15 @@ namespace DevTools.Core.Settings{public static class PredefinedSettings{+ /// <summary>+ /// The language to use for the texts in the user interface.+ /// </summary>+ public static readonly SettingDefinition<string> Language+ = new(+ name: nameof(Language),+ isRoaming: false,+ defaultValue: "default");+/// <summary>/// The color theme of the application./// </summary>diff --git a/src/dev/impl/DevTools.Common/DevTools.Common.csproj b/src/dev/impl/DevTools.Common/DevTools.Common.csprojindex e450d929e..40dbee993 100644--- a/src/dev/impl/DevTools.Common/DevTools.Common.csproj+++ b/src/dev/impl/DevTools.Common/DevTools.Common.csproj@@ -74,6 +74,7 @@<Compile Include="..\..\shared\SharedAssemblyInfo.cs"><Link>Properties\SharedAssemblyInfo.cs</Link></Compile>+ <Compile Include="LanguageDefinition.cs" /><Compile Include="Properties\AssemblyInfo.cs" /><Compile Include="LanguageManager.cs"><DependentUpon>LanguageManager.tt</DependentUpon>@@ -212,6 +213,9 @@<ItemGroup><PRIResource Include="Strings\en\RegEx.resw" /></ItemGroup>+ <ItemGroup>+ <PRIResource Include="Strings\fr\MainPage.resw" />+ </ItemGroup><Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" /><!-- To modify your build process, add your task inside one of the targets below and uncomment it.Other similar extension points exist, see Microsoft.Common.targets.diff --git a/src/dev/impl/DevTools.Common/LanguageDefinition.cs b/src/dev/impl/DevTools.Common/LanguageDefinition.csnew file mode 100644index 000000000..3fc9a6727--- /dev/null+++ b/src/dev/impl/DevTools.Common/LanguageDefinition.cs@@ -0,0 +1,25 @@+using System.Globalization;++namespace DevTools.Common+{+ /// <summary>+ /// Represents un language supported by the app.+ /// </summary>+ public struct LanguageDefinition+ {+ /// <summary>+ /// Unique internal ID used to identify the language.+ /// </summary>+ public string Identifier { get; set; }++ /// <summary>+ /// The name of the language displayed to the user.+ /// </summary>+ public string DisplayName { get; set; }++ /// <summary>+ /// The culture to apply.+ /// </summary>+ public CultureInfo Culture { get; set; }+ }+}diff --git a/src/dev/impl/DevTools.Common/LanguageManager.cs b/src/dev/impl/DevTools.Common/LanguageManager.csindex 5792aca54..e028c7b99 100644--- a/src/dev/impl/DevTools.Common/LanguageManager.cs+++ b/src/dev/impl/DevTools.Common/LanguageManager.cs@@ -9,6 +9,7 @@//------------------------------------------------------------------------------using Microsoft.Toolkit.Mvvm.ComponentModel;+using System.Collections.Generic;using System.ComponentModel;using System.Globalization;using Windows.ApplicationModel.Resources;@@ -80,6 +81,32 @@ namespace DevTools.Common/// </summary>public TextDiffStrings TextDiff => _textdiff;+ /// <summary>+ /// Gets the list of available languages in the app.+ /// </summary>+ public List<LanguageDefinition> AvailableLanguages+ => new List<LanguageDefinition>+ {+ new LanguageDefinition+ {+ Identifier = "default",+ DisplayName = Settings.DefaultLanguage,+ Culture = CultureInfo.InstalledUICulture+ },+ new LanguageDefinition+ {+ Identifier = "english",+ DisplayName = "English",+ Culture = new CultureInfo("en")+ },+ new LanguageDefinition+ {+ Identifier = "french",+ DisplayName = "français",+ Culture = new CultureInfo("fr")+ }+ };+/// <summary>/// Retrieves the current culture./// </summary>@@ -428,6 +455,11 @@ namespace DevTools.Common/// </summary>public string Dark => _resources.GetString("Dark");+ /// <summary>+ /// Gets the resource DefaultLanguage.+ /// </summary>+ public string DefaultLanguage => _resources.GetString("DefaultLanguage");+/// <summary>/// Gets the resource DisplayName./// </summary>@@ -448,6 +480,16 @@ namespace DevTools.Common/// </summary>public string HighlightCurrentLineDescription => _resources.GetString("HighlightCurrentLineDescription");+ /// <summary>+ /// Gets the resource Language.+ /// </summary>+ public string Language => _resources.GetString("Language");++ /// <summary>+ /// Gets the resource LanguageDescription.+ /// </summary>+ public string LanguageDescription => _resources.GetString("LanguageDescription");+/// <summary>/// Gets the resource Light./// </summary>diff --git a/src/dev/impl/DevTools.Common/LanguageManager.tt b/src/dev/impl/DevTools.Common/LanguageManager.ttindex d0e7f7d39..76a0edf09 100644--- a/src/dev/impl/DevTools.Common/LanguageManager.tt+++ b/src/dev/impl/DevTools.Common/LanguageManager.tt@@ -32,6 +32,7 @@//------------------------------------------------------------------------------using Microsoft.Toolkit.Mvvm.ComponentModel;+using System.Collections.Generic;using System.ComponentModel;using System.Globalization;using Windows.ApplicationModel.Resources;@@ -79,6 +80,32 @@ namespace DevTools.Common}#>+ /// <summary>+ /// Gets the list of available languages in the app.+ /// </summary>+ public List<LanguageDefinition> AvailableLanguages+ => new List<LanguageDefinition>+ {+ new LanguageDefinition+ {+ Identifier = "default",+ DisplayName = Settings.DefaultLanguage,+ Culture = CultureInfo.InstalledUICulture+ },+ new LanguageDefinition+ {+ Identifier = "english",+ DisplayName = "English",+ Culture = new CultureInfo("en")+ },+ new LanguageDefinition+ {+ Identifier = "french",+ DisplayName = "français",+ Culture = new CultureInfo("fr")+ }+ };+/// <summary>/// Retrieves the current culture./// </summary>diff --git a/src/dev/impl/DevTools.Common/Strings/en/Settings.resw b/src/dev/impl/DevTools.Common/Strings/en/Settings.reswindex b4d79768d..3d444aef9 100644--- a/src/dev/impl/DevTools.Common/Strings/en/Settings.resw+++ b/src/dev/impl/DevTools.Common/Strings/en/Settings.resw@@ -135,6 +135,9 @@<data name="Dark" xml:space="preserve"><value>Dark</value></data>+ <data name="DefaultLanguage" xml:space="preserve">+ <value>Same as Microsoft Windows</value>+ </data><data name="DisplayName" xml:space="preserve"><value>Settings</value></data>@@ -147,6 +150,12 @@<data name="HighlightCurrentLineDescription" xml:space="preserve"><value>Change the background color of the current line so it's more visible</value></data>+ <data name="Language" xml:space="preserve">+ <value>Language</value>+ </data>+ <data name="LanguageDescription" xml:space="preserve">+ <value>The app needs to be restarted when selecting another language</value>+ </data><data name="Light" xml:space="preserve"><value>Light</value></data>diff --git a/src/dev/impl/DevTools.Common/Strings/fr/MainPage.resw b/src/dev/impl/DevTools.Common/Strings/fr/MainPage.reswnew file mode 100644index 000000000..2b5ec4763--- /dev/null+++ b/src/dev/impl/DevTools.Common/Strings/fr/MainPage.resw@@ -0,0 +1,138 @@+<?xml version="1.0" encoding="utf-8"?>+<root>+ <!--+ Microsoft ResX Schema++ Version 2.0++ The primary goals of this format is to allow a simple XML format+ that is mostly human readable. The generation and parsing of the+ various data types are done through the TypeConverter classes+ associated with the data types.++ Example:++ ... ado.net/XML headers & schema ...+ <resheader name="resmimetype">text/microsoft-resx</resheader>+ <resheader name="version">2.0</resheader>+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">+ <value>[base64 mime encoded serialized .NET Framework object]</value>+ </data>+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>+ <comment>This is a comment</comment>+ </data>++ There are any number of "resheader" rows that contain simple+ name/value pairs.++ Each data row contains a name, and value. The row also contains a+ type or mimetype. Type corresponds to a .NET class that support+ text/value conversion through the TypeConverter architecture.+ Classes that don't support this are serialized and stored with the+ mimetype set.++ The mimetype is used for serialized objects, and tells the+ ResXResourceReader how to depersist the object. This is currently not+ extensible. For a given mimetype the value must be set accordingly:++ Note - application/x-microsoft.net.object.binary.base64 is the format+ that the ResXResourceWriter will generate, however the reader can+ read any of the formats listed below.++ mimetype: application/x-microsoft.net.object.binary.base64+ value : The object must be serialized with+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter+ : and then encoded with base64 encoding.++ mimetype: application/x-microsoft.net.object.soap.base64+ value : The object must be serialized with+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter+ : and then encoded with base64 encoding.++ mimetype: application/x-microsoft.net.object.bytearray.base64+ value : The object must be serialized into a byte array+ : using a System.ComponentModel.TypeConverter+ : and then encoded with base64 encoding.+ -->+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />+ <xsd:element name="root" msdata:IsDataSet="true">+ <xsd:complexType>+ <xsd:choice maxOccurs="unbounded">+ <xsd:element name="metadata">+ <xsd:complexType>+ <xsd:sequence>+ <xsd:element name="value" type="xsd:string" minOccurs="0" />+ </xsd:sequence>+ <xsd:attribute name="name" use="required" type="xsd:string" />+ <xsd:attribute name="type" type="xsd:string" />+ <xsd:attribute name="mimetype" type="xsd:string" />+ <xsd:attribute ref="xml:space" />+ </xsd:complexType>+ </xsd:element>+ <xsd:element name="assembly">+ <xsd:complexType>+ <xsd:attribute name="alias" type="xsd:string" />+ <xsd:attribute name="name" type="xsd:string" />+ </xsd:complexType>+ </xsd:element>+ <xsd:element name="data">+ <xsd:complexType>+ <xsd:sequence>+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />+ </xsd:sequence>+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />+ <xsd:attribute ref="xml:space" />+ </xsd:complexType>+ </xsd:element>+ <xsd:element name="resheader">+ <xsd:complexType>+ <xsd:sequence>+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />+ </xsd:sequence>+ <xsd:attribute name="name" type="xsd:string" use="required" />+ </xsd:complexType>+ </xsd:element>+ </xsd:choice>+ </xsd:complexType>+ </xsd:element>+ </xsd:schema>+ <resheader name="resmimetype">+ <value>text/microsoft-resx</value>+ </resheader>+ <resheader name="version">+ <value>2.0</value>+ </resheader>+ <resheader name="reader">+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>+ </resheader>+ <resheader name="writer">+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>+ </resheader>+ <data name="EnterCompactOverlayTooltip" xml:space="preserve">+ <value>Garder au premier plan (Ctrl+Up)</value>+ </data>+ <data name="ExitCompactOverlayTooltip" xml:space="preserve">+ <value>Retour en vue normal (Ctrl+Down)</value>+ </data>+ <data name="OpenInNewWindow" xml:space="preserve">+ <value>Ouvrir dans une nouvelle fenêtre</value>+ </data>+ <data name="Search" xml:space="preserve">+ <value>Taper pour recherche un outil...</value>+ </data>+ <data name="WindowTitle" xml:space="preserve">+ <value>DevTools</value>+ </data>+ <data name="WindowTitleWithToolName" xml:space="preserve">+ <value>DevTools - {0}</value>+ </data>+</root>\ No newline at end of filediff --git a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xaml b/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xamlindex 70ca81685..399bbf109 100644--- a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xaml+++ b/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolPage.xaml@@ -20,6 +20,19 @@</TransitionCollection></StackPanel.ChildrenTransitions>+ <controls:ExpandableSettingControl+ Title="{x:Bind ViewModel.Strings.Language}"+ Description="{x:Bind ViewModel.Strings.LanguageDescription}">+ <controls:ExpandableSettingControl.Icon>+ <FontIcon Glyph="" />+ </controls:ExpandableSettingControl.Icon>+ <ComboBox+ DisplayMemberPath="DisplayName"+ SelectedValuePath="Identifier"+ ItemsSource="{x:Bind ViewModel.AvailableLanguages}"+ SelectedValue="{x:Bind ViewModel.Language, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">+ </ComboBox>+ </controls:ExpandableSettingControl><controls:ExpandableSettingControlTitle="{x:Bind ViewModel.Strings.AppTheme}"Description="{x:Bind ViewModel.Strings.AppThemeDescription}">diff --git a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolViewModel.cs b/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolViewModel.csindex c71334631..e8ca570b2 100644--- a/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolViewModel.cs+++ b/src/dev/impl/DevTools.Impl/Views/Settings/SettingsToolViewModel.cs@@ -6,6 +6,7 @@ using DevTools.Core.Theme;using DevTools.Providers;using Microsoft.Toolkit.Mvvm.ComponentModel;using System;+using System.Collections.Generic;using System.Composition;using System.Reflection;@@ -20,6 +21,14 @@ namespace DevTools.Impl.Views.Settingsinternal SettingsStrings Strings => LanguageManager.Instance.Settings;+ internal List<LanguageDefinition> AvailableLanguages => LanguageManager.Instance.AvailableLanguages;++ internal string Language+ {+ get => _settingsProvider.GetSetting(PredefinedSettings.Language);+ set => _settingsProvider.SetSetting(PredefinedSettings.Language, value);+ }+internal AppTheme Theme{get => _settingsProvider.GetSetting(PredefinedSettings.Theme);diff --git a/src/dev/startup/DevTools/App.xaml.cs b/src/dev/startup/DevTools/App.xaml.csindex f3107caaf..0f1eb39a1 100644--- a/src/dev/startup/DevTools/App.xaml.cs+++ b/src/dev/startup/DevTools/App.xaml.cs@@ -5,12 +5,14 @@ using DevTools.Core;using DevTools.Core.Impl.Injection;using DevTools.Core.Injection;using DevTools.Core.Navigation;+using DevTools.Core.Settings;using DevTools.Core.Theme;using DevTools.Core.Threading;using DevTools.Impl.Views;using DevTools.Providers;using System;using System.Globalization;+using System.Linq;using System.Threading.Tasks;using Windows.ApplicationModel;using Windows.ApplicationModel.Activation;@@ -38,7 +40,8 @@ namespace DevTools/// </summary>public App(){- // Set the language of the app.+ // Set the language of the app for startup. By default, it's the same than Windows, or english.+ // The language defined by the user will be applied later, once MEF is loaded, but before the UI shows up.LanguageManager.Instance.SetCurrentCulture(CultureInfo.InstalledUICulture);// Initialize MEF@@ -186,7 +189,12 @@ namespace DevToolsWindow.Current.Content = rootFrame;}- await _mefComposer;+ // Set the user-defined language.+ string languageIdentifier = (await _mefComposer).ExportProvider.GetExport<ISettingsProvider>().GetSetting(PredefinedSettings.Language);+ LanguageDefinition languageDefinition = LanguageManager.Instance.AvailableLanguages.First(l => string.Equals(l.Identifier, languageIdentifier));+ LanguageManager.Instance.SetCurrentCulture(languageDefinition.Culture);++ // Apply the app color theme.(await _themeListener.Value).ApplyDesiredColorTheme();return rootFrame;