Skip to content

Commit

Permalink
Trying something else with CA2017 regarding localization
Browse files Browse the repository at this point in the history 
* Needed to have a title and description that match *both* potential reasons for this warning
* The individual messages for the differing reasons is still separate, but the MD/sarif description seemed to be "last wins" when it comes to a title/description
* The `msbuild /t:pack` command kept failing for me, so upped the global.json to target a non preview .net8 SDK, but am not checking that change in
  • Loading branch information
@Kritner
Kritner committed Apr 11, 2024
1 parent 80777b5 commit 78c69e7
Show file tree
Hide file tree
Showing 18 changed files with 91 additions and 242 deletions.
14 changes: 4 additions & 10 deletions ...nalyzers/Core/Microsoft.CodeQuality.Analyzers/MicrosoftCodeQualityAnalyzersResources.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,24 +180,18 @@
<data name="LoggerMessageDiagnosticNumericsInFormatStringDescription" xml:space="preserve">
<value>Named placeholders in the logging message template should not be comprised of only numeric characters.</value>
</data>
<data name="LoggerMessageDiagnosticFormatParameterCountMismatchTitle" xml:space="preserve">
<value>Parameter count mismatch</value>
<data name="LoggerMessageDiagnosticFormatParameterCountOrBracesMismatchTitle" xml:space="preserve">
<value>Parameter count mismatch or invalid braces in message template</value>
</data>
<data name="LoggerMessageDiagnosticFormatParameterCountMismatchMessage" xml:space="preserve">
<value>Number of parameters supplied in the logging message template do not match the number of named placeholders</value>
</data>
<data name="LoggerMessageDiagnosticFormatParameterCountMismatchDescription" xml:space="preserve">
<value>Number of parameters supplied in the logging message template do not match the number of named placeholders.</value>
</data>
<data name="LoggerMessageDiagnosticMessageTemplateBracesMismatchTitle" xml:space="preserve">
<value>Invalid braces in message template</value>
<data name="LoggerMessageDiagnosticFormatParameterCountOrBracesMismatchDescription" xml:space="preserve">
<value>Number of parameters supplied in the logging message template do not match the number of named placeholders or the braces present are invalid.</value>
</data>
<data name="LoggerMessageDiagnosticMessageTemplateBracesMismatchMessage" xml:space="preserve">
<value>Invalid braces supplied in the logging message template</value>
</data>
<data name="LoggerMessageDiagnosticMessageTemplateBracesMismatchDescription" xml:space="preserve">
<value>Invalid braces supplied in the logging message template.</value>
</data>
<data name="LoggerMessageDiagnosticUseCompiledLogMessagesTitle" xml:space="preserve">
<value>Use the LoggerMessage delegates</value>
</data>
Expand Down
22 changes: 6 additions & 16 deletions ...rs/Core/Microsoft.CodeQuality.Analyzers/xlf/MicrosoftCodeQualityAnalyzersResources.cs.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,36 +277,26 @@
<target state="translated">Šablona by měla být statický výraz</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountMismatchDescription">
<source>Number of parameters supplied in the logging message template do not match the number of named placeholders.</source>
<target state="translated">Počet parametrů zadaných v šabloně zprávy protokolování neodpovídá počtu pojmenovaných zástupných objektů.</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountMismatchMessage">
<source>Number of parameters supplied in the logging message template do not match the number of named placeholders</source>
<target state="translated">Počet parametrů zadaných v šabloně zprávy protokolování neodpovídá počtu pojmenovaných zástupných objektů.</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountMismatchTitle">
<source>Parameter count mismatch</source>
<target state="translated">Neshoda počtu parametrů.</target>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountOrBracesMismatchDescription">
<source>Number of parameters supplied in the logging message template do not match the number of named placeholders or the braces present are invalid.</source>
<target state="new">Number of parameters supplied in the logging message template do not match the number of named placeholders or the braces present are invalid.</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticMessageTemplateBracesMismatchDescription">
<source>Invalid braces supplied in the logging message template.</source>
<target state="new">Invalid braces supplied in the logging message template.</target>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountOrBracesMismatchTitle">
<source>Parameter count mismatch or invalid braces in message template</source>
<target state="new">Parameter count mismatch or invalid braces in message template</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticMessageTemplateBracesMismatchMessage">
<source>Invalid braces supplied in the logging message template</source>
<target state="new">Invalid braces supplied in the logging message template</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticMessageTemplateBracesMismatchTitle">
<source>Invalid braces in message template</source>
<target state="new">Invalid braces in message template</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticNumericsInFormatStringDescription">
<source>Named placeholders in the logging message template should not be comprised of only numeric characters.</source>
<target state="translated">Pojmenované zástupné symboly v šabloně zprávy protokolování by neměly obsahovat jenom číselné znaky.</target>
Expand Down
22 changes: 6 additions & 16 deletions ...rs/Core/Microsoft.CodeQuality.Analyzers/xlf/MicrosoftCodeQualityAnalyzersResources.de.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,36 +277,26 @@
<target state="translated">Vorlage muss ein statischer Ausdruck sein</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountMismatchDescription">
<source>Number of parameters supplied in the logging message template do not match the number of named placeholders.</source>
<target state="translated">Die Anzahl der in der Vorlage für Protokollierungsnachrichten angegebenen Parameter stimmt nicht mit der Anzahl benannter Platzhalter überein.</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountMismatchMessage">
<source>Number of parameters supplied in the logging message template do not match the number of named placeholders</source>
<target state="translated">Die Anzahl der in der Protokollierungsmeldungsvorlage angegebenen Parameter stimmt nicht mit der Anzahl der benannten Platzhalter überein</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountMismatchTitle">
<source>Parameter count mismatch</source>
<target state="translated">Konflikt bei der Parameteranzahl</target>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountOrBracesMismatchDescription">
<source>Number of parameters supplied in the logging message template do not match the number of named placeholders or the braces present are invalid.</source>
<target state="new">Number of parameters supplied in the logging message template do not match the number of named placeholders or the braces present are invalid.</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticMessageTemplateBracesMismatchDescription">
<source>Invalid braces supplied in the logging message template.</source>
<target state="new">Invalid braces supplied in the logging message template.</target>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountOrBracesMismatchTitle">
<source>Parameter count mismatch or invalid braces in message template</source>
<target state="new">Parameter count mismatch or invalid braces in message template</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticMessageTemplateBracesMismatchMessage">
<source>Invalid braces supplied in the logging message template</source>
<target state="new">Invalid braces supplied in the logging message template</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticMessageTemplateBracesMismatchTitle">
<source>Invalid braces in message template</source>
<target state="new">Invalid braces in message template</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticNumericsInFormatStringDescription">
<source>Named placeholders in the logging message template should not be comprised of only numeric characters.</source>
<target state="translated">Benannte Platzhalter in der Vorlage für Protokollierungsnachrichten dürfen nicht nur aus numerischen Zeichen bestehen.</target>
Expand Down
22 changes: 6 additions & 16 deletions ...rs/Core/Microsoft.CodeQuality.Analyzers/xlf/MicrosoftCodeQualityAnalyzersResources.es.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,36 +277,26 @@
<target state="translated">La plantilla debe ser una expresión estática</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountMismatchDescription">
<source>Number of parameters supplied in the logging message template do not match the number of named placeholders.</source>
<target state="translated">El número de parámetros proporcionados en la plantilla de mensaje de registro no coincide con el número de marcadores de posición con nombre</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountMismatchMessage">
<source>Number of parameters supplied in the logging message template do not match the number of named placeholders</source>
<target state="translated">El número de parámetros proporcionados en la plantilla de mensaje de registro no coincide con el número de marcadores de posición con nombre</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountMismatchTitle">
<source>Parameter count mismatch</source>
<target state="translated">El recuento de parámetros no coincide</target>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountOrBracesMismatchDescription">
<source>Number of parameters supplied in the logging message template do not match the number of named placeholders or the braces present are invalid.</source>
<target state="new">Number of parameters supplied in the logging message template do not match the number of named placeholders or the braces present are invalid.</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticMessageTemplateBracesMismatchDescription">
<source>Invalid braces supplied in the logging message template.</source>
<target state="new">Invalid braces supplied in the logging message template.</target>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountOrBracesMismatchTitle">
<source>Parameter count mismatch or invalid braces in message template</source>
<target state="new">Parameter count mismatch or invalid braces in message template</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticMessageTemplateBracesMismatchMessage">
<source>Invalid braces supplied in the logging message template</source>
<target state="new">Invalid braces supplied in the logging message template</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticMessageTemplateBracesMismatchTitle">
<source>Invalid braces in message template</source>
<target state="new">Invalid braces in message template</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticNumericsInFormatStringDescription">
<source>Named placeholders in the logging message template should not be comprised of only numeric characters.</source>
<target state="translated">Los marcadores de posición con nombre de la plantilla de mensaje de registro no deben estar formados solo por caracteres numéricos.</target>
Expand Down
22 changes: 6 additions & 16 deletions ...rs/Core/Microsoft.CodeQuality.Analyzers/xlf/MicrosoftCodeQualityAnalyzersResources.fr.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,36 +277,26 @@
<target state="translated">Le modèle doit être une expression statique.</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountMismatchDescription">
<source>Number of parameters supplied in the logging message template do not match the number of named placeholders.</source>
<target state="translated">Le nombre de paramètres fournis dans le modèle de message de journalisation ne correspond pas au nombre d’espaces réservés nommés.</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountMismatchMessage">
<source>Number of parameters supplied in the logging message template do not match the number of named placeholders</source>
<target state="translated">Le nombre de paramètres fournis dans le modèle de message de journalisation ne correspond pas au nombre d’espaces réservés nommés.</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountMismatchTitle">
<source>Parameter count mismatch</source>
<target state="translated">Nombre de paramètres incorrects.</target>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountOrBracesMismatchDescription">
<source>Number of parameters supplied in the logging message template do not match the number of named placeholders or the braces present are invalid.</source>
<target state="new">Number of parameters supplied in the logging message template do not match the number of named placeholders or the braces present are invalid.</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticMessageTemplateBracesMismatchDescription">
<source>Invalid braces supplied in the logging message template.</source>
<target state="new">Invalid braces supplied in the logging message template.</target>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountOrBracesMismatchTitle">
<source>Parameter count mismatch or invalid braces in message template</source>
<target state="new">Parameter count mismatch or invalid braces in message template</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticMessageTemplateBracesMismatchMessage">
<source>Invalid braces supplied in the logging message template</source>
<target state="new">Invalid braces supplied in the logging message template</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticMessageTemplateBracesMismatchTitle">
<source>Invalid braces in message template</source>
<target state="new">Invalid braces in message template</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticNumericsInFormatStringDescription">
<source>Named placeholders in the logging message template should not be comprised of only numeric characters.</source>
<target state="translated">Les espaces réservés nommés dans le modèle de message de journalisation ne doivent pas être composés uniquement de caractères numériques.</target>
Expand Down
22 changes: 6 additions & 16 deletions ...rs/Core/Microsoft.CodeQuality.Analyzers/xlf/MicrosoftCodeQualityAnalyzersResources.it.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,36 +277,26 @@
<target state="translated">Il modello deve essere un'espressione statica</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountMismatchDescription">
<source>Number of parameters supplied in the logging message template do not match the number of named placeholders.</source>
<target state="translated">Il numero di parametri specificati nel modello di messaggio di registrazione non corrisponde al numero di segnaposto denominati.</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountMismatchMessage">
<source>Number of parameters supplied in the logging message template do not match the number of named placeholders</source>
<target state="translated">Il numero di parametri specificati nel modello di messaggio di registrazione non corrisponde al numero di segnaposto denominati</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountMismatchTitle">
<source>Parameter count mismatch</source>
<target state="translated">Numero di parametri non corrispondente</target>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountOrBracesMismatchDescription">
<source>Number of parameters supplied in the logging message template do not match the number of named placeholders or the braces present are invalid.</source>
<target state="new">Number of parameters supplied in the logging message template do not match the number of named placeholders or the braces present are invalid.</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticMessageTemplateBracesMismatchDescription">
<source>Invalid braces supplied in the logging message template.</source>
<target state="new">Invalid braces supplied in the logging message template.</target>
<trans-unit id="LoggerMessageDiagnosticFormatParameterCountOrBracesMismatchTitle">
<source>Parameter count mismatch or invalid braces in message template</source>
<target state="new">Parameter count mismatch or invalid braces in message template</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticMessageTemplateBracesMismatchMessage">
<source>Invalid braces supplied in the logging message template</source>
<target state="new">Invalid braces supplied in the logging message template</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticMessageTemplateBracesMismatchTitle">
<source>Invalid braces in message template</source>
<target state="new">Invalid braces in message template</target>
<note />
</trans-unit>
<trans-unit id="LoggerMessageDiagnosticNumericsInFormatStringDescription">
<source>Named placeholders in the logging message template should not be comprised of only numeric characters.</source>
<target state="translated">I segnaposto denominati nel modello di messaggio di registrazione non devono contenere solo caratteri numerici.</target>
Expand Down

0 comments on commit 78c69e7

Please sign in to comment.