Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-14 05:53:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

change job notification message

Browse source 
This came up in the context of issue #4068. This change makes it more
likely that the correct translation from english to another language
will be done for the "Job ... has {ended,stopped}" message.
This commit is contained in:
Kurtis Rader 2017-05-27 15:41:22 -07:00
parent 4c47fbc964
commit 3d3c6cc495
2 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
po/de.po
View file

@ -248,15 +248,15 @@ msgstr "Socket"
msgid "Directory" msgid "Directory"
msgstr "Verzeichnis" msgstr "Verzeichnis"
#: src/proc.cpp:500 #: src/proc.cpp:495
#, fuzzy, c-format
msgid "'%ls' has %ls"
msgstr "'%ls' hat %ls"
#: src/proc.cpp:502
#, c-format #, c-format
msgid "Job %d, '%ls' has %ls" msgid "Job %d, '%ls' has stopped"
msgstr "Job %d, '%ls' hat %ls" msgstr "Job %d, '%ls' hat gestoppt"
#: src/proc.cpp:497
#, c-format
msgid "Job %d, '%ls' has ended"
msgstr "Job %d, '%ls' hat beendet"
#: src/proc.cpp:599 #: src/proc.cpp:599
#, fuzzy, c-format #, fuzzy, c-format

25
src/proc.cpp
View file

@ -485,22 +485,19 @@ static wcstring truncate_command(const wcstring &cmd) {
} }
/// Format information about job status for the user to look at. /// Format information about job status for the user to look at.
/// typedef enum { JOB_STOPPED, JOB_ENDED } job_status_t;
/// \param j the job to test static void format_job_info(const job_t *j, job_status_t status) {
/// \param status a string description of the job exit type const wchar_t *msg = L"Job %d, '%ls' has ended"; // this is the most common status msg
static void format_job_info(const job_t *j, const wchar_t *status, size_t job_count) { if (status == JOB_STOPPED) msg = L"Job %d, '%ls' has stopped";
fwprintf(stdout, L"\r"); fwprintf(stdout, L"\r");
if (job_count == 1) { fwprintf(stdout, _(msg), j->job_id, truncate_command(j->command()).c_str());
fwprintf(stdout, _(L"\'%ls\' has %ls"), truncate_command(j->command()).c_str(), status);
} else {
fwprintf(stdout, _(L"Job %d, \'%ls\' has %ls"), j->job_id,
truncate_command(j->command()).c_str(), status);
}
fflush(stdout); fflush(stdout);
if (cur_term != NULL) if (cur_term) {
tputs(clr_eol, 1, &writeb); tputs(clr_eol, 1, &writeb);
else } else {
fwprintf(stdout, L"\e[K"); fwprintf(stdout, L"\e[K");
}
fwprintf(stdout, L"\n"); fwprintf(stdout, L"\n");
} }
@ -620,7 +617,7 @@ int job_reap(bool allow_interactive) {
if (job_is_completed(j)) { if (job_is_completed(j)) {
if (!j->get_flag(JOB_FOREGROUND) && !j->get_flag(JOB_NOTIFIED) && if (!j->get_flag(JOB_FOREGROUND) && !j->get_flag(JOB_NOTIFIED) &&
!j->get_flag(JOB_SKIP_NOTIFICATION)) { !j->get_flag(JOB_SKIP_NOTIFICATION)) {
format_job_info(j, _(L"ended"), job_count); format_job_info(j, JOB_ENDED);
found = 1; found = 1;
} }
proc_fire_event(L"JOB_EXIT", EVENT_EXIT, -j->pgid, 0); proc_fire_event(L"JOB_EXIT", EVENT_EXIT, -j->pgid, 0);
@ -630,7 +627,7 @@ int job_reap(bool allow_interactive) {
} else if (job_is_stopped(j) && !j->get_flag(JOB_NOTIFIED)) { } else if (job_is_stopped(j) && !j->get_flag(JOB_NOTIFIED)) {
// Notify the user about newly stopped jobs. // Notify the user about newly stopped jobs.
if (!j->get_flag(JOB_SKIP_NOTIFICATION)) { if (!j->get_flag(JOB_SKIP_NOTIFICATION)) {
format_job_info(j, _(L"stopped"), job_count); format_job_info(j, JOB_STOPPED);
found = 1; found = 1;
} }
j->set_flag(JOB_NOTIFIED, true); j->set_flag(JOB_NOTIFIED, true);