GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Feedback: Sync message now indicates how many local changes will be synced

Browse source
This commit is contained in:
Paul Beckingham 2017-02-28 00:10:15 -05:00
parent 46ef672317
commit 4a5dfad74d
12 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -89,6 +89,8 @@
report variations, with code refactoring. report variations, with code refactoring.
(thanks to Lukas Barth). (thanks to Lukas Barth).
- New DOM references: annotations.count, tw.syncneeded. - New DOM references: annotations.count, tw.syncneeded.
- The message telling you to sync now indicates how many local changes will be
synced.
------ current release --------------------------- ------ current release ---------------------------

2
NEWS
View file

@ -8,6 +8,8 @@ New Features in Taskwarrior 2.6.0
- Renovated 'timesheet' command with a more compact report that accepts a - Renovated 'timesheet' command with a more compact report that accepts a
filter, and has a default filter showing the last four weeks of completed filter, and has a default filter showing the last four weeks of completed
and started tasks. 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 New Commands in Taskwarrior 2.6.0

11
src/feedback.cpp
View file

@ -415,15 +415,14 @@ void feedback_backlog ()
if (context.config.get ("taskd.server") != "" && if (context.config.get ("taskd.server") != "" &&
context.verbose ("sync")) context.verbose ("sync"))
{ {
int count = 0;
std::vector <std::string> lines = context.tdb2.backlog.get_lines (); std::vector <std::string> lines = context.tdb2.backlog.get_lines ();
for (auto& line : lines) for (auto& line : lines)
{
if ((line)[0] == '{') if ((line)[0] == '{')
{ ++count;
context.footnote (STRING_FEEDBACK_BACKLOG);
break; if (count)
} context.footnote (format (STRING_FEEDBACK_BACKLOG, count));
}
} }
} }

2
src/l10n/deu-DEU.h
View file

@ -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_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_UNBLOCKED "Aufgabe {1} '{2}' entsperrt."
#define STRING_FEEDBACK_EXPIRED "Aufgabe {1} '{2}' ist abgelaufen und wurde gelöscht." #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 // helpers
#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed." #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."

2
src/l10n/eng-USA.h
View file

@ -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_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_UNBLOCKED "Unblocked {1} '{2}'."
#define STRING_FEEDBACK_EXPIRED "Task {1} '{2}' expired and was deleted." #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 // helpers
#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed." #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."

2
src/l10n/epo-RUS.h
View file

@ -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_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_UNBLOCKED "Malblokis {1} '{2}'."
#define STRING_FEEDBACK_EXPIRED "Tasko {1} '{2}' fortempiĝis do estis viŝata." #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 // helpers
#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed." #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."

2
src/l10n/esp-ESP.h
View file

@ -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_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_UNBLOCKED "Desbloqueada {1} '{2}'."
#define STRING_FEEDBACK_EXPIRED "La tarea {1} '{2}' caducó y fue eliminada." #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 // helpers
#define STRING_HELPER_PROJECT_CHANGE "El proyecto '{1}' ha cambiado." #define STRING_HELPER_PROJECT_CHANGE "El proyecto '{1}' ha cambiado."

2
src/l10n/fra-FRA.h
View file

@ -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_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_UNBLOCKED "Unblocked {1} '{2}'."
#define STRING_FEEDBACK_EXPIRED "Tâche {1} '{2}' a expiré et a été supprimée." #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 // helpers
#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed." #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."

2
src/l10n/ita-ITA.h
View file

@ -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_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_UNBLOCKED "Sbloccato {1} '{2}'."
#define STRING_FEEDBACK_EXPIRED "Il task {1} '{2}' è scaduto ed è stato eliminato" #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 // helpers
#define STRING_HELPER_PROJECT_CHANGE "Il progetto '{1}' è stato modificat." #define STRING_HELPER_PROJECT_CHANGE "Il progetto '{1}' è stato modificat."

2
src/l10n/jpn-JPN.h
View file

@ -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_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_UNBLOCKED "Unblocked {1} '{2}'."
#define STRING_FEEDBACK_EXPIRED "Task {1} '{2}' expired and was deleted." #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 // helpers
#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed." #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."

2
src/l10n/pol-POL.h
View file

@ -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_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_UNBLOCKED "Odblokowane {1} '{2}'."
#define STRING_FEEDBACK_EXPIRED "Zadanie {1} '{2}' jest przedawnione i zostało usunięte." #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 // helpers
#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed." #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."

2
src/l10n/por-PRT.h
View file

@ -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_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_UNBLOCKED "Desbloqueada {1} '{2}'."
#define STRING_FEEDBACK_EXPIRED "Tarefa {1} '{2}' expirou e foi eliminada." #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 // helpers
#define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed." #define STRING_HELPER_PROJECT_CHANGE "The project '{1}' has changed."