Skip to content
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

Jump to bottom

Fix incorrect localization causing crashes in RegisterCommandHandler and KeyGestures #919

Merged
merged 10 commits into from
Jun 12, 2019
Merged

Fix incorrect localization causing crashes in RegisterCommandHandler and KeyGestures #919

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7fba804
Move const stirings from resx to source
ryalanms May 31, 2019
78bf723
Remove const strings from strings.resx
ryalanms May 31, 2019
c0bf261
Update XLFs
ryalanms May 31, 2019
bbb5e63
Merge branch 'master' into dev/ryalanms/presentationframework_strings
ryalanms Jun 11, 2019
95716b2
Regenerate DE xlf after merge
ryalanms Jun 11, 2019
3261722
Update xlfs
ryalanms Jun 11, 2019
4b0dcf2
PR feedback
ryalanms Jun 12, 2019
8664ceb
PR feedback. Add a string variable for task name logging strings.
ryalanms Jun 12, 2019
dcea4ed
Use nameof for PBT task names
ryalanms Jun 12, 2019
8ad8532
PR Feedback: Document untranslated strings
ryalanms Jun 12, 2019
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
2 changes: 1 addition & 1 deletion ...oft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/FileClassifier.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public override bool Execute()

try
{
TaskHelper.DisplayLogo(Log, SR.Get(SRID.FileClassifierTask));
TaskHelper.DisplayLogo(Log, "FileClassifier");
ryalanms marked this conversation as resolved.
Show resolved Hide resolved

ret = VerifyTaskInputs();

Expand Down
2 changes: 1 addition & 1 deletion ...DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass1.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public MarkupCompilePass1( ) : base(SR.SharedResourceManager)
/// <returns></returns>
public override bool Execute()
{
TaskHelper.DisplayLogo(Log, SR.Get(SRID.MarkupCompilePass1Task));
TaskHelper.DisplayLogo(Log, "MarkupCompilePass1");

bool bSuccess = true;

Expand Down
2 changes: 1 addition & 1 deletion ...DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MarkupCompilePass2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public MarkupCompilePass2( ) : base(SR.SharedResourceManager)
/// <returns></returns>
public override bool Execute()
{
TaskHelper.DisplayLogo(Log, SR.Get(SRID.MarkupCompilePass2Task));
TaskHelper.DisplayLogo(Log, "MarkupCompilePass2");

//
// Create the TaskFileService instance here
Expand Down
2 changes: 1 addition & 1 deletion ...f/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/MergeLocalizationDirectives.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public MergeLocalizationDirectives() : base(SR.SharedResourceManager)
/// </summary>
public override bool Execute()
{
TaskHelper.DisplayLogo(Log, SR.Get(SRID.MergeLocalizationDirectivesTask));
TaskHelper.DisplayLogo(Log, "MergeLocalizationDirectives");
if (GeneratedLocalizationFiles.Length > 0)
{
try {
Expand Down
2 changes: 1 addition & 1 deletion ...DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/ResourcesGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public ResourcesGenerator ( )

public override bool Execute()
{
TaskHelper.DisplayLogo(Log, SR.Get(SRID.ResourcesGeneratorTask));
TaskHelper.DisplayLogo(Log, "ResourcesGenerator");

//
// Validate the property settings
Expand Down
2 changes: 1 addition & 1 deletion ...crosoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/UidManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public UidManager() : base(SR.SharedResourceManager)
/// </summary>
public override bool Execute()
{
TaskHelper.DisplayLogo(Log, SR.Get(SRID.UidManagerTask));
TaskHelper.DisplayLogo(Log, "UidManagerTask");
rladuca marked this conversation as resolved.
Show resolved Hide resolved

if (MarkupFiles == null || MarkupFiles.Length == 0)
{
Expand Down
2 changes: 1 addition & 1 deletion ...esentationBuildTasks/Microsoft/Build/Tasks/Windows/UpdateManifestForBrowserApplication.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ public UpdateManifestForBrowserApplication()
public override bool Execute()
{
bool successful = true;
TaskHelper.DisplayLogo(Log, SR.Get(SRID.UpdateManifestForBrowserApplicationTask));
TaskHelper.DisplayLogo(Log, "UpdateManifestForBrowserApplication");

if (HostInBrowser != true)
{
Expand Down
26 changes: 1 addition & 25 deletions src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,30 +132,6 @@
<data name="FileResolved" xml:space="preserve">
<value>Input file '{0}' is resolved to new relative path '{1}' at directory '{2}'.</value>
</data>
<data name="MarkupCompilePass1Task" xml:space="preserve">
ryalanms marked this conversation as resolved.
Show resolved Hide resolved
<value>MarkupCompilePass1</value>
</data>
<data name="FileClassifierTask" xml:space="preserve">
<value>FileClassifier</value>
</data>
<data name="MarkupCompilePass2Task" xml:space="preserve">
<value>MarkupCompilePass2</value>
</data>
<data name="UidManagerTask" xml:space="preserve">
<value>UidManager</value>
</data>
<data name="ResourcesGeneratorTask" xml:space="preserve">
<value>ResourcesGenerator</value>
</data>
<data name="MergeLocalizationDirectivesTask" xml:space="preserve">
<value>MergeLocalizationDirectives</value>
</data>
<data name="UpdateManifestForBrowserApplicationTask" xml:space="preserve">
<value>UpdateManifestForBrowserApplication</value>
</data>
<data name="GetWinFXPathTask" xml:space="preserve">
<value>GetWinFXPath</value>
</data>
<data name="CompileSucceed_Pass1" xml:space="preserve">
<value>MarkupCompilePass1 successfully generated BAML or source code files.</value>
</data>
Expand Down Expand Up @@ -858,4 +834,4 @@
<data name="ParserMarkupExtensionMalformedBracketCharacers" xml:space="preserve">
<value>MC8002: BracketCharacter '{0}' at Line Number '{1}' and Line Position '{2}' does not have a corresponding opening/closing BracketCharacter.</value>
</data>
</root>
</root>
40 changes: 0 additions & 40 deletions src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Resources/xlf/Strings.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,6 @@
<target state="translated">MC6021: {0}: Na tomto tagu nelze specifikovat třídu FieldModifier, protože buď nemá atribut {0}: Name nebo Name atribut není nastaven, nebo je tag lokálně definován a má parametr Name nastaven, což není povoleno.</target>
<note />
</trans-unit>
<trans-unit id="FileClassifierTask">
<source>FileClassifier</source>
<target state="translated">FileClassifier</target>
<note />
</trans-unit>
<trans-unit id="FileNotFound">
<source>BG1002: File '{0}' cannot be found.</source>
<target state="translated">BG1002: Soubor {0} nelze nalézt.</target>
Expand Down Expand Up @@ -142,11 +137,6 @@
<target state="translated">Vygenerovaný soubor kódu: {0}.</target>
<note />
</trans-unit>
<trans-unit id="GetWinFXPathTask">
<source>GetWinFXPath</source>
<target state="translated">GetWinFXPath</target>
<note />
</trans-unit>
<trans-unit id="IllegalCDataTextScoping">
<source>MC6003: '{0}:{1}' contains '{2}'. '{0}:{1}' cannot contain nested content.</source>
<target state="translated">MC6003: Soubor {0}:{1} obsahuje obsah souboru {2}. Soubor {0}:{1} nemůže obsahovat vnořený obsah.</target>
Expand Down Expand Up @@ -252,26 +242,11 @@
<target state="translated">Vstup: Místní referenční soubor označení Page: {0}.</target>
<note />
</trans-unit>
<trans-unit id="MarkupCompilePass1Task">
<source>MarkupCompilePass1</source>
<target state="translated">MarkupCompilePass1</target>
<note />
</trans-unit>
<trans-unit id="MarkupCompilePass2Task">
<source>MarkupCompilePass2</source>
<target state="translated">MarkupCompilePass2</target>
<note />
</trans-unit>
<trans-unit id="MatchingTypeArgsNotFoundInRefType">
<source>MC6012: '{0}' event has a generic event handler delegate type '{1}'. The type parameter '{2}' on '{1}' does not match any type parameters on the containing generic tag '{3}'.</source>
<target state="translated">MC6012: Událost {0} má ovladač generických událostí typu {1}. Typový parametr {2} v souboru {1} neodpovídá žádným typovým parametrům generického tagu {3}, který jej obsahuje.</target>
<note />
</trans-unit>
<trans-unit id="MergeLocalizationDirectivesTask">
<source>MergeLocalizationDirectives</source>
<target state="translated">MergeLocalizationDirectives</target>
<note />
</trans-unit>
<trans-unit id="MissingClassDefinitionForCodeTag">
<source>MC6026: '{0}' root element requires a {1}:Class attribute because '{2}' contains a {1}:Code tag. Either remove {1}:Code and its contents, or add a {1}:Class attribute to the root element.</source>
<target state="translated">MC6026: Kořenový prvek{0} vyžaduje atribut {1}:Class, protože prvek {2} obsahuje tag {1}:Code. Buď odstraňte {1}:Code a jeho obsah, nebo přidejte atribut {1}:Class do kořenového prvku.</target>
Expand Down Expand Up @@ -872,11 +847,6 @@
<target state="translated">Generuji soubor .resources: {0}...</target>
<note />
</trans-unit>
<trans-unit id="ResourcesGeneratorTask">
<source>ResourcesGenerator</source>
<target state="translated">ResourcesGenerator</target>
<note />
</trans-unit>
<trans-unit id="RoutedEventNotRegistered">
<source>MC6006: {0}.{1}="{2}" is not valid. '{1}' must be a RoutedEvent registered with a name that ends with the keyword "Event".</source>
<target state="translated">MC6006: Rovnice {0}.{1}={2} není platná. {1} musí být třída RoutedEvent registrovaná pro název, který končí klíčovým slovem Event.</target>
Expand Down Expand Up @@ -1032,11 +1002,6 @@
<target state="translated">MC7001: Program narazil na předčasné ukončení řetězce.</target>
<note />
</trans-unit>
<trans-unit id="UidManagerTask">
<source>UidManager</source>
<target state="translated">UidManager</target>
<note />
</trans-unit>
<trans-unit id="UidMissing">
<source>UM1003: Uid is missing for element '{0}'.</source>
<target state="translated">UM1003: Chybí identifikátor Uid pro prvek {0}.</target>
Expand Down Expand Up @@ -1087,11 +1052,6 @@
<target state="translated">LC1003: Lokalizační poznámka nemá nastavenu hodnotu pro cílovou vlastnost: {0}.</target>
<note />
</trans-unit>
<trans-unit id="UpdateManifestForBrowserApplicationTask">
<source>UpdateManifestForBrowserApplication</source>
<target state="translated">UpdateManifestForBrowserApplication</target>
<note />
</trans-unit>
<trans-unit id="VersionNumberComponentNegative">
<source>MC4501: Major and minor version number components cannot be negative.</source>
<target state="translated">MC4501: Komponenty čísla hlavní verze a podverze nemohou být záporné.</target>
Expand Down
40 changes: 0 additions & 40 deletions src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Resources/xlf/Strings.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,6 @@
<target state="translated">MC6021: "{0}:FieldModifier" kann nicht für dieses Tag angegeben werden, da entweder kein "{0}:Name" oder Name-Attribut festgelegt ist, oder da das Tag lokal definiert wurde und ein nicht zulässiges Name-Attribut besitzt.</target>
<note />
</trans-unit>
<trans-unit id="FileClassifierTask">
<source>FileClassifier</source>
<target state="translated">FileClassifier</target>
<note />
</trans-unit>
<trans-unit id="FileNotFound">
<source>BG1002: File '{0}' cannot be found.</source>
<target state="translated">BG1002: Die Datei "{0}" wurde nicht gefunden.</target>
Expand Down Expand Up @@ -142,11 +137,6 @@
<target state="translated">Codedatei wurde generiert: "{0}".</target>
<note />
</trans-unit>
<trans-unit id="GetWinFXPathTask">
<source>GetWinFXPath</source>
<target state="translated">GetWinFXPath</target>
<note />
</trans-unit>
<trans-unit id="IllegalCDataTextScoping">
<source>MC6003: '{0}:{1}' contains '{2}'. '{0}:{1}' cannot contain nested content.</source>
<target state="translated">MC6003: "{0}:{1}" enthält "{2}". "{0}:{1}" darf keine geschachtelten Inhalte enthalten.</target>
Expand Down Expand Up @@ -252,26 +242,11 @@
<target state="translated">Eingabe: Lokale Verweismarkupdatei für "Page": "{0}".</target>
<note />
</trans-unit>
<trans-unit id="MarkupCompilePass1Task">
<source>MarkupCompilePass1</source>
<target state="translated">MarkupCompilePass1</target>
<note />
</trans-unit>
<trans-unit id="MarkupCompilePass2Task">
<source>MarkupCompilePass2</source>
<target state="translated">MarkupCompilePass2</target>
<note />
</trans-unit>
<trans-unit id="MatchingTypeArgsNotFoundInRefType">
<source>MC6012: '{0}' event has a generic event handler delegate type '{1}'. The type parameter '{2}' on '{1}' does not match any type parameters on the containing generic tag '{3}'.</source>
<target state="translated">MC6012: Ereignis "{0}" besitzt den generischen Ereignishandler-Delegattyp "{1}". Der Typparameter "{2}" für "{1}" entspricht keinem der im generischen Tag "{3}" enthaltenen Typparameter.</target>
<note />
</trans-unit>
<trans-unit id="MergeLocalizationDirectivesTask">
<source>MergeLocalizationDirectives</source>
<target state="translated">MergeLocalizationDirectives</target>
<note />
</trans-unit>
<trans-unit id="MissingClassDefinitionForCodeTag">
<source>MC6026: '{0}' root element requires a {1}:Class attribute because '{2}' contains a {1}:Code tag. Either remove {1}:Code and its contents, or add a {1}:Class attribute to the root element.</source>
<target state="translated">MC6026: Für das Stammattribut "{0}" ist ein {1}:Class-Attribut erforderlich, da "{2}" ein {1}:Code-Tag enthält. Entfernen Sie entweder {1}:Code und dessen Inhalt, oder fügen Sie dem Stammelement ein {1}:Class-Attribut hinzu.</target>
Expand Down Expand Up @@ -872,11 +847,6 @@
<target state="translated">.resources-Datei "{0}" wird generiert...</target>
<note />
</trans-unit>
<trans-unit id="ResourcesGeneratorTask">
<source>ResourcesGenerator</source>
<target state="translated">ResourcesGenerator</target>
<note />
</trans-unit>
<trans-unit id="RoutedEventNotRegistered">
<source>MC6006: {0}.{1}="{2}" is not valid. '{1}' must be a RoutedEvent registered with a name that ends with the keyword "Event".</source>
<target state="translated">MC6006: {0}.{1}="{2}" ist ungültig. "{1}" muss ein RoutedEvent sein, das mit einem Namen registriert wurde, der mit dem Schlüsselwort "Event" endet.</target>
Expand Down Expand Up @@ -1032,11 +1002,6 @@
<target state="translated">MC7001: Es wurde ein vorzeitiger Zeichenfolgenabschluss erkannt.</target>
<note />
</trans-unit>
<trans-unit id="UidManagerTask">
<source>UidManager</source>
<target state="translated">UidManager</target>
<note />
</trans-unit>
<trans-unit id="UidMissing">
<source>UM1003: Uid is missing for element '{0}'.</source>
<target state="translated">UM1003: Die Uid fehlt für das Element "{0}".</target>
Expand Down Expand Up @@ -1087,11 +1052,6 @@
<target state="translated">LC1003: Der Lokalisierungskommentar besitzt keinen festgelegten Wert für die Zieleigenschaft: "{0}".</target>
<note />
</trans-unit>
<trans-unit id="UpdateManifestForBrowserApplicationTask">
<source>UpdateManifestForBrowserApplication</source>
<target state="translated">UpdateManifestForBrowserApplication</target>
<note />
</trans-unit>
<trans-unit id="VersionNumberComponentNegative">
<source>MC4501: Major and minor version number components cannot be negative.</source>
<target state="translated">MC4501: Die Komponenten der Haupt- und Nebenversionsnummer können nicht negativ sein.</target>
Expand Down
40 changes: 0 additions & 40 deletions src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Resources/xlf/Strings.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,6 @@
<target state="translated">MC6021: no se puede especificar {0}:FieldModifier en esta etiqueta porque no tiene establecido el atributo {0}:Name o Name, o bien la etiqueta está definida localmente y tiene un atributo Name establecido, que no está permitido.</target>
<note />
</trans-unit>
<trans-unit id="FileClassifierTask">
<source>FileClassifier</source>
<target state="translated">FileClassifier</target>
<note />
</trans-unit>
<trans-unit id="FileNotFound">
<source>BG1002: File '{0}' cannot be found.</source>
<target state="translated">BG1002: no se encuentra el archivo '{0}'.</target>
Expand Down Expand Up @@ -142,11 +137,6 @@
<target state="translated">Archivo de código generado: '{0}'.</target>
<note />
</trans-unit>
<trans-unit id="GetWinFXPathTask">
<source>GetWinFXPath</source>
<target state="translated">GetWinFXPath</target>
<note />
</trans-unit>
<trans-unit id="IllegalCDataTextScoping">
<source>MC6003: '{0}:{1}' contains '{2}'. '{0}:{1}' cannot contain nested content.</source>
<target state="translated">MC6003: '{0}:{1}' contiene '{2}'. '{0}:{1}' no puede tener contenido anidado.</target>
Expand Down Expand Up @@ -252,26 +242,11 @@
<target state="translated">Entrada: el archivo Page de marcado de referencia local es: '{0}'.</target>
<note />
</trans-unit>
<trans-unit id="MarkupCompilePass1Task">
<source>MarkupCompilePass1</source>
<target state="translated">MarkupCompilePass1</target>
<note />
</trans-unit>
<trans-unit id="MarkupCompilePass2Task">
<source>MarkupCompilePass2</source>
<target state="translated">MarkupCompilePass2</target>
<note />
</trans-unit>
<trans-unit id="MatchingTypeArgsNotFoundInRefType">
<source>MC6012: '{0}' event has a generic event handler delegate type '{1}'. The type parameter '{2}' on '{1}' does not match any type parameters on the containing generic tag '{3}'.</source>
<target state="translated">MC6012: el evento '{0}' tiene un tipo delegado de controlador de eventos genérico '{1}'. El parámetro de tipo '{2}' de '{1}' no coincide con ningún parámetro de tipo de la etiqueta genérica contenedora '{3}'.</target>
<note />
</trans-unit>
<trans-unit id="MergeLocalizationDirectivesTask">
<source>MergeLocalizationDirectives</source>
<target state="translated">MergeLocalizationDirectives</target>
<note />
</trans-unit>
<trans-unit id="MissingClassDefinitionForCodeTag">
<source>MC6026: '{0}' root element requires a {1}:Class attribute because '{2}' contains a {1}:Code tag. Either remove {1}:Code and its contents, or add a {1}:Class attribute to the root element.</source>
<target state="translated">MC6026: el elemento raíz '{0}' requiere un atributo {1}:Class porque '{2}' contiene una etiqueta {1}:Code. Quite {1}:Code y su contenido o agregue un atributo {1}:Class al elemento raíz.</target>
Expand Down Expand Up @@ -872,11 +847,6 @@
<target state="translated">Generando archivo .resources: '{0}'...</target>
<note />
</trans-unit>
<trans-unit id="ResourcesGeneratorTask">
<source>ResourcesGenerator</source>
<target state="translated">ResourcesGenerator</target>
<note />
</trans-unit>
<trans-unit id="RoutedEventNotRegistered">
<source>MC6006: {0}.{1}="{2}" is not valid. '{1}' must be a RoutedEvent registered with a name that ends with the keyword "Event".</source>
<target state="translated">MC6006: {0}.{1}="{2}" no es válido. '{1}' debe ser un elemento RoutedEvent registrado con un nombre que termine con la palabra clave "Event".</target>
Expand Down Expand Up @@ -1032,11 +1002,6 @@
<target state="translated">MC7001: se encontró un cierre de cadena prematuro.</target>
<note />
</trans-unit>
<trans-unit id="UidManagerTask">
<source>UidManager</source>
<target state="translated">UidManager</target>
<note />
</trans-unit>
<trans-unit id="UidMissing">
<source>UM1003: Uid is missing for element '{0}'.</source>
<target state="translated">UM1003: falta un Uid para el elemento '{0}'.</target>
Expand Down Expand Up @@ -1087,11 +1052,6 @@
<target state="translated">LC1003: el comentario de localización no tiene ningún valor establecido para la propiedad de destino: '{0}'.</target>
<note />
</trans-unit>
<trans-unit id="UpdateManifestForBrowserApplicationTask">
<source>UpdateManifestForBrowserApplication</source>
<target state="translated">UpdateManifestForBrowserApplication</target>
<note />
</trans-unit>
<trans-unit id="VersionNumberComponentNegative">
<source>MC4501: Major and minor version number components cannot be negative.</source>
<target state="translated">MC4501: los componentes principal y secundario del número de versión no pueden ser negativos.</target>
Expand Down
Loading