From 4a5dfad74df707adcd206f893ef4bee85dba74ba Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Tue, 28 Feb 2017 00:10:15 -0500 Subject: [PATCH] Feedback: Sync message now indicates how many local changes will be synced --- ChangeLog | 2 ++ NEWS | 2 ++ src/feedback.cpp | 11 +++++------ src/l10n/deu-DEU.h | 2 +- src/l10n/eng-USA.h | 2 +- src/l10n/epo-RUS.h | 2 +- src/l10n/esp-ESP.h | 2 +- src/l10n/fra-FRA.h | 2 +- src/l10n/ita-ITA.h | 2 +- src/l10n/jpn-JPN.h | 2 +- src/l10n/pol-POL.h | 2 +- src/l10n/por-PRT.h | 2 +- 12 files changed, 18 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e5f63679..b1b12ff5f 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 38214d51b..bc8574f41 100644 --- a/NEWS +++ b/NEWS @@ -8,6 +8,8 @@ New Features in Taskwarrior 2.6.0 - 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.6.0 diff --git a/src/feedback.cpp b/src/feedback.cpp index 69029c754..4c7911423 100644 --- a/src/feedback.cpp +++ b/src/feedback.cpp @@ -415,15 +415,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 f5398f4a1..315aaa980 100644 --- a/src/l10n/deu-DEU.h +++ b/src/l10n/deu-DEU.h @@ -745,7 +745,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 617c2abd6..027cad916 100644 --- a/src/l10n/eng-USA.h +++ b/src/l10n/eng-USA.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 "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 0d5a23059..ff11f2e88 100644 --- a/src/l10n/epo-RUS.h +++ b/src/l10n/epo-RUS.h @@ -745,7 +745,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 aab24da90..e259571cf 100644 --- a/src/l10n/esp-ESP.h +++ b/src/l10n/esp-ESP.h @@ -757,7 +757,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 099c0736e..8d1e2ac97 100644 --- a/src/l10n/fra-FRA.h +++ b/src/l10n/fra-FRA.h @@ -747,7 +747,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 3258deeed..11e27ccf4 100644 --- a/src/l10n/ita-ITA.h +++ b/src/l10n/ita-ITA.h @@ -746,7 +746,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 0aecef8f4..562ed9151 100644 --- a/src/l10n/jpn-JPN.h +++ b/src/l10n/jpn-JPN.h @@ -747,7 +747,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 905da99fe..128e5e85c 100644 --- a/src/l10n/pol-POL.h +++ b/src/l10n/pol-POL.h @@ -747,7 +747,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 a35be3369..02ec74f0b 100644 --- a/src/l10n/por-PRT.h +++ b/src/l10n/por-PRT.h @@ -747,7 +747,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."