rename and move localizations

Author: tgauth

dsc/locales/en-us.toml

@@ -100,12 +100,6 @@ noResources = "Resources not specified"
 resourceTypeNotSpecified = "Resource type not specified"
 validatingResource = "Validating resource named"
 resourceNotFound = "Resource type not found"
-resourceImplementsValidate = "Resource implements validation"
-noReason = "No reason provided"
-resourceValidationFailed = "Resource failed validation"
-resourceDoesNotImplementValidate = "Resource does not implement validation, using schema"
-noSchemaOrValidate = "Resource does not have a schema nor supports validation"
-noManifest = "Resource does not have a manifest"
 tableHeader_type = "Type"
 tableHeader_kind = "Kind"
 tableHeader_version = "Version"
@@ -127,9 +121,6 @@ failedToConvertJsonToString = "Failed to convert JSON to string"
 failedToReadTracingSetting = "Could not read 'tracing' setting"
 invalidTraceLevel = "Default to 'warn', invalid DSC_TRACE_LEVEL value"
 failedToSetTracing = "Unable to set global default tracing subscriber.  Tracing is disabled."
-validatingSchema = "Validating against schema"
-failedToCompileSchema = "JSON Schema Compilation"
-validationFailed = "Failed validation"
 readingInput = "Reading input from command line parameter"
 inputIsFile = "Document provided is a file path, use '--file' instead"
 readingInputFromFile = "Reading input from file"

dsc_lib/locales/en-us.toml

@@ -177,6 +177,15 @@ diffKeyMissing = "diff: key '%{key}' missing"
 diffKeyNotObject = "diff: key '%{key}' is not an object"
 diffArraySize = "diff: arrays have different lengths"
 diffMissingItem = "diff: actual array missing expected item"
+failedToCompileSchema = "JSON Schema Compilation"
+noManifest = "Resource does not have a manifest"
+noReason = "No reason provided"
+noSchemaOrValidate = "Resource does not have a schema nor supports validation"
+resourceDoesNotImplementValidate = "Resource does not implement validation, using schema"
+resourceImplementsValidate = "Resource implements validation"
+resourceValidationFailed = "Resource failed validation"
+validatingSchema = "Validating against schema"
+validationFailed = "Failed validation"
 
 [dscresources.resource_manifest]
 resourceManifestSchemaTitle = "Resource manifest schema URI"

dsc_lib/src/dscresources/dscresource.rs

@@ -588,24 +588,24 @@ pub fn validate_properties(resource: &DscResource, properties: &Value) -> Result
         // convert to resource_manifest``
         let manifest: ResourceManifest = serde_json::from_value(manifest)?;
         if manifest.validate.is_some() {
-            debug!("{}: {type_name} ", t!("subcommand.resourceImplementsValidate"));
+            debug!("{}: {type_name} ", t!("dscresources.dscresource.resourceImplementsValidate"));
             let resource_config = properties.to_string();
             let result = resource.validate(&resource_config)?;
             if !result.valid {
-                let reason = result.reason.unwrap_or(t!("subcommand.noReason").to_string());
-                return Err(DscError::Validation(format!("{}: {type_name} {reason}", t!("subcommand.resourceValidationFailed"))));
+                let reason = result.reason.unwrap_or(t!("dscresources.dscresource.noReason").to_string());
+                return Err(DscError::Validation(format!("{}: {type_name} {reason}", t!("dscresources.dscresource.resourceValidationFailed"))));
             }
             return Ok(())
         }
         // use schema validation
-        trace!("{}: {type_name}", t!("subcommand.resourceDoesNotImplementValidate"));
+        trace!("{}: {type_name}", t!("dscresources.dscresource.resourceDoesNotImplementValidate"));
         let Ok(schema) = resource.schema() else {
-            return Err(DscError::Validation(format!("{}: {type_name}", t!("subcommand.noSchemaOrValidate"))));
+            return Err(DscError::Validation(format!("{}: {type_name}", t!("dscresources.dscresource.noSchemaOrValidate"))));
         };
         let schema = serde_json::from_str(&schema)?;
         return validate_json(&resource.type_name, &schema, properties)
     }
-    Err(DscError::Validation(format!("{}: {type_name}", t!("subcommand.noManifest"))))
+    Err(DscError::Validation(format!("{}: {type_name}", t!("dscresources.dscresource.noManifest"))))
 }
 
 /// Validate the JSON against the schema.
@@ -624,18 +624,18 @@ pub fn validate_properties(resource: &DscResource, properties: &Value) -> Result
 ///
 /// * `DscError` - The JSON is invalid
 pub fn validate_json(source: &str, schema: &Value, json: &Value) -> Result<(), DscError> {
-    debug!("{}: {source}", t!("util.validatingSchema"));
+    debug!("{}: {source}", t!("dscresources.dscresource.validatingSchema"));
     trace!("JSON: {json}");
     trace!("Schema: {schema}");
     let compiled_schema = match Validator::new(schema) {
         Ok(compiled_schema) => compiled_schema,
         Err(err) => {
-            return Err(DscError::Validation(format!("{}: {err}", t!("util.failedToCompileSchema"))));
+            return Err(DscError::Validation(format!("{}: {err}", t!("dscresources.dscresource.failedToCompileSchema"))));
         }
     };
 
     if let Err(err) = compiled_schema.validate(json) {
-        return Err(DscError::Validation(format!("{}: '{source}' {err}", t!("util.validationFailed"))));
+        return Err(DscError::Validation(format!("{}: '{source}' {err}", t!("dscresources.dscresource.validationFailed"))));
     }
 
     Ok(())