dd: Fix localization for too large skip|seek

Author: mfontanaar

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

@@ -142,6 +142,7 @@ dd-error-status-not-recognized = status=LEVEL not recognized -> { $level }
 dd-error-unimplemented = feature not implemented on this system -> { $feature }
 dd-error-bs-out-of-range = { $param }=N cannot fit into memory
 dd-error-invalid-number = invalid number: ‘{ $input }’
+dd-error-invalid-number-too-large = invalid number: { $input }: Value too large for defined data type
 
 # Progress messages
 dd-progress-records-in = { $complete }+{ $partial } records in

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

@@ -142,6 +142,7 @@ dd-error-status-not-recognized = status=NIVEAU non reconnu -> { $level }
 dd-error-unimplemented = fonctionnalité non implémentée sur ce système -> { $feature }
 dd-error-bs-out-of-range = { $param }=N ne peut pas tenir en mémoire
 dd-error-invalid-number = nombre invalide : ‘{ $input }‘
+dd-error-invalid-number-too-large = nombre invalide : { $input }: Valeur trop grande pour le type défini de données
 
 # Progress messages
 dd-progress-records-in = { $complete }+{ $partial } enregistrements en entrée

src/uu/dd/src/parseargs.rs

@@ -47,8 +47,10 @@ pub enum ParseError {
     BsOutOfRange(String),
     #[error("{}", translate!("dd-error-invalid-number", "input" => .0.clone()))]
     InvalidNumber(String),
-    #[error("invalid number: ‘{0}’: {1}")]
-    InvalidNumberWithErrMsg(String, String),
+    // Add surrounding quotes in here to get around this bug in Fluent:
+    // https://github.com/projectfluent/fluent-rs/issues/337
+    #[error("{}", translate!("dd-error-invalid-number-too-large", "input" => format!("‘{}’", .0.clone())))]
+    InvalidNumberTooLarge(String),
 }
 
 /// Contains a temporary state during parsing of the arguments
@@ -247,10 +249,7 @@ impl Parser {
             .to_bytes(ibs as u64);
         // GNU coreutils has a limit of i64 (intmax_t)
         if skip > i64::MAX as u64 {
-            return Err(ParseError::InvalidNumberWithErrMsg(
-                format!("{skip}"),
-                "Value too large for defined data type".to_string(),
-            ));
+            return Err(ParseError::InvalidNumberTooLarge(format!("{skip}")));
         }
 
         let seek = self
@@ -259,10 +258,7 @@ impl Parser {
             .to_bytes(obs as u64);
         // GNU coreutils has a limit of i64 (intmax_t)
         if seek > i64::MAX as u64 {
-            return Err(ParseError::InvalidNumberWithErrMsg(
-                format!("{seek}"),
-                "Value too large for defined data type".to_string(),
-            ));
+            return Err(ParseError::InvalidNumberTooLarge(format!("{seek}")));
         }
 
         let count = self.count.map(|c| c.force_bytes_if(self.iflag.count_bytes));

tests/by-util/test_dd.rs

@@ -1837,7 +1837,7 @@ fn test_skip_overflow() {
         .args(&["bs=1", "skip=9223372036854775808", "count=0"])
         .fails()
         .stderr_contains(
-            "dd: invalid number: ‘9223372036854775808’: Value too large for defined data type",
+            "dd: invalid number: ‘9223372036854775808’: Value too large for defined data type\n",
         );
 }
 
@@ -1847,6 +1847,6 @@ fn test_seek_overflow() {
         .args(&["bs=1", "seek=9223372036854775809", "count=0"])
         .fails()
         .stderr_contains(
-            "dd: invalid number: ‘9223372036854775809’: Value too large for defined data type",
+            "dd: invalid number: ‘9223372036854775809’: Value too large for defined data type\n",
         );
 }