forked from microsoft/terminal
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move TerminalApp's resources into the TerminalApp project (microsoft#…
…1972) * Move TerminalApp's resources into the TerminalApp project This commit also introduces a scoped resource accessor, lightly taken from microsoft-ui-xaml. It also moves all static UI strings out of App.cpp and into localizable resources. Fixes microsoft#792.
- Loading branch information
Showing
8 changed files
with
251 additions
and
65 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
174 changes: 174 additions & 0 deletions
174
src/cascadia/TerminalApp/Resources/en-US/Resources.resw
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,174 @@ | ||
| <?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="InitialJsonParseErrorText" xml:space="preserve"> | ||
| <value>Settings could not be loaded from file - temporarily using the default settings. Check for syntax errors, including trailing commas.</value> | ||
| </data> | ||
| <data name="InitialJsonParseErrorTitle" xml:space="preserve"> | ||
| <value>Failed to load settings</value> | ||
| </data> | ||
| <data name="Ok" xml:space="preserve"> | ||
| <value>Ok</value> | ||
| </data> | ||
| <data name="ReloadJsonParseErrorText" xml:space="preserve"> | ||
| <value>Settings could not be reloaded from file. Check for syntax errors, including trailing commas.</value> | ||
| </data> | ||
| <data name="ReloadJsonParseErrorTitle" xml:space="preserve"> | ||
| <value>Failed to reload settings</value> | ||
| </data> | ||
| <data name="AboutTitleText" xml:space="preserve"> | ||
| <value>About</value> | ||
| </data> | ||
| <data name="VersionLabelText" xml:space="preserve"> | ||
| <value>Version:</value> | ||
| </data> | ||
| <data name="DocumentationLabelText" xml:space="preserve"> | ||
| <value>Documentation | ||
| </value> | ||
| </data> | ||
| <data name="GettingStartedLabelText" xml:space="preserve"> | ||
| <value>Getting Started | ||
| </value> | ||
| </data> | ||
| <data name="ReleaseNotesLabelText" xml:space="preserve"> | ||
| <value>Release Notes | ||
| </value> | ||
| </data> | ||
| <data name="DocumentationUriValue" xml:space="preserve"> | ||
| <value>https://aka.ms/terminal-documentation</value> | ||
| </data> | ||
| <data name="GettingStartedUriValue" xml:space="preserve"> | ||
| <value>https://aka.ms/terminal-getting-started</value> | ||
| </data> | ||
| <data name="ReleaseNotesUriValue" xml:space="preserve"> | ||
| <value>https://aka.ms/terminal-release-notes</value> | ||
| </data> | ||
| <data name="FeedbackUriValue" xml:space="preserve"> | ||
| <value>https://aka.ms/terminal-feedback</value> | ||
| </data> | ||
| <data name="AboutMenuItem" xml:space="preserve"> | ||
| <value>About</value> | ||
| </data> | ||
| <data name="FeedbackMenuItem" xml:space="preserve"> | ||
| <value>Feedback</value> | ||
| </data> | ||
| <data name="SettingsMenuItem" xml:space="preserve"> | ||
| <value>Settings</value> | ||
| </data> | ||
| </root> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| // Copyright (c) Microsoft Corporation. | ||
| // Licensed under the MIT license. | ||
|
|
||
| #include "pch.h" | ||
|
|
||
| #include "ScopedResourceLoader.h" | ||
|
|
||
| using namespace ::winrt::Windows::ApplicationModel::Resources::Core; | ||
|
|
||
| ScopedResourceLoader::ScopedResourceLoader(const std::wstring_view resourceLocatorBase) : | ||
| _resourceMap{ ResourceManager::Current().MainResourceMap().GetSubtree(resourceLocatorBase) }, | ||
| _resourceContext{ ResourceContext::GetForViewIndependentUse() } | ||
| { | ||
| } | ||
|
|
||
| // Method Description: | ||
| // - Gets the resource map associated with the scoped resource subcompartment. | ||
| // Return Value: | ||
| // - the resource map associated with the scoped resource subcompartment. | ||
| ResourceMap ScopedResourceLoader::GetResourceMap() | ||
| { | ||
| return _resourceMap; | ||
| } | ||
|
|
||
| // Method Description: | ||
| // - Loads the localized string resource with the given key from the scoped | ||
| // resource subcompartment. | ||
| // - This resource loader is view-independent; it cannot take into account scale | ||
| // factors and view themes. Strings should not vary based on those things. | ||
| // Arguments: | ||
| // - resourceName: the key up by which to look the resource | ||
| // Return Value: | ||
| // - The final localized string for the given key. | ||
| winrt::hstring ScopedResourceLoader::GetLocalizedString(const std::wstring_view resourceName) | ||
| { | ||
| return _resourceMap.GetValue(resourceName, _resourceContext).ValueAsString(); | ||
| } |
Oops, something went wrong.