use i8n strings for debug messages

Author: tgauth

sshdconfig/Cargo.lock

@@ -14,13 +14,19 @@ parseInt = "Parse Integer"
 registry = "Registry"
 
 [get]
+debugSetting = "Get setting:"
 defaultShellCmdOptionMustBeString = "cmdOption must be a string"
 defaultShellEscapeArgsMustBe0Or1 = "'%{input}' must be a 0 or 1"
 defaultShellEscapeArgsMustBeDWord = "escapeArguments must be a DWord"
 defaultShellMustBeString = "shell must be a string"
 notImplemented = "get not yet implemented for Microsoft.OpenSSH.SSHD/sshd_config"
 windowsOnly = "Microsoft.OpenSSH.SSHD/Windows is only applicable to Windows"
 
+[main]
+export = "Export"
+schema = "Schema command:"
+set = "Set command: '%{input}'"
+
 [parser]
 failedToParse = "failed to parse: '%{input}'"
 failedToParseAsArray = "value is not an array"
@@ -32,8 +38,10 @@ invalidMultiArgNode = "multi-arg node '%{input}' is not valid"
 invalidValue = "operator is an invalid value for node"
 keyNotFound = "key '%{key}' not found"
 keyNotRepeatable = "key '%{key}' is not repeatable"
+keywordDebug = "Parsing keyword: '%{text}'"
 missingValueInChildNode = "missing value in child node: '%{input}'"
 missingKeyInChildNode = "missing key in child node: '%{input}'"
+valueDebug = "Parsed argument value:"
 unknownNode = "unknown node: '%{kind}'"
 unknownNodeType = "unknown node type: '%{node}'"
 

sshdconfig/locales/en-us.toml

@@ -20,7 +20,7 @@ use crate::error::SshdConfigError;
 ///
 /// This function will return an error if the desired settings cannot be retrieved.
 pub fn invoke_get(setting: &Setting) -> Result<(), SshdConfigError> {
-    debug!("Get setting: {:?}", setting);
+    debug!("{}: {:?}", t!("get.debugSetting").to_string(), setting);
     match *setting {
         Setting::SshdConfig => Err(SshdConfigError::NotImplemented(t!("get.notImplemented").to_string())),
         Setting::WindowsGlobal => get_default_shell()

sshdconfig/src/get.rs

@@ -2,7 +2,7 @@
 // Licensed under the MIT License.
 
 use clap::{Parser};
-use rust_i18n::i18n;
+use rust_i18n::{i18n, t};
 use schemars::schema_for;
 use std::process::exit;
 use tracing::{debug, error};
@@ -35,15 +35,14 @@ fn main() {
 
     let result = match &args.command {
         Command::Export => {
-            debug!("Export command");
+            debug!("{}", t!("main.export").to_string());
             invoke_export()
         },
         Command::Get { setting } => {
-            debug!("Get command: setting={:?}", setting);
             invoke_get(setting)
         },
         Command::Schema { setting } => {
-            debug!("Schema command: setting={:?}", setting);
+            debug!("{}; {:?}", t!("main.schema").to_string(), setting);
             let schema = match setting {
                 Setting::SshdConfig => {
                     schema_for!(SshdConfigParser)
@@ -56,7 +55,7 @@ fn main() {
             Ok(())
         },
         Command::Set { input } => {
-            debug!("Set command: input={}", input);
+            debug!("{}", t!("main.set", input = input).to_string());
             invoke_set(input)
         },
     };

sshdconfig/src/main.rs

@@ -78,7 +78,7 @@ impl SshdConfigParser {
                     t!("parser.failedToParseChildNode", input = input).to_string()
                 ));
             };
-            debug!("Parsing keyword: {text}");
+            debug!("{}", t!("parser.keywordDebug", text = text).to_string());
             if REPEATABLE_KEYWORDS.contains(&text) {
                 is_repeatable = true;
                 is_vec = true;
@@ -94,7 +94,7 @@ impl SshdConfigParser {
             }
             if node.kind() == "arguments" {
                 value = parse_arguments_node(node, input, input_bytes, is_vec)?;
-                debug!("Parsed argument value: {:?}", value);
+                debug!("{}: {:?}", t!("parser.valueDebug").to_string(), value);
             }
         }
         if let Some(key) = key {