Merge pull request #453 from rustcoreutils/updates

Use gettext for all --help util summaries

Author: jgarzik

calc/bc.rs

@@ -15,14 +15,14 @@ use bc_util::{
 };
 use clap::Parser;
 
-use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
+use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
 use rustyline::{error::ReadlineError, DefaultEditor, Result};
 
 mod bc_util;
 
 /// bc - arbitrary-precision arithmetic language
 #[derive(Parser)]
-#[command(version, about)]
+#[command(version, about = gettext("bc - arbitrary-precision arithmetic language"))]
 struct Args {
     #[arg(short = 'l')]
     define_math_functions: bool,

dev/ar.rs

@@ -9,6 +9,7 @@
 
 use chrono::DateTime;
 use clap::{Parser, Subcommand};
+use gettextrs::gettext;
 use object::{Object, ObjectSymbol, SymbolKind};
 use std::ffi::{OsStr, OsString};
 use std::io::{stdout, Write};
@@ -157,7 +158,7 @@ enum Commands {
 
 /// ar - create and maintain library archives
 #[derive(Parser)]
-#[command(version, about)]
+#[command(version, about = gettext("ar - create and maintain library archives"))]
 struct Args {
     #[command(subcommand)]
     command: Commands,

dev/nm.rs

@@ -17,7 +17,7 @@ use object::{
 };
 
 use clap::{Parser, ValueEnum};
-use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
+use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
 use std::collections::HashMap;
 use std::fs;
 
@@ -30,7 +30,7 @@ enum OutputType {
 
 /// nm - write the name list of an object file
 #[derive(Parser)]
-#[command(version, about)]
+#[command(version, about = gettext("nm - write the name list of an object file"))]
 struct Args {
     /// Write the full pathname or library name of an object on each line.
     #[arg(short = 'A', long = "print-file-name")]

dev/strings.rs

@@ -10,7 +10,7 @@
 use std::ffi::OsString;
 
 use clap::{Parser, ValueEnum};
-use gettextrs::{bind_textdomain_codeset, setlocale, textdomain, LocaleCategory};
+use gettextrs::{bind_textdomain_codeset, gettext, setlocale, textdomain, LocaleCategory};
 use object::{Object, ObjectSection};
 
 #[derive(Clone, Copy, ValueEnum)]
@@ -40,7 +40,7 @@ struct OutputOptions {
 
 /// strings - find printable strings in files
 #[derive(Parser)]
-#[command(version, about)]
+#[command(version, about = gettext("strings - find printable strings in files"))]
 struct Args {
     #[command(flatten)]
     output_options: OutputOptions,