Skip to content

Commit 0b0ba60

Browse files
authored
sort: refine error handling and localize field parsing errors (uutils#10068)
* sort: refactor error handling and localize field parsing errors * style(test): fix formatting and spell-checker ignore in sort tests - Add 'dfgi' to spell-checker ignore list for accurate linting - Reformat tuple and method call in test_conflict_check_out for consistency and to resolve clippy warnings * refactor(sort): use Self::default() and remove unnecessary .into() in error handling - Changed `ModeFlags::default()` to `Self::default()` for better idiomatic Rust code. - Removed `.into()` call in `FieldSelector::from` method as it was redundant, simplifying error construction.
1 parent 4ba5db0 commit 0b0ba60

File tree

4 files changed

+458
-256
lines changed

4 files changed

+458
-256
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,15 @@ sort-field-index-cannot-be-zero = field index can not be 0
3232
sort-failed-parse-char-index = failed to parse character index {$char}: {$error}
3333
sort-invalid-option = invalid option: '{$option}'
3434
sort-invalid-char-index-zero-start = invalid character index 0 for the start position of a field
35+
sort-invalid-field-spec = {$msg}: invalid field specification {$spec}
36+
sort-invalid-count-at-start-of = invalid count at start of {$string}
37+
sort-invalid-number-at-field-start = invalid number at field start
38+
sort-invalid-number-after-dash = invalid number after '-'
39+
sort-invalid-number-after-dot = invalid number after '.'
40+
sort-invalid-number-after-comma = invalid number after ','
41+
sort-field-number-is-zero = field number is zero
42+
sort-character-offset-is-zero = character offset is zero
43+
sort-stray-character-field-spec = stray character in field spec
3544
sort-invalid-batch-size-arg = invalid --batch-size argument '{$arg}'
3645
sort-minimum-batch-size-two = minimum --batch-size argument is '2'
3746
sort-batch-size-too-large = --batch-size argument {$arg} too large

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,15 @@ sort-field-index-cannot-be-zero = l'index de champ ne peut pas être 0
3232
sort-failed-parse-char-index = échec d'analyse de l'index de caractère {$char} : {$error}
3333
sort-invalid-option = option invalide : '{$option}'
3434
sort-invalid-char-index-zero-start = index de caractère 0 invalide pour la position de début d'un champ
35+
sort-invalid-field-spec = {$msg} : spécification de champ invalide {$spec}
36+
sort-invalid-count-at-start-of = nombre invalide au début de {$string}
37+
sort-invalid-number-at-field-start = nombre invalide au début du champ
38+
sort-invalid-number-after-dash = nombre invalide après '-'
39+
sort-invalid-number-after-dot = nombre invalide après '.'
40+
sort-invalid-number-after-comma = nombre invalide après ','
41+
sort-field-number-is-zero = le numéro de champ est zéro
42+
sort-character-offset-is-zero = le décalage de caractère est zéro
43+
sort-stray-character-field-spec = caractère parasite dans la spécification de champ
3544
sort-invalid-batch-size-arg = argument --batch-size invalide '{$arg}'
3645
sort-minimum-batch-size-two = l'argument --batch-size minimum est '2'
3746
sort-batch-size-too-large = argument --batch-size {$arg} trop grand

0 commit comments

Comments
 (0)