vdir: make vdir an alias of ls to resolve missing ftl (#10363) (#10434)

Make vdir an alias of ls just as dir is an alias of ls, so vdir can
access the ftl files of ls. Also merged vdir's ftl strings into ls's.

Author: NatsuCamellia

src/common/validation.rs

@@ -59,8 +59,8 @@ fn get_canonical_util_name(util_name: &str) -> &str {
     match util_name {
         // uu_test aliases - '[' is an alias for test
         "[" => "test",
-
-        "dir" => "ls", // dir is an alias for ls
+        "dir" => "ls",  // dir is an alias for ls
+        "vdir" => "ls", // vdir is an alias for ls
 
         // Default case - return the util name as is
         _ => util_name,

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

@@ -2,8 +2,13 @@ ls-about = List directory contents.
   Ignore files and directories starting with a '.' by default
 dir-about = List directory contents.
   Ignore files and directories starting with a '.' by default
+vdir-about = List directory contents.
+  Ignore files and directories starting with a '.' by default
+
+  Mandatory arguments to long options are mandatory for short options too.
 ls-usage = ls [OPTION]... [FILE]...
 dir-usage = dir [OPTION]... [FILE]...
+vdir-usage = vdir [OPTION]... [FILE]...
 ls-after-help = The TIME_STYLE argument can be full-iso, long-iso, iso, locale or +FORMAT. FORMAT is interpreted like in date. Also the TIME_STYLE environment variable sets the default style to use.
 
 # Error messages

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

@@ -2,8 +2,13 @@ ls-about = Lister le contenu des répertoires.
   Ignorer les fichiers et répertoires commençant par un '.' par défaut
 dir-about = Lister le contenu des répertoires.
   Ignorer les fichiers et répertoires commençant par un '.' par défaut
+vdir-about = Lister le contenu des répertoires.
+  Ignorer les fichiers et répertoires commençant par un '.' par défaut
+
+  Les arguments obligatoires pour les options longues le sont aussi pour les options courtes.
 ls-usage = ls [OPTION]... [FICHIER]...
 dir-usage = dir [OPTION]... [FICHIER]...
+vdir-usage = vdir [OPTION]... [FICHIER]...
 ls-after-help = L'argument TIME_STYLE peut être full-iso, long-iso, iso, locale ou +FORMAT. FORMAT est interprété comme dans date. De plus, la variable d'environnement TIME_STYLE définit le style par défaut à utiliser.
 
 # Messages d'erreur

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

@@ -9,6 +9,7 @@ use std::path::Path;
 use uu_ls::{Config, Format, options};
 use uucore::error::UResult;
 use uucore::quoting_style::QuotingStyle;
+use uucore::{format_usage, translate};
 
 #[uucore::main]
 pub fn uumain(args: impl uucore::Args) -> UResult<()> {
@@ -61,4 +62,6 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
 // an uu_app function, so we need this dummy one.
 pub fn uu_app() -> Command {
     uu_ls::uu_app()
+        .override_usage(format_usage(&translate!("vdir-usage")))
+        .about(translate!("vdir-about"))
 }

src/uu/vdir/src/vdir.rs

@@ -171,8 +171,8 @@ pub fn get_canonical_util_name(util_name: &str) -> &str {
     match util_name {
         // uu_test aliases - '[' is an alias for test
         "[" => "test",
-
-        "dir" => "ls", // dir is an alias for ls
+        "dir" => "ls",  // dir is an alias for ls
+        "vdir" => "ls", // vdir is an alias for ls
 
         // Default case - return the util name as is
         _ => util_name,

src/uucore/src/lib/lib.rs

@@ -56,3 +56,21 @@ fn test_column_output() {
 fn test_invalid_option_exit_code() {
     new_ucmd!().arg("-/").fails().code_is(2);
 }
+
+#[test]
+fn test_help_shows_vdir_not_ls() {
+    let result = new_ucmd!().arg("--help").succeeds();
+    let output = result.stdout_str();
+
+    // Verify help text contains "vdir" in the usage line
+    assert!(
+        output.contains("vdir [OPTION]"),
+        "Help should show 'vdir [OPTION]'"
+    );
+
+    // Verify help text does not incorrectly show "ls"
+    assert!(
+        !output.contains("ls [OPTION]"),
+        "Help should not show 'ls [OPTION]'"
+    );
+}