Skip to content

Commit e22bfab

Browse files
committed
tail: hardcode no-such-file and became-inaccessible status messages
1 parent 1b2176b commit e22bfab

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@ tail-status-has-been-replaced-following-new-file = { $file } has been replaced;
5858
tail-status-file-truncated = { $file }: file truncated
5959
tail-status-replaced-with-untailable-file = { $file } has been replaced with an untailable file
6060
tail-status-replaced-with-untailable-file-giving-up = { $file } has been replaced with an untailable file; giving up on this name
61-
tail-status-file-became-inaccessible = { $file } { $become_inaccessible }: { $no_such_file }
6261
tail-status-directory-containing-watched-file-removed = directory containing watched file was removed
6362
tail-status-backend-cannot-be-used-reverting-to-polling = { $backend } cannot be used, reverting to polling
64-
tail-status-file-no-such-file = { $file }: { $no_such_file }
6563
6664
# Text constants
6765
tail-bad-fd = Bad file descriptor

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,8 @@ tail-status-has-been-replaced-following-new-file = { $file } a été remplacé ;
5757
tail-status-file-truncated = { $file } : fichier tronqué
5858
tail-status-replaced-with-untailable-file = { $file } a été remplacé par un fichier non suivable
5959
tail-status-replaced-with-untailable-file-giving-up = { $file } a été remplacé par un fichier non suivable ; abandon de ce nom
60-
tail-status-file-became-inaccessible = { $file } { $become_inaccessible } : { $no_such_file }
6160
tail-status-directory-containing-watched-file-removed = le répertoire contenant le fichier surveillé a été supprimé
6261
tail-status-backend-cannot-be-used-reverting-to-polling = { $backend } ne peut pas être utilisé, retour au sondage
63-
tail-status-file-no-such-file = { $file } : { $no_such_file }
6462
6563
# Constantes de texte
6664
tail-bad-fd = Descripteur de fichier incorrect

src/uu/tail/src/follow/watch.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,10 @@ impl Observer {
394394
if let Some(old_md) = self.files.get_mut_metadata(event_path) {
395395
if old_md.is_tailable() && self.files.get(event_path).reader.is_some() {
396396
show_error!(
397-
"{}",
398-
translate!("tail-status-file-became-inaccessible", "file" => display_name.quote(), "become_inaccessible" => translate!("tail-become-inaccessible"), "no_such_file" => translate!("tail-no-such-file-or-directory"))
397+
"{} {}: {}",
398+
display_name.quote(),
399+
translate!("tail-become-inaccessible"),
400+
translate!("tail-no-such-file-or-directory")
399401
);
400402
}
401403
}
@@ -410,8 +412,9 @@ impl Observer {
410412
}
411413
} else {
412414
show_error!(
413-
"{}",
414-
translate!("tail-status-file-no-such-file", "file" => display_name, "no_such_file" => translate!("tail-no-such-file-or-directory"))
415+
"{}: {}",
416+
display_name,
417+
translate!("tail-no-such-file-or-directory")
415418
);
416419
if !self.files.files_remaining() && self.use_polling {
417420
// NOTE: GNU's tail exits here for `---disable-inotify`

0 commit comments

Comments
 (0)