Merge pull request #8482 from sylvestre/l10n-2

sort: adjust the behavior of 'sort --output --file-with-dash' to match GNU's

Author: cakebaker

src/uu/sort/src/sort.rs

@@ -1480,6 +1480,8 @@ pub fn uu_app() -> Command {
                 .value_parser(ValueParser::os_string())
                 .value_name("FILENAME")
                 .value_hint(clap::ValueHint::FilePath)
+                .num_args(1)
+                .allow_hyphen_values(true)
                 // To detect multiple occurrences and raise an error
                 .action(ArgAction::Append),
         )

tests/by-util/test_sort.rs

@@ -1349,6 +1349,29 @@ fn test_multiple_output_files() {
         .stderr_is("sort: multiple output files specified\n");
 }
 
+#[test]
+fn test_output_file_with_leading_dash() {
+    let test_cases = [
+        (
+            ["--output", "--dash-file"],
+            "banana\napple\ncherry\n",
+            "apple\nbanana\ncherry\n",
+        ),
+        (
+            ["-o", "--another-dash-file"],
+            "zebra\nxray\nyak\n",
+            "xray\nyak\nzebra\n",
+        ),
+    ];
+
+    for (args, input, expected) in test_cases {
+        let (at, mut ucmd) = at_and_ucmd!();
+        ucmd.args(&args).pipe_in(input).succeeds().no_stdout();
+
+        assert_eq!(at.read(args[1]), expected);
+    }
+}
+
 #[test]
 // Test for GNU tests/sort/sort-files0-from.pl "f-extra-arg"
 fn test_files0_from_extra_arg() {
@@ -1698,26 +1721,4 @@ fn test_clap_localization_invalid_value() {
     }
 }
 
-#[test]
-fn test_clap_localization_tip_for_value_with_dash() {
-    let test_cases = vec![
-        ("en_US.UTF-8", vec!["tip:", "-- --file-with-dash"]),
-        ("fr_FR.UTF-8", vec!["tip:", "-- --file-with-dash"]), // TODO: fix French translation
-    ];
-
-    for (locale, expected_strings) in test_cases {
-        let result = new_ucmd!()
-            .env("LANG", locale)
-            .env("LC_ALL", locale)
-            .arg("--output")
-            .arg("--file-with-dash")
-            .fails();
-
-        let stderr = result.stderr_str();
-        for expected in expected_strings {
-            assert!(stderr.contains(expected));
-        }
-    }
-}
-
 /* spell-checker: enable */