diff --git a/ChangeLog b/ChangeLog index 56742f0e1..bb2522afe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -89,6 +89,8 @@ report variations, with code refactoring. (thanks to Lukas Barth). - New DOM references: annotations.count, tw.syncneeded. +- The message telling you to sync now indicates how many local changes will be + synced. ------ current release --------------------------- diff --git a/NEWS b/NEWS index a3706e3ce..e48504186 100644 --- a/NEWS +++ b/NEWS @@ -10,6 +10,8 @@ New Features in Taskwarrior 2.5.2 - Renovated 'timesheet' command with a more compact report that accepts a filter, and has a default filter showing the last four weeks of completed and started tasks. + - The message telling you to sync now indicates how many local changes will be + synced. New Commands in Taskwarrior 2.5.2 diff --git a/src/feedback.cpp b/src/feedback.cpp index 913ab7c26..2c5cc67e3 100644 --- a/src/feedback.cpp +++ b/src/feedback.cpp @@ -413,15 +413,14 @@ void feedback_backlog () if (context.config.get ("taskd.server") != "" && context.verbose ("sync")) { + int count = 0; std::vector lines = context.tdb2.backlog.get_lines (); for (auto& line : lines) - { if ((line)[0] == '{') - { - context.footnote (STRING_FEEDBACK_BACKLOG); - break; - } - } + ++count; + + if (count) + context.footnote (format (STRING_FEEDBACK_BACKLOG, count)); } } diff --git a/src/l10n/deu-DEU.h b/src/l10n/deu-DEU.h index d91be078a..d31b1ecb0 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -742,7 +742,7 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_UNBLOCKED "Aufgabe {1} '{2}' entsperrt." #define STRING_FEEDBACK_EXPIRED "Aufgabe {1} '{2}' ist abgelaufen und wurde gelöscht." -#define STRING_FEEDBACK_BACKLOG "Lokale Änderungen. Datenabgleich erforderlich." +#define STRING_FEEDBACK_BACKLOG "{1} Lokale Änderungen. Datenabgleich erforderlich." // helpers #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed." diff --git a/src/l10n/eng-USA.h b/src/l10n/eng-USA.h index 470ed4822..6e7db41a8 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.h @@ -740,7 +740,7 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_UNBLOCKED "Unblocked {1} '{2}'." #define STRING_FEEDBACK_EXPIRED "Task {1} '{2}' expired and was deleted." -#define STRING_FEEDBACK_BACKLOG "There are local changes. Sync required." +#define STRING_FEEDBACK_BACKLOG "There are {1} local changes. Sync required." // helpers #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed." diff --git a/src/l10n/epo-RUS.h b/src/l10n/epo-RUS.h index c44047d28..4a362468f 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -742,7 +742,7 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_UNBLOCKED "Malblokis {1} '{2}'." #define STRING_FEEDBACK_EXPIRED "Tasko {1} '{2}' fortempiĝis do estis viŝata." -#define STRING_FEEDBACK_BACKLOG "Estas lokaj ŝanĝoj. Sinkronigo devita." +#define STRING_FEEDBACK_BACKLOG "Estas {1} lokaj ŝanĝoj. Sinkronigo devita." // helpers #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed." diff --git a/src/l10n/esp-ESP.h b/src/l10n/esp-ESP.h index bc2858286..d13e2cb9f 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -754,7 +754,7 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Las marcas virtuales (incluída '{1}') están reservadas y no pueden ser añadidas o eliminadas." #define STRING_FEEDBACK_UNBLOCKED "Desbloqueada {1} '{2}'." #define STRING_FEEDBACK_EXPIRED "La tarea {1} '{2}' caducó y fue eliminada." -#define STRING_FEEDBACK_BACKLOG "Hay modificaciones locales. Se require una sincronización." +#define STRING_FEEDBACK_BACKLOG "Hay {1} modificaciones locales. Se require una sincronización." // helpers #define STRING_HELPER_PROJECT_CHANGE "El proyecto '{1}' ha cambiado." diff --git a/src/l10n/fra-FRA.h b/src/l10n/fra-FRA.h index 069c40709..19e794611 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -744,7 +744,7 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_UNBLOCKED "Unblocked {1} '{2}'." #define STRING_FEEDBACK_EXPIRED "Tâche {1} '{2}' a expiré et a été supprimée." -#define STRING_FEEDBACK_BACKLOG "Il y a des changements locaux. Synchronisation requise." +#define STRING_FEEDBACK_BACKLOG "Il y a des {1} changements locaux. Synchronisation requise." // helpers #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed." diff --git a/src/l10n/ita-ITA.h b/src/l10n/ita-ITA.h index f82c565e5..f3febb5fe 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -743,7 +743,7 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_UNBLOCKED "Sbloccato {1} '{2}'." #define STRING_FEEDBACK_EXPIRED "Il task {1} '{2}' è scaduto ed è stato eliminato" -#define STRING_FEEDBACK_BACKLOG "There are local changes. Sync required." +#define STRING_FEEDBACK_BACKLOG "There are {1} local changes. Sync required." // helpers #define STRING_HELPER_PROJECT_CHANGE "Il progetto '{1}' è stato modificat." diff --git a/src/l10n/jpn-JPN.h b/src/l10n/jpn-JPN.h index 1602c9617..87c066869 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -744,7 +744,7 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_UNBLOCKED "Unblocked {1} '{2}'." #define STRING_FEEDBACK_EXPIRED "Task {1} '{2}' expired and was deleted." -#define STRING_FEEDBACK_BACKLOG "There are local changes. Sync required." +#define STRING_FEEDBACK_BACKLOG "There are {1} local changes. Sync required." // helpers #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed." diff --git a/src/l10n/pol-POL.h b/src/l10n/pol-POL.h index cad499ecd..f3f61d924 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -744,7 +744,7 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_UNBLOCKED "Odblokowane {1} '{2}'." #define STRING_FEEDBACK_EXPIRED "Zadanie {1} '{2}' jest przedawnione i zostało usunięte." -#define STRING_FEEDBACK_BACKLOG "Wykryto lokalne zmiany. Wymagana synchronizacja." +#define STRING_FEEDBACK_BACKLOG "Wykryto {1} lokalne zmiany. Wymagana synchronizacja." // helpers #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed." diff --git a/src/l10n/por-PRT.h b/src/l10n/por-PRT.h index 0ca564656..3127e340e 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -744,7 +744,7 @@ #define STRING_FEEDBACK_TAG_VIRTUAL "Virtual tags (including '{1}') are reserved and may not be added or removed." #define STRING_FEEDBACK_UNBLOCKED "Desbloqueada {1} '{2}'." #define STRING_FEEDBACK_EXPIRED "Tarefa {1} '{2}' expirou e foi eliminada." -#define STRING_FEEDBACK_BACKLOG "Há modificações locais. Necessário sincronizar (sync)." +#define STRING_FEEDBACK_BACKLOG "Há {1} modificações locais. Necessário sincronizar (sync)." // helpers #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."