Skip to content

feat(split): Add localized value names #9906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lordeji wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(split): Add localized value names #9906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
11 changes: 11 additions & 0 deletions src/uu/split/locales/en-US.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 11 additions & 0 deletions src/uu/split/locales/fr-FR.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 13 additions & 11 deletions src/uu/split/src/split.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,23 +238,23 @@ 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(
Arg::new(OPT_LINE_BYTES)
.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(
Arg::new(OPT_LINES)
.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")),
)
Expand All @@ -263,15 +263,15 @@ 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
.arg(
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")),
Expand All @@ -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")),
)
Expand Down Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -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")),
)
Expand All @@ -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")),
)
}

Expand Down
Loading