l10n(uucore::checksum): Implement l10n for English + French

Author: RenjiSann

src/uu/cksum/locales/en-US.ftl

@@ -28,7 +28,3 @@ cksum-help-quiet = don't print OK for each successfully verified file
 cksum-help-ignore-missing = don't fail or report status for missing files
 cksum-help-zero = end each output line with NUL, not newline, and disable file name escaping
 cksum-help-debug = print CPU hardware capability detection info used by cksum
-
-# Error messages
-cksum-error-is-directory = { $file }: Is a directory
-cksum-error-failed-to-read-input = failed to read input

src/uu/cksum/locales/fr-FR.ftl

@@ -28,7 +28,3 @@ cksum-help-quiet = ne pas afficher OK pour chaque fichier vérifié avec succès
 cksum-help-ignore-missing = ne pas échouer ou signaler le statut pour les fichiers manquants
 cksum-help-zero = terminer chaque ligne de sortie avec NUL, pas un saut de ligne, et désactiver l'échappement des noms de fichiers
 cksum-help-debug = afficher les informations de débogage sur la détection de la prise en charge matérielle du processeur
-
-# Messages d'erreur
-cksum-error-is-directory = { $file } : Est un répertoire
-cksum-error-failed-to-read-input = échec de la lecture de l'entrée

src/uucore/locales/en-US.ftl

@@ -29,6 +29,7 @@ error-io = I/O error
 error-permission-denied = Permission denied
 error-file-not-found = No such file or directory
 error-invalid-argument = Invalid argument
+error-is-a-directory = { $file }: Is a directory
 
 # Common actions
 action-copying = copying
@@ -54,3 +55,21 @@ safe-traversal-error-unlink-failed = failed to unlink '{ $path }': { $source }
 safe-traversal-error-invalid-fd = invalid file descriptor
 safe-traversal-current-directory = <current directory>
 safe-traversal-directory = <directory>
+
+# checksum-related messages
+checksum-no-properly-formatted = { $checksum_file }: no properly formatted checksum lines found
+checksum-no-file-verified = { $checksum_file }: no file was verified
+checksum-error-failed-to-read-input = failed to read input
+checksum-bad-format = { $count ->
+    [1] { $count } line is improperly formatted
+   *[other] { $count } lines are improperly formatted
+}
+checksum-failed-cksum = { $count ->
+    [1] { $count } computed checksum did NOT match
+   *[other] { $count } computed checksums did NOT match
+}
+checksum-failed-open-file = { $count ->
+    [1] { $count } listed file could not be read
+   *[other] { $count } listed files could not be read
+}
+checksum-error-algo-bad-format = { $file }: { $line }: improperly formatted { $algo } checksum line

src/uucore/locales/fr-FR.ftl

@@ -29,6 +29,7 @@ error-io = Erreur E/S
 error-permission-denied = Permission refusée
 error-file-not-found = Aucun fichier ou répertoire de ce type
 error-invalid-argument = Argument invalide
+error-is-a-directory = { $file }: Est un répertoire
 
 # Actions communes
 action-copying = copie
@@ -54,3 +55,21 @@ safe-traversal-error-unlink-failed = échec de la suppression de '{ $path }' : {
 safe-traversal-error-invalid-fd = descripteur de fichier invalide
 safe-traversal-current-directory = <répertoire courant>
 safe-traversal-directory = <répertoire>
+
+# Messages relatifs au module checksum
+checksum-no-properly-formatted = { $checksum_file }: aucune ligne correctement formattée n'a été trouvée
+checksum-no-file-verified = { $checksum_file }: aucun fichier n'a été vérifié
+checksum-error-failed-to-read-input = échec de la lecture de l'entrée
+checksum-bad-format = { $count ->
+    [1] { $count } ligne invalide
+   *[other] { $count } lignes invalides
+}
+checksum-failed-cksum = { $count ->
+    [1] { $count } somme de hachage ne correspond PAS
+   *[other] { $count } sommes de hachage ne correspondent PAS
+}
+checksum-failed-open-file = { $count ->
+    [1] { $count } fichier passé n'a pas pu être lu
+   *[other] { $count } fichiers passés n'ont pas pu être lu
+}
+checksum-error-algo-bad-format = { $file }: { $line }: ligne invalide pour { $algo }

src/uucore/src/lib/features/checksum/compute.rs

@@ -255,9 +255,7 @@ where
         if filepath.is_dir() {
             show!(USimpleError::new(
                 1,
-                // TODO: Rework translation, which is broken since this code moved to uucore
-                // translate!("cksum-error-is-directory", "file" => filepath.display())
-                format!("{}: Is a directory", filepath.display())
+                translate!("error-is-a-directory", "file" => filepath.display())
             ));
             continue;
         }
@@ -283,7 +281,7 @@ where
         let mut digest = options.algo_kind.create_digest();
 
         let (digest_output, sz) = digest_reader(&mut digest, &mut file, options.binary)
-            .map_err_context(|| translate!("cksum-error-failed-to-read-input"))?;
+            .map_err_context(|| translate!("checksum-error-failed-to-read-input"))?;
 
         // Encodes the sum if df is Base64, leaves as-is otherwise.
         let encode_sum = |sum: DigestOutput, df: DigestFormat| {

src/uucore/src/lib/features/checksum/validate.rs

@@ -18,7 +18,7 @@ use crate::quoting_style::{QuotingStyle, locale_aware_escape_name};
 use crate::sum::DigestOutput;
 use crate::{
     os_str_as_bytes, os_str_from_bytes, read_os_string_lines, show, show_error, show_warning_caps,
-    util_name,
+    translate,
 };
 
 /// To what level should checksum validation print logging info.
@@ -147,37 +147,45 @@ impl From<ChecksumError> for FileCheckError {
     }
 }
 
-#[allow(clippy::comparison_chain)]
 fn print_cksum_report(res: &ChecksumResult) {
-    if res.bad_format == 1 {
-        show_warning_caps!("{} line is improperly formatted", res.bad_format);
-    } else if res.bad_format > 1 {
-        show_warning_caps!("{} lines are improperly formatted", res.bad_format);
+    if res.bad_format > 0 {
+        show_warning_caps!(
+            "{}",
+            translate!("checksum-bad-format", "count" => res.bad_format)
+        );
     }
 
-    if res.failed_cksum == 1 {
-        show_warning_caps!("{} computed checksum did NOT match", res.failed_cksum);
-    } else if res.failed_cksum > 1 {
-        show_warning_caps!("{} computed checksums did NOT match", res.failed_cksum);
+    if res.failed_cksum > 0 {
+        show_warning_caps!(
+            "{}",
+            translate!("checksum-failed-cksum", "count" => res.failed_cksum)
+        );
     }
 
-    if res.failed_open_file == 1 {
-        show_warning_caps!("{} listed file could not be read", res.failed_open_file);
-    } else if res.failed_open_file > 1 {
-        show_warning_caps!("{} listed files could not be read", res.failed_open_file);
+    if res.failed_open_file > 0 {
+        show_warning_caps!(
+            "{}",
+            translate!("checksum-failed-open-file", "count" => res.failed_open_file)
+        );
     }
 }
 
 /// Print a "no properly formatted lines" message in stderr
 #[inline]
 fn log_no_properly_formatted(filename: impl Display) {
-    show_error!("{filename}: no properly formatted checksum lines found");
+    show_error!(
+        "{}",
+        translate!("checksum-no-properly-formatted", "checksum_file" => filename)
+    );
 }
 
 /// Print a "no file was verified" message in stderr
 #[inline]
 fn log_no_file_verified(filename: impl Display) {
-    show_error!("{filename}: no file was verified");
+    show_error!(
+        "{}",
+        translate!("checksum-no-file-verified", "checksum_file" => filename)
+    );
 }
 
 /// Represents the different outcomes that can happen to a file
@@ -576,17 +584,18 @@ fn get_input_file(filename: &OsStr) -> UResult<Box<dyn Read>> {
     match File::open(filename) {
         Ok(f) => {
             if f.metadata()?.is_dir() {
-                Err(
-                    io::Error::other(format!("{}: Is a directory", filename.to_string_lossy()))
-                        .into(),
+                Err(io::Error::other(
+                    translate!("error-is-a-directory", "file" => filename.to_string_lossy()),
                 )
+                .into())
             } else {
                 Ok(Box::new(f))
             }
         }
         Err(_) => Err(io::Error::other(format!(
-            "{}: No such file or directory",
-            filename.to_string_lossy()
+            "{}: {}",
+            filename.to_string_lossy(),
+            translate!("error-file-not-found")
         ))
         .into()),
     }
@@ -864,11 +873,9 @@ fn process_checksum_file(
                     } else {
                         "Unknown algorithm"
                     };
-                    eprintln!(
-                        "{}: {}: {}: improperly formatted {algo} checksum line",
-                        util_name(),
-                        filename_input.maybe_quote(),
-                        i + 1,
+                    show_error!(
+                        "{}",
+                        translate!("checksum-error-algo-bad-format", "file" => filename_input.maybe_quote(), "line" => i + 1, "algo" => algo)
                     );
                 }
             }