write loggers to use translation

Author: squell

src/log/mod.rs

@@ -9,33 +9,34 @@ mod simple_logger;
 mod syslog;
 
 macro_rules! logger_macro {
-    ($name:ident is $rule_level:ident to $target:expr, $d:tt) => {
+    ($name:ident is $rule_level:ident to $target:literal with $($path1:ident)?$(::$path2:ident)*, $d:tt) => {
         macro_rules! $name {
             ($d($d arg:tt)+) => {
                 if let Some(logger) = $crate::log::LOGGER.get() {
-                    logger.log($crate::log::Level::$rule_level, $target, format_args!($d($d arg)+));
+                    logger.log($crate::log::Level::$rule_level, $target, $($path1)?$(::$path2)*!($d($d arg)+));
                 }
             };
         }
 
         pub(crate) use $name;
     };
-    ($name:ident is $rule_level:ident to $target:expr) => {
-        logger_macro!($name is $rule_level to $target, $);
+
+    ($name:ident is $rule_level:ident to $target:literal with $($path1:ident)?$(::$path2:ident)*) => {
+        logger_macro!($name is $rule_level to $target with $($path1)?$(::$path2)*, $);
     };
 }
 
 // logger_macro!(auth_error is Error to "sudo::auth");
-logger_macro!(auth_warn is Warn to "sudo::auth");
-logger_macro!(auth_info is Info to "sudo::auth");
-// logger_macro!(auth_debug is Debug to "sudo::auth");
-// logger_macro!(auth_trace is Trace to "sudo::auth");
+logger_macro!(auth_warn is Warn to "sudo::auth" with format_args);
+logger_macro!(auth_info is Info to "sudo::auth" with format_args);
+// logger_macro!(auth_debug is Debug to "sudo::auth" with format_args);
+// logger_macro!(auth_trace is Trace to "sudo::auth" with format_args);
 
-logger_macro!(user_error is Error to "sudo::user");
-logger_macro!(user_warn is Warn to "sudo::user");
-logger_macro!(user_info is Info to "sudo::user");
-// logger_macro!(user_debug is Debug to "sudo::user");
-// logger_macro!(user_trace is Trace to "sudo::user");
+logger_macro!(user_error is Error to "sudo::user" with crate::gettext::xlat);
+logger_macro!(user_warn is Warn to "sudo::user" with crate::gettext::xlat);
+logger_macro!(user_info is Info to "sudo::user" with crate::gettext::xlat);
+// logger_macro!(user_debug is Debug to "sudo::user" with crate::gettext::xlat);
+// logger_macro!(user_trace is Trace to "sudo::user" with crate::gettext::xlat);
 
 macro_rules! dev_logger_macro {
     ($name:ident is $rule_level:ident to $target:expr, $d:tt) => {
@@ -119,7 +120,7 @@ impl SudoLogger {
 }
 
 impl SudoLogger {
-    pub fn log(&self, level: Level, target: &str, args: fmt::Arguments<'_>) {
+    pub fn log(&self, level: Level, target: &str, args: impl fmt::Display) {
         for (prefix, l) in self.0.iter() {
             if target == &prefix[..prefix.len() - 2] || target.starts_with(prefix) {
                 l.log(level, &args);
@@ -139,7 +140,7 @@ pub enum Level {
 }
 
 trait Log: Send + Sync {
-    fn log(&self, level: Level, args: &fmt::Arguments<'_>);
+    fn log(&self, level: Level, args: &dyn fmt::Display);
 }
 
 #[cfg(test)]

src/log/simple_logger.rs

@@ -18,7 +18,7 @@ impl<W: Send + Sync> Log for SimpleLogger<W>
 where
     for<'a> &'a W: Write,
 {
-    fn log(&self, _level: Level, args: &fmt::Arguments<'_>) {
+    fn log(&self, _level: Level, args: &dyn fmt::Display) {
         let s = format!("{}{}\n", self.prefix, args);
         let _ = (&self.target).write_all(s.as_bytes());
         let _ = (&self.target).flush();

src/log/syslog.rs

@@ -131,7 +131,7 @@ impl Write for SysLogMessageWriter {
 const FACILITY: c_int = libc::LOG_AUTH;
 
 impl Log for Syslog {
-    fn log(&self, level: Level, args: &fmt::Arguments<'_>) {
+    fn log(&self, level: Level, args: &dyn fmt::Display) {
         let priority = match level {
             Level::Error => libc::LOG_ERR,
             Level::Warn => libc::LOG_WARNING,

util/make-pot.sh

@@ -20,6 +20,9 @@ find "$WORK_ROOT" -name "*.rs" -not -name "gettext.rs" | xargs xgettext \
   --from-code="UTF-8" \
   --keyword='xlat!' \
   --keyword='xlat_write!:2' \
+  --keyword='user_error!:1' \
+  --keyword='user_info!:1' \
+  --keyword='user_warn!:1' \
   --add-comments='TRANSLATORS:' \
   ${EXISTING:-} \
   -o "$potfile"