diff --git a/Cargo.toml b/Cargo.toml index d6737d16d08..847f782b648 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -310,7 +310,7 @@ chrono = { version = "0.4.41", default-features = false, features = [ "alloc", "clock", ] } -clap = { version = "4.5", features = ["wrap_help", "cargo", "color"] } +clap = { version = "4.5", features = ["wrap_help", "cargo", "color", "string"] } clap_complete = "4.4" clap_mangen = "0.2" compare = "0.1.0" diff --git a/src/uu/split/locales/en-US.ftl b/src/uu/split/locales/en-US.ftl index 4247eb5b9d9..02c4bab73de 100644 --- a/src/uu/split/locales/en-US.ftl +++ b/src/uu/split/locales/en-US.ftl @@ -15,6 +15,17 @@ split-after-help = Output fixed-size pieces of INPUT to PREFIXaa, PREFIXab, ...; - r/N like 'l' but use round robin distribution - r/K/N likewise but only output Kth of N to stdout +# Variable names +split-var-name-size = SIZE +split-var-name-number = NUMBER +split-var-name-chunks = CHUNKS +split-var-name-suffix = SUFFIX +split-var-name-command = COMMAND +split-var-name-from = FROM +split-var-name-sep = SEP +split-var-name-input = INPUT +split-var-name-prefix = PREFIX + # Error messages split-error-suffix-not-parsable = invalid suffix length: { $value } split-error-suffix-contains-separator = invalid suffix { $value }, contains directory separator diff --git a/src/uu/split/locales/fr-FR.ftl b/src/uu/split/locales/fr-FR.ftl index e8e70c280fa..5f490f4c49c 100644 --- a/src/uu/split/locales/fr-FR.ftl +++ b/src/uu/split/locales/fr-FR.ftl @@ -15,6 +15,17 @@ split-after-help = Sortir des morceaux de taille fixe d'ENTRÉE vers PREFIXEaa, - r/N comme 'l' mais utiliser la distribution round robin - r/K/N pareillement mais ne sortir que le Kème de N vers stdout +# Noms des variables +split-var-name-size = TAILLE +split-var-name-number = NOMBRE +split-var-name-chunks = BLOCS +split-var-name-suffix = SUFFIXE +split-var-name-command = COMMANDE +split-var-name-from = DEPART +split-var-name-sep = SEP +split-var-name-input = ENTREE +split-var-name-prefix = PREFIXE + # Messages d'erreur split-error-suffix-not-parsable = longueur de suffixe invalide : { $value } split-error-suffix-contains-separator = suffixe invalide { $value }, contient un séparateur de répertoire diff --git a/src/uu/split/src/split.rs b/src/uu/split/src/split.rs index 6f290a7d5e4..e54f0460089 100644 --- a/src/uu/split/src/split.rs +++ b/src/uu/split/src/split.rs @@ -238,7 +238,7 @@ pub fn uu_app() -> Command { .short('b') .long(OPT_BYTES) .allow_hyphen_values(true) - .value_name("SIZE") + .value_name(translate!("split-var-name-size")) .help(translate!("split-help-bytes")), ) .arg( @@ -246,7 +246,7 @@ pub fn uu_app() -> Command { .short('C') .long(OPT_LINE_BYTES) .allow_hyphen_values(true) - .value_name("SIZE") + .value_name(translate!("split-var-name-size")) .help(translate!("split-help-line-bytes")), ) .arg( @@ -254,7 +254,7 @@ pub fn uu_app() -> Command { .short('l') .long(OPT_LINES) .allow_hyphen_values(true) - .value_name("NUMBER") + .value_name(translate!("split-var-name-number")) .default_value("1000") .help(translate!("split-help-lines")), ) @@ -263,7 +263,7 @@ pub fn uu_app() -> Command { .short('n') .long(OPT_NUMBER) .allow_hyphen_values(true) - .value_name("CHUNKS") + .value_name(translate!("split-var-name-chunks")) .help(translate!("split-help-number")), ) // rest of the arguments @@ -271,7 +271,7 @@ pub fn uu_app() -> Command { Arg::new(OPT_ADDITIONAL_SUFFIX) .long(OPT_ADDITIONAL_SUFFIX) .allow_hyphen_values(true) - .value_name("SUFFIX") + .value_name(translate!("split-var-name-suffix")) .default_value("") .value_parser(clap::value_parser!(OsString)) .help(translate!("split-help-additional-suffix")), @@ -280,7 +280,7 @@ pub fn uu_app() -> Command { Arg::new(OPT_FILTER) .long(OPT_FILTER) .allow_hyphen_values(true) - .value_name("COMMAND") + .value_name(translate!("split-var-name-command")) .value_hint(ValueHint::CommandName) .help(translate!("split-help-filter")), ) @@ -314,7 +314,7 @@ pub fn uu_app() -> Command { OPT_HEX_SUFFIXES, OPT_HEX_SUFFIXES_SHORT, ]) - .value_name("FROM") + .value_name(translate!("split-var-name-from")) .help(translate!("split-help-numeric-suffixes")), ) .arg( @@ -340,7 +340,7 @@ pub fn uu_app() -> Command { OPT_HEX_SUFFIXES, OPT_HEX_SUFFIXES_SHORT, ]) - .value_name("FROM") + .value_name(translate!("split-var-name-from")) .help(translate!("split-help-hex-suffixes")), ) .arg( @@ -362,7 +362,7 @@ pub fn uu_app() -> Command { .short('t') .long(OPT_SEPARATOR) .allow_hyphen_values(true) - .value_name("SEP") + .value_name(translate!("split-var-name-sep")) .action(ArgAction::Append) .help(translate!("split-help-separator")), ) @@ -376,12 +376,14 @@ pub fn uu_app() -> Command { Arg::new(ARG_INPUT) .default_value("-") .value_hint(ValueHint::FilePath) - .value_parser(clap::value_parser!(OsString)), + .value_parser(clap::value_parser!(OsString)) + .value_name(translate!("split-var-name-input")), ) .arg( Arg::new(ARG_PREFIX) .default_value("x") - .value_parser(clap::value_parser!(OsString)), + .value_parser(clap::value_parser!(OsString)) + .value_name(translate!("split-var-name-prefix")), ) }