Skip to content

Commit e5a2f89

Browse files
Merge branch 'main' into more-test-fix
2 parents ff00113 + 7d730bf commit e5a2f89

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ mv-after-help = When specifying more than one of -i, -f, -n, only the final one
1616
- older This is the default operation when --update is specified, and results in files being replaced if they’re older than the corresponding source file.
1717
1818
# Error messages
19+
mv-error-insufficient-arguments = The argument '<{$arg_files}>...' requires at least 2 values, but only 1 was provided
1920
mv-error-no-such-file = cannot stat {$path}: No such file or directory
2021
mv-error-cannot-stat-not-directory = cannot stat {$path}: Not a directory
2122
mv-error-same-file = {$source} and {$target} are the same file

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ mv-after-help = Lors de la spécification de plus d'une option parmi -i, -f, -n,
1616
- older C'est l'opération par défaut quand --update est spécifié, et résulte en des fichiers étant remplacés s'ils sont plus anciens que le fichier source correspondant.
1717
1818
# Messages d'erreur
19+
mv-error-insufficient-arguments = L'argument '<{$arg_files}>...' nécessite au moins 2 valeurs, mais seulement 1 a été fournie
1920
mv-error-no-such-file = impossible de lire {$path} : Aucun fichier ou répertoire de ce nom
2021
mv-error-cannot-stat-not-directory = impossible de lire {$path} : N'est pas un répertoire
2122
mv-error-same-file = {$source} et {$target} sont le même fichier

src/uu/mv/src/mv.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,9 +163,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
163163
if files.len() == 1 && !matches.contains_id(OPT_TARGET_DIRECTORY) {
164164
app.error(
165165
ErrorKind::TooFewValues,
166-
format!(
167-
"The argument '<{ARG_FILES}>...' requires at least 2 values, but only 1 was provided"
168-
),
166+
translate!("mv-error-insufficient-arguments", "arg_files" => ARG_FILES),
169167
)
170168
.exit();
171169
}

src/uucore/src/lib/mods/locale.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ invalid-syntax = This is { $missing
747747

748748
let result = init_localization(&locale, temp_dir.path(), "nonexistent_test_util");
749749
if let Err(e) = &result {
750-
eprintln!("Init localization failed: {}", e);
750+
eprintln!("Init localization failed: {e}");
751751
}
752752
assert!(result.is_ok());
753753

0 commit comments

Comments
 (0)