(MAINT) Fix i18n tests for dsc-lib-jsonschema

michaeltlombardi · michaeltlombardi · commit 41d722cd0f9e · 2026-04-15T11:27:06.000-05:00
This change updates the `dsc-lib-jsonschema` crate to fix failing i18n tests by:

- Moving the VS Code schema keywords into the `toml` translation definition file.
  Because these keywords must generate their documentation regardless of whether
  the library is being used with the `DscRepoSchema` trait, the types need to be
  able to use the normative translation files for i18n tests to function corectly.
- Renaming the `tests/locales` folder to `tests/integration_locales` to avoid
  incorrectly testing those translations in the `dsc_i18n` pester test suite.
diff --git a/lib/dsc-lib-jsonschema/locales/en-us.toml b/lib/dsc-lib-jsonschema/locales/en-us.toml
diff --git a/lib/dsc-lib-jsonschema/locales/vscode.yaml b/lib/dsc-lib-jsonschema/locales/vscode.yaml
diff --git a/lib/dsc-lib-jsonschema/src/vscode/keywords/allow_comments.rs b/lib/dsc-lib-jsonschema/src/vscode/keywords/allow_comments.rs
@@ -47,9 +47,9 @@ impl JsonSchema for AllowCommentsKeyword {
         json_schema!({
             "$schema": Self::META_SCHEMA,
             "$id": Self::KEYWORD_ID,
-            "title": t!("vscode.keywords.allowComments.title"),
-            "description": t!("vscode.keywords.allowComments.description"),
-            "markdownDescription": t!("vscode.keywords.allowComments.markdownDescription"),
+            "title": t!("vscode.keywords.allow_comments.title"),
+            "description": t!("vscode.keywords.allow_comments.description"),
+            "markdownDescription": t!("vscode.keywords.allow_comments.markdownDescription"),
             "type": "boolean",
             "default": false
         })
diff --git a/lib/dsc-lib-jsonschema/src/vscode/keywords/allow_trailing_commas.rs b/lib/dsc-lib-jsonschema/src/vscode/keywords/allow_trailing_commas.rs
@@ -48,9 +48,9 @@ impl JsonSchema for AllowTrailingCommasKeyword {
         json_schema!({
             "$schema": Self::META_SCHEMA,
             "$id": Self::KEYWORD_ID,
-            "title": t!("vscode.keywords.allowTrailingCommas.title"),
-            "description": t!("vscode.keywords.allowTrailingCommas.description"),
-            "markdownDescription": t!("vscode.keywords.allowTrailingCommas.markdownDescription"),
+            "title": t!("vscode.keywords.allow_trailing_commas.title"),
+            "description": t!("vscode.keywords.allow_trailing_commas.description"),
+            "markdownDescription": t!("vscode.keywords.allow_trailing_commas.markdownDescription"),
             "type": "boolean",
             "default": false
         })
diff --git a/lib/dsc-lib-jsonschema/src/vscode/keywords/completion_detail.rs b/lib/dsc-lib-jsonschema/src/vscode/keywords/completion_detail.rs
@@ -55,9 +55,9 @@ impl JsonSchema for CompletionDetailKeyword {
         json_schema!({
             "$schema": Self::META_SCHEMA,
             "$id": Self::KEYWORD_ID,
-            "title": t!("vscode.keywords.completionDetail.title"),
-            "description": t!("vscode.keywords.completionDetail.description"),
-            "markdownDescription": t!("vscode.keywords.completionDetail.markdownDescription"),
+            "title": t!("vscode.keywords.completion_detail.title"),
+            "description": t!("vscode.keywords.completion_detail.description"),
+            "markdownDescription": t!("vscode.keywords.completion_detail.markdownDescription"),
             "type": "string",
         })
     }
diff --git a/lib/dsc-lib-jsonschema/src/vscode/keywords/default_snippets.rs b/lib/dsc-lib-jsonschema/src/vscode/keywords/default_snippets.rs
@@ -166,45 +166,45 @@ impl JsonSchema for DefaultSnippetsKeyword {
         json_schema!({
             "$schema": Self::META_SCHEMA,
             "$id": Self::KEYWORD_ID,
-            "title": t!("vscode.keywords.defaultSnippets.title"),
-            "description": t!("vscode.keywords.defaultSnippets.description"),
-            "markdownDescription": t!("vscode.keywords.defaultSnippets.markdownDescription"),
+            "title": t!("vscode.keywords.default_snippets.title"),
+            "description": t!("vscode.keywords.default_snippets.description"),
+            "markdownDescription": t!("vscode.keywords.default_snippets.markdownDescription"),
             "unevaluatedItems": false,
             "type": "array",
             "items": {
-                "title": t!("vscode.keywords.defaultSnippets.items.title"),
-                "description": t!("vscode.keywords.defaultSnippets.items.description"),
-                "markdownDescription": t!("vscode.keywords.defaultSnippets.items.markdownDescription"),
+                "title": t!("vscode.keywords.default_snippets.items.title"),
+                "description": t!("vscode.keywords.default_snippets.items.description"),
+                "markdownDescription": t!("vscode.keywords.default_snippets.items.markdownDescription"),
                 "type": "object",
                 "unevaluatedProperties": false,
                 "properties": {
                     "label": {
-                        "title": t!("vscode.keywords.defaultSnippets.items.properties.label.title"),
-                        "description": t!("vscode.keywords.defaultSnippets.items.properties.label.description"),
-                        "markdownDescription": t!("vscode.keywords.defaultSnippets.items.properties.label.markdownDescription"),
+                        "title": t!("vscode.keywords.default_snippets.items.properties.label.title"),
+                        "description": t!("vscode.keywords.default_snippets.items.properties.label.description"),
+                        "markdownDescription": t!("vscode.keywords.default_snippets.items.properties.label.markdownDescription"),
                         "type": "string"
                     },
                     "description": {
-                        "title": t!("vscode.keywords.defaultSnippets.items.properties.description.title"),
-                        "description": t!("vscode.keywords.defaultSnippets.items.properties.description.description"),
-                        "markdownDescription": t!("vscode.keywords.defaultSnippets.items.properties.description.markdownDescription"),
+                        "title": t!("vscode.keywords.default_snippets.items.properties.description.title"),
+                        "description": t!("vscode.keywords.default_snippets.items.properties.description.description"),
+                        "markdownDescription": t!("vscode.keywords.default_snippets.items.properties.description.markdownDescription"),
                         "type": "string"
                     },
                     "markdownDescription": {
-                        "title": t!("vscode.keywords.defaultSnippets.items.properties.markdownDescription.title"),
-                        "description": t!("vscode.keywords.defaultSnippets.items.properties.markdownDescription.description"),
-                        "markdownDescription": t!("vscode.keywords.defaultSnippets.items.properties.markdownDescription.markdownDescription"),
+                        "title": t!("vscode.keywords.default_snippets.items.properties.markdownDescription.title"),
+                        "description": t!("vscode.keywords.default_snippets.items.properties.markdownDescription.description"),
+                        "markdownDescription": t!("vscode.keywords.default_snippets.items.properties.markdownDescription.markdownDescription"),
                         "type": "string"
                     },
                     "body": {
-                        "title": t!("vscode.keywords.defaultSnippets.items.properties.body.title"),
-                        "description": t!("vscode.keywords.defaultSnippets.items.properties.body.description"),
-                        "markdownDescription": t!("vscode.keywords.defaultSnippets.items.properties.body.markdownDescription"),
+                        "title": t!("vscode.keywords.default_snippets.items.properties.body.title"),
+                        "description": t!("vscode.keywords.default_snippets.items.properties.body.description"),
+                        "markdownDescription": t!("vscode.keywords.default_snippets.items.properties.body.markdownDescription"),
                     },
                     "bodyText": {
-                        "title": t!("vscode.keywords.defaultSnippets.items.properties.bodyText.title"),
-                        "description": t!("vscode.keywords.defaultSnippets.items.properties.bodyText.description"),
-                        "markdownDescription": t!("vscode.keywords.defaultSnippets.items.properties.bodyText.markdownDescription"),
+                        "title": t!("vscode.keywords.default_snippets.items.properties.bodyText.title"),
+                        "description": t!("vscode.keywords.default_snippets.items.properties.bodyText.description"),
+                        "markdownDescription": t!("vscode.keywords.default_snippets.items.properties.bodyText.markdownDescription"),
                         "type": "string"
                     },
                 },
diff --git a/lib/dsc-lib-jsonschema/src/vscode/keywords/deprecation_message.rs b/lib/dsc-lib-jsonschema/src/vscode/keywords/deprecation_message.rs
@@ -49,9 +49,9 @@ impl JsonSchema for DeprecationMessageKeyword {
         json_schema!({
             "$schema": Self::META_SCHEMA,
             "$id": Self::KEYWORD_ID,
-            "title": t!("vscode.keywords.deprecationMessage.title"),
-            "description": t!("vscode.keywords.deprecationMessage.description"),
-            "markdownDescription": t!("vscode.keywords.deprecationMessage.markdownDescription"),
+            "title": t!("vscode.keywords.deprecation_message.title"),
+            "description": t!("vscode.keywords.deprecation_message.description"),
+            "markdownDescription": t!("vscode.keywords.deprecation_message.markdownDescription"),
             "type": "string",
         })
     }
diff --git a/lib/dsc-lib-jsonschema/src/vscode/keywords/do_not_suggest.rs b/lib/dsc-lib-jsonschema/src/vscode/keywords/do_not_suggest.rs
@@ -48,9 +48,9 @@ impl JsonSchema for DoNotSuggestKeyword {
         json_schema!({
             "$schema": Self::META_SCHEMA,
             "$id": Self::KEYWORD_ID,
-            "title": t!("vscode.keywords.doNotSuggest.title"),
-            "description": t!("vscode.keywords.doNotSuggest.description"),
-            "markdownDescription": t!("vscode.keywords.doNotSuggest.markdownDescription"),
+            "title": t!("vscode.keywords.do_not_suggest.title"),
+            "description": t!("vscode.keywords.do_not_suggest.description"),
+            "markdownDescription": t!("vscode.keywords.do_not_suggest.markdownDescription"),
             "type": "boolean",
             "default": false
         })
diff --git a/lib/dsc-lib-jsonschema/src/vscode/keywords/enum_descriptions.rs b/lib/dsc-lib-jsonschema/src/vscode/keywords/enum_descriptions.rs
@@ -79,9 +79,9 @@ impl JsonSchema for EnumDescriptionsKeyword {
         json_schema!({
             "$schema": Self::META_SCHEMA,
             "$id": Self::KEYWORD_ID,
-            "title": t!("vscode.keywords.enumDescriptions.title"),
-            "description": t!("vscode.keywords.enumDescriptions.description"),
-            "markdownDescription": t!("vscode.keywords.enumDescriptions.markdownDescription"),
+            "title": t!("vscode.keywords.enum_descriptions.title"),
+            "description": t!("vscode.keywords.enum_descriptions.description"),
+            "markdownDescription": t!("vscode.keywords.enum_descriptions.markdownDescription"),
             "type": "array",
             "items": {
                 "type": "string"
diff --git a/lib/dsc-lib-jsonschema/src/vscode/keywords/enum_details.rs b/lib/dsc-lib-jsonschema/src/vscode/keywords/enum_details.rs
@@ -74,9 +74,9 @@ impl JsonSchema for EnumDetailsKeyword {
         json_schema!({
             "$schema": Self::META_SCHEMA,
             "$id": Self::KEYWORD_ID,
-            "title": t!("vscode.keywords.enumDetails.title"),
-            "description": t!("vscode.keywords.enumDetails.description"),
-            "markdownDescription": t!("vscode.keywords.enumDetails.markdownDescription"),
+            "title": t!("vscode.keywords.enum_details.title"),
+            "description": t!("vscode.keywords.enum_details.description"),
+            "markdownDescription": t!("vscode.keywords.enum_details.markdownDescription"),
             "type": "array",
             "items": {
                 "type": "string"
diff --git a/lib/dsc-lib-jsonschema/src/vscode/keywords/enum_sort_texts.rs b/lib/dsc-lib-jsonschema/src/vscode/keywords/enum_sort_texts.rs
@@ -81,9 +81,9 @@ impl JsonSchema for EnumSortTextsKeyword {
         json_schema!({
             "$schema": Self::META_SCHEMA,
             "$id": Self::KEYWORD_ID,
-            "title": t!("vscode.keywords.enumSortTexts.title"),
-            "description": t!("vscode.keywords.enumSortTexts.description"),
-            "markdownDescription": t!("vscode.keywords.enumSortTexts.markdownDescription"),
+            "title": t!("vscode.keywords.enum_sort_texts.title"),
+            "description": t!("vscode.keywords.enum_sort_texts.description"),
+            "markdownDescription": t!("vscode.keywords.enum_sort_texts.markdownDescription"),
             "type": "array",
             "items": {
                 "type": "string"
diff --git a/lib/dsc-lib-jsonschema/src/vscode/keywords/error_message.rs b/lib/dsc-lib-jsonschema/src/vscode/keywords/error_message.rs
@@ -71,9 +71,9 @@ impl JsonSchema for ErrorMessageKeyword {
         json_schema!({
             "$schema": Self::META_SCHEMA,
             "$id": Self::KEYWORD_ID,
-            "title": t!("vscode.keywords.errorMessage.title"),
-            "description": t!("vscode.keywords.errorMessage.description"),
-            "markdownDescription": t!("vscode.keywords.errorMessage.markdownDescription"),
+            "title": t!("vscode.keywords.error_message.title"),
+            "description": t!("vscode.keywords.error_message.description"),
+            "markdownDescription": t!("vscode.keywords.error_message.markdownDescription"),
             "type": "string",
         })
     }
diff --git a/lib/dsc-lib-jsonschema/src/vscode/keywords/markdown_description.rs b/lib/dsc-lib-jsonschema/src/vscode/keywords/markdown_description.rs
@@ -59,9 +59,9 @@ impl JsonSchema for MarkdownDescriptionKeyword {
         json_schema!({
             "$schema": Self::META_SCHEMA,
             "$id": Self::KEYWORD_ID,
-            "title": t!("vscode.keywords.markdownDescription.title"),
-            "description": t!("vscode.keywords.markdownDescription.description"),
-            "markdownDescription": t!("vscode.keywords.markdownDescription.markdownDescription"),
+            "title": t!("vscode.keywords.markdown_description.title"),
+            "description": t!("vscode.keywords.markdown_description.description"),
+            "markdownDescription": t!("vscode.keywords.markdown_description.markdownDescription"),
             "type": "string",
         })
     }
diff --git a/lib/dsc-lib-jsonschema/src/vscode/keywords/markdown_enum_descriptions.rs b/lib/dsc-lib-jsonschema/src/vscode/keywords/markdown_enum_descriptions.rs
@@ -75,9 +75,9 @@ impl JsonSchema for MarkdownEnumDescriptionsKeyword {
         json_schema!({
             "$schema": Self::META_SCHEMA,
             "$id": Self::KEYWORD_ID,
-            "title": t!("vscode.keywords.markdownEnumDescriptions.title"),
-            "description": t!("vscode.keywords.markdownEnumDescriptions.description"),
-            "markdownDescription": t!("vscode.keywords.markdownEnumDescriptions.markdownDescription"),
+            "title": t!("vscode.keywords.markdown_enum_descriptions.title"),
+            "description": t!("vscode.keywords.markdown_enum_descriptions.description"),
+            "markdownDescription": t!("vscode.keywords.markdown_enum_descriptions.markdownDescription"),
             "type": "array",
             "items": {
                 "type": "string"
diff --git a/lib/dsc-lib-jsonschema/src/vscode/keywords/pattern_error_message.rs b/lib/dsc-lib-jsonschema/src/vscode/keywords/pattern_error_message.rs
@@ -52,9 +52,9 @@ impl JsonSchema for PatternErrorMessageKeyword {
         json_schema!({
             "$schema": Self::META_SCHEMA,
             "$id": Self::KEYWORD_ID,
-            "title": t!("vscode.keywords.patternErrorMessage.title"),
-            "description": t!("vscode.keywords.patternErrorMessage.description"),
-            "markdownDescription": t!("vscode.keywords.patternErrorMessage.markdownDescription"),
+            "title": t!("vscode.keywords.pattern_error_message.title"),
+            "description": t!("vscode.keywords.pattern_error_message.description"),
+            "markdownDescription": t!("vscode.keywords.pattern_error_message.markdownDescription"),
             "type": "string",
         })
     }
diff --git a/lib/dsc-lib-jsonschema/src/vscode/keywords/suggest_sort_text.rs b/lib/dsc-lib-jsonschema/src/vscode/keywords/suggest_sort_text.rs
@@ -64,9 +64,9 @@ impl JsonSchema for SuggestSortTextKeyword {
         json_schema!({
             "$schema": Self::META_SCHEMA,
             "$id": Self::KEYWORD_ID,
-            "title": t!("vscode.keywords.suggestSortText.title"),
-            "description": t!("vscode.keywords.suggestSortText.description"),
-            "markdownDescription": t!("vscode.keywords.suggestSortText.markdownDescription"),
+            "title": t!("vscode.keywords.suggest_sort_text.title"),
+            "description": t!("vscode.keywords.suggest_sort_text.description"),
+            "markdownDescription": t!("vscode.keywords.suggest_sort_text.markdownDescription"),
             "type": "string",
         })
     }
diff --git a/lib/dsc-lib-jsonschema/tests/integration/main.rs b/lib/dsc-lib-jsonschema/tests/integration/main.rs
@@ -21,4 +21,4 @@ use rust_i18n::i18n;
 #[cfg(test)] mod dsc_repo;
 
 // Enable localization for emitted strings, needed for testing DscRepoSchema
-i18n!("./tests/locales", fallback = "en-US");
+i18n!("./tests/integration_locales", fallback = "en-US");
diff --git a/lib/dsc-lib-jsonschema/tests/integration_locales/schemas.yaml b/lib/dsc-lib-jsonschema/tests/integration_locales/schemas.yaml
