Skip to content

uname: move label separators into locale strings for -A/--all-labeled #13954

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

Merged
sylvestre merged 1 commit into from
Aug 15, 2026
+20 −19
Merged

uname: move label separators into locale strings for -A/--all-labeled #13954

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
17 changes: 9 additions & 8 deletions src/uu/uname/locales/en-US.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ uname-help-hardware-platform = print the hardware platform (non-portable)
uname-help-all-labeled = like -a, print all information but one item per line, labeled.

# Labels for --all-labeled
uname-label-kernel-name = Kernel name
uname-label-nodename = Node name
uname-label-kernel-release = Kernel release
uname-label-kernel-version = Kernel version
uname-label-machine = Machine
uname-label-processor = Processor
uname-label-hardware-platform = Hardware platform
uname-label-os = Operating system
# Labels for --all-labeled; { $value } is the system-provided field value.
uname-label-kernel-name = Kernel name: { $value }
uname-label-nodename = Node name: { $value }
uname-label-kernel-release = Kernel release: { $value }
uname-label-kernel-version = Kernel version: { $value }
uname-label-machine = Machine: { $value }
uname-label-processor = Processor: { $value }
uname-label-hardware-platform = Hardware platform: { $value }
uname-label-os = Operating system: { $value }
16 changes: 8 additions & 8 deletions src/uu/uname/locales/fr-FR.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ uname-help-hardware-platform = affiche la plateforme matérielle (non portable)
uname-help-all-labeled = comme -a, affiche toutes les informations mais une par ligne, avec étiquette.

# Étiquettes pour --all-labeled
uname-label-kernel-name = Nom du noyau
uname-label-nodename = Nom du nœud
uname-label-kernel-release = Version du noyau
uname-label-kernel-version = Version détaillée du noyau
uname-label-machine = Machine
uname-label-processor = Processeur
uname-label-hardware-platform = Plateforme matérielle
uname-label-os = Système d'exploitation
uname-label-kernel-name = Nom du noyau : { $value }
uname-label-nodename = Nom du nœud : { $value }
uname-label-kernel-release = Version du noyau : { $value }
uname-label-kernel-version = Version détaillée du noyau : { $value }
uname-label-machine = Machine : { $value }
uname-label-processor = Processeur : { $value }
uname-label-hardware-platform = Plateforme matérielle : { $value }
uname-label-os = Système d'exploitation : { $value }
6 changes: 3 additions & 3 deletions src/uu/uname/src/uname.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,9 @@ impl UNameOutput {
("uname-label-os", self.os.as_ref()),
] {
let Some(value) = value else { continue };
out.push(translate!(label));
out.push(": ");
out.push(value);
out.push(OsStr::new(
&translate!(label, "value" => value.to_string_lossy()),
));
Comment on lines +78 to +80
out.push("\n");
}
out
Expand Down
Loading