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

l10n: Eliminated some column labels

Browse source
This commit is contained in:
Paul Beckingham 2018-01-21 22:43:24 -05:00
parent c94f481f2a
commit 3df06e6482
11 changed files with 23 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/columns/ColStatus.cpp
View file

@ -27,7 +27,6 @@
#include <cmake.h>
#include <ColStatus.h>
#include <format.h>
#include <i18n.h>
#include <utf8.h>
////////////////////////////////////////////////////////////////////////////////
@ -37,8 +36,8 @@ ColumnStatus::ColumnStatus ()
_style = "long";
_label = "Status";
_styles = {"long", "short"};
_examples = {STRING_COLUMN_LABEL_STAT_PE,
STRING_COLUMN_LABEL_STAT_P};
_examples = {"Pending",
"P"};
}
////////////////////////////////////////////////////////////////////////////////
@ -49,7 +48,7 @@ void ColumnStatus::setStyle (const std::string& value)
Column::setStyle (value);
if (_style == "short" && _label == "Status")
_label = STRING_COLUMN_LABEL_STAT;
_label = "St";
}
////////////////////////////////////////////////////////////////////////////////
@ -62,15 +61,15 @@ void ColumnStatus::measure (Task& task, unsigned int& minimum, unsigned int& max
_style == "long")
{
if (status == Task::pending)
minimum = maximum = utf8_width (STRING_COLUMN_LABEL_STAT_PE);
minimum = maximum = utf8_width ("Pending");
else if (status == Task::deleted)
minimum = maximum = utf8_width (STRING_COLUMN_LABEL_STAT_DE);
minimum = maximum = utf8_width ("Deleted");
else if (status == Task::waiting)
minimum = maximum = utf8_width (STRING_COLUMN_LABEL_STAT_WA);
minimum = maximum = utf8_width ("Waiting");
else if (status == Task::completed)
minimum = maximum = utf8_width (STRING_COLUMN_LABEL_STAT_CO);
minimum = maximum = utf8_width ("Completed");
else if (status == Task::recurring)
minimum = maximum = utf8_width (STRING_COLUMN_LABEL_STAT_RE);
minimum = maximum = utf8_width ("Recurring");
}
else if (_style == "short")
minimum = maximum = 1;
@ -89,20 +88,20 @@ void ColumnStatus::render (
if (_style == "default" ||
_style == "long")
{
if (status == Task::pending) value = STRING_COLUMN_LABEL_STAT_PE;
else if (status == Task::completed) value = STRING_COLUMN_LABEL_STAT_CO;
else if (status == Task::deleted) value = STRING_COLUMN_LABEL_STAT_DE;
else if (status == Task::waiting) value = STRING_COLUMN_LABEL_STAT_WA;
else if (status == Task::recurring) value = STRING_COLUMN_LABEL_STAT_RE;
if (status == Task::pending) value = "Pending";
else if (status == Task::completed) value = "Completed";
else if (status == Task::deleted) value = "Deleted";
else if (status == Task::waiting) value = "Waiting";
else if (status == Task::recurring) value = "Recurring";
}
else if (_style == "short")
{
if (status == Task::pending) value = STRING_COLUMN_LABEL_STAT_P;
else if (status == Task::completed) value = STRING_COLUMN_LABEL_STAT_C;
else if (status == Task::deleted) value = STRING_COLUMN_LABEL_STAT_D;
else if (status == Task::waiting) value = STRING_COLUMN_LABEL_STAT_W;
else if (status == Task::recurring) value = STRING_COLUMN_LABEL_STAT_R;
if (status == Task::pending) value = "P";
else if (status == Task::completed) value = "C";
else if (status == Task::deleted) value = "D";
else if (status == Task::waiting) value = "W";
else if (status == Task::recurring) value = "R";
}
renderStringLeft (lines, width, color, value);

11
src/commands/CmdStats.cpp
View file

@ -37,7 +37,6 @@
#include <main.h>
#include <format.h>
#include <util.h>
#include <i18n.h>
extern Context context;
@ -163,23 +162,23 @@ int CmdStats::execute (std::string& output)
setHeaderUnderline (view);
int row = view.addRow ();
view.set (row, 0, STRING_COLUMN_LABEL_STAT_PE);
view.set (row, 0, "Pending");
view.set (row, 1, pendingT);
row = view.addRow ();
view.set (row, 0, STRING_COLUMN_LABEL_STAT_WA);
view.set (row, 0, "Waiting");
view.set (row, 1, waitingT);
row = view.addRow ();
view.set (row, 0, STRING_COLUMN_LABEL_STAT_RE);
view.set (row, 0, "Recurring");
view.set (row, 1, recurringT);
row = view.addRow ();
view.set (row, 0, STRING_COLUMN_LABEL_STAT_CO);
view.set (row, 0, "Completed");
view.set (row, 1, completedT);
row = view.addRow ();
view.set (row, 0, STRING_COLUMN_LABEL_STAT_DE);
view.set (row, 0, "Deleted");
view.set (row, 1, deletedT);
row = view.addRow ();

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

@ -29,17 +29,6 @@
#define STRING_COLUMN_LABEL_MOD "Geändert"
#define STRING_COLUMN_LABEL_RECUR "Wiederh."
#define STRING_COLUMN_LABEL_STAT "St"
#define STRING_COLUMN_LABEL_STAT_C "E"
#define STRING_COLUMN_LABEL_STAT_CO "Erledigt"
#define STRING_COLUMN_LABEL_STAT_D "G"
#define STRING_COLUMN_LABEL_STAT_DE "Gelöscht"
#define STRING_COLUMN_LABEL_STAT_P "O"
#define STRING_COLUMN_LABEL_STAT_PE "Offen"
#define STRING_COLUMN_LABEL_STAT_R "W"
#define STRING_COLUMN_LABEL_STAT_RE "Wiederholend"
#define STRING_COLUMN_LABEL_STAT_W "A"
#define STRING_COLUMN_LABEL_STAT_WA "Wartet"
#define STRING_COLUMN_LABEL_TAG "Schlagwort"
#define STRING_COLUMN_LABEL_UNTIL "Bis"
#define string_column_label_urgency "dringlichkeit"

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

@ -29,17 +29,6 @@
#define STRING_COLUMN_LABEL_MOD "Modified"
#define STRING_COLUMN_LABEL_RECUR "Recur"
#define STRING_COLUMN_LABEL_STAT "St"
#define STRING_COLUMN_LABEL_STAT_C "C"
#define STRING_COLUMN_LABEL_STAT_CO "Completed"
#define STRING_COLUMN_LABEL_STAT_D "D"
#define STRING_COLUMN_LABEL_STAT_DE "Deleted"
#define STRING_COLUMN_LABEL_STAT_P "P"
#define STRING_COLUMN_LABEL_STAT_PE "Pending"
#define STRING_COLUMN_LABEL_STAT_R "R"
#define STRING_COLUMN_LABEL_STAT_RE "Recurring"
#define STRING_COLUMN_LABEL_STAT_W "W"
#define STRING_COLUMN_LABEL_STAT_WA "Waiting"
#define STRING_COLUMN_LABEL_TAG "Tag"
#define STRING_COLUMN_LABEL_UNTIL "Until"
#define STRING_COLUMN_LABEL_URGENCY "Urgency"

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

@ -29,17 +29,6 @@
#define STRING_COLUMN_LABEL_MOD "Modified"
#define STRING_COLUMN_LABEL_RECUR "Recur"
#define STRING_COLUMN_LABEL_STAT "St"
#define STRING_COLUMN_LABEL_STAT_C "Fn"
#define STRING_COLUMN_LABEL_STAT_CO "Finita"
#define STRING_COLUMN_LABEL_STAT_D "Vŝ"
#define STRING_COLUMN_LABEL_STAT_DE "Viŝita"
#define STRING_COLUMN_LABEL_STAT_P "Pd"
#define STRING_COLUMN_LABEL_STAT_PE "Pendanta"
#define STRING_COLUMN_LABEL_STAT_R "Re"
#define STRING_COLUMN_LABEL_STAT_RE "Reokazanta"
#define STRING_COLUMN_LABEL_STAT_W "At"
#define STRING_COLUMN_LABEL_STAT_WA "Atendanta"
#define STRING_COLUMN_LABEL_TAG "Etik"
#define STRING_COLUMN_LABEL_UNTIL "Ĝis"
#define STRING_COLUMN_LABEL_URGENCY "Urĝeco"

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

@ -29,17 +29,6 @@
#define STRING_COLUMN_LABEL_MOD "Modificada"
#define STRING_COLUMN_LABEL_RECUR "Recur" // |esp-ESP|==|eng-USA|
#define STRING_COLUMN_LABEL_STAT "Est"
#define STRING_COLUMN_LABEL_STAT_C "C" // |esp-ESP|==|eng-USA|
#define STRING_COLUMN_LABEL_STAT_CO "Completadas"
#define STRING_COLUMN_LABEL_STAT_D "S"
#define STRING_COLUMN_LABEL_STAT_DE "Suprimidas"
#define STRING_COLUMN_LABEL_STAT_P "P" // |esp-ESP|==|eng-USA|
#define STRING_COLUMN_LABEL_STAT_PE "Pendientes"
#define STRING_COLUMN_LABEL_STAT_R "R" // |esp-ESP|==|eng-USA|
#define STRING_COLUMN_LABEL_STAT_RE "Recurrentes"
#define STRING_COLUMN_LABEL_STAT_W "E"
#define STRING_COLUMN_LABEL_STAT_WA "Esperando"
#define STRING_COLUMN_LABEL_TAG "Marca"
#define STRING_COLUMN_LABEL_UNTIL "Hasta"
#define STRING_COLUMN_LABEL_URGENCY "Urgencia"

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

@ -29,17 +29,6 @@
#define STRING_COLUMN_LABEL_MOD "Modifiée"
#define STRING_COLUMN_LABEL_RECUR "Récur"
#define STRING_COLUMN_LABEL_STAT "St"
#define STRING_COLUMN_LABEL_STAT_C "C"
#define STRING_COLUMN_LABEL_STAT_CO "Complétée"
#define STRING_COLUMN_LABEL_STAT_D "S"
#define STRING_COLUMN_LABEL_STAT_DE "Supprimée"
#define STRING_COLUMN_LABEL_STAT_P "P"
#define STRING_COLUMN_LABEL_STAT_PE "Prévue"
#define STRING_COLUMN_LABEL_STAT_R "R"
#define STRING_COLUMN_LABEL_STAT_RE "Récurrente"
#define STRING_COLUMN_LABEL_STAT_W "A"
#define STRING_COLUMN_LABEL_STAT_WA "En attente"
#define STRING_COLUMN_LABEL_TAG "Étiq"
#define STRING_COLUMN_LABEL_UNTIL "Until"
#define STRING_COLUMN_LABEL_URGENCY "Urgence"

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

@ -29,17 +29,6 @@
#define STRING_COLUMN_LABEL_MOD "Modificato"
#define STRING_COLUMN_LABEL_RECUR "Period"
#define STRING_COLUMN_LABEL_STAT "St"
#define STRING_COLUMN_LABEL_STAT_C "C"
#define STRING_COLUMN_LABEL_STAT_CO "Completati"
#define STRING_COLUMN_LABEL_STAT_D "D"
#define STRING_COLUMN_LABEL_STAT_DE "Cancellati"
#define STRING_COLUMN_LABEL_STAT_P "P"
#define STRING_COLUMN_LABEL_STAT_PE "Da fare"
#define STRING_COLUMN_LABEL_STAT_R "R"
#define STRING_COLUMN_LABEL_STAT_RE "Periodicamente"
#define STRING_COLUMN_LABEL_STAT_W "W"
#define STRING_COLUMN_LABEL_STAT_WA "In attesa"
#define STRING_COLUMN_LABEL_TAG "Tag"
#define STRING_COLUMN_LABEL_UNTIL "Fino a"
#define STRING_COLUMN_LABEL_URGENCY "Urgenza"

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

@ -29,17 +29,6 @@
#define STRING_COLUMN_LABEL_MOD "Modified"
#define STRING_COLUMN_LABEL_RECUR "Recur"
#define STRING_COLUMN_LABEL_STAT "St"
#define STRING_COLUMN_LABEL_STAT_C "C"
#define STRING_COLUMN_LABEL_STAT_CO "Completed"
#define STRING_COLUMN_LABEL_STAT_D "D"
#define STRING_COLUMN_LABEL_STAT_DE "Deleted"
#define STRING_COLUMN_LABEL_STAT_P "P"
#define STRING_COLUMN_LABEL_STAT_PE "Pending"
#define STRING_COLUMN_LABEL_STAT_R "R"
#define STRING_COLUMN_LABEL_STAT_RE "Recurring"
#define STRING_COLUMN_LABEL_STAT_W "W"
#define STRING_COLUMN_LABEL_STAT_WA "Waiting"
#define STRING_COLUMN_LABEL_TAG "Tag"
#define STRING_COLUMN_LABEL_UNTIL "Until"
#define STRING_COLUMN_LABEL_URGENCY "Urgency"

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

@ -29,17 +29,6 @@
#define STRING_COLUMN_LABEL_MOD "Zmienione"
#define STRING_COLUMN_LABEL_RECUR "Period"
#define STRING_COLUMN_LABEL_STAT "St"
#define STRING_COLUMN_LABEL_STAT_C "C"
#define STRING_COLUMN_LABEL_STAT_CO "Ukończone"
#define STRING_COLUMN_LABEL_STAT_D "D"
#define STRING_COLUMN_LABEL_STAT_DE "Usnięte"
#define STRING_COLUMN_LABEL_STAT_P "P"
#define STRING_COLUMN_LABEL_STAT_PE "W toku"
#define STRING_COLUMN_LABEL_STAT_R "R"
#define STRING_COLUMN_LABEL_STAT_RE "Zależne"
#define STRING_COLUMN_LABEL_STAT_W "W"
#define STRING_COLUMN_LABEL_STAT_WA "Zawieszone"
#define STRING_COLUMN_LABEL_TAG "Tag"
#define STRING_COLUMN_LABEL_UNTIL "Do"
#define STRING_COLUMN_LABEL_URGENCY "Pilność"

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

@ -29,17 +29,6 @@
#define STRING_COLUMN_LABEL_MOD "Modificada"
#define STRING_COLUMN_LABEL_RECUR "Period"
#define STRING_COLUMN_LABEL_STAT "Es"
#define STRING_COLUMN_LABEL_STAT_C "C" // |por-PRT|==|eng-USA|
#define STRING_COLUMN_LABEL_STAT_CO "Concluídas"
#define STRING_COLUMN_LABEL_STAT_D "E"
#define STRING_COLUMN_LABEL_STAT_DE "Eliminadas"
#define STRING_COLUMN_LABEL_STAT_P "P" // |por-PRT|==|eng-USA|
#define STRING_COLUMN_LABEL_STAT_PE "Pendentes"
#define STRING_COLUMN_LABEL_STAT_R "R" // |por-PRT|==|eng-USA|
#define STRING_COLUMN_LABEL_STAT_RE "Recorrentes"
#define STRING_COLUMN_LABEL_STAT_W "A"
#define STRING_COLUMN_LABEL_STAT_WA "Adiadas"
#define STRING_COLUMN_LABEL_TAG "Marca"
#define STRING_COLUMN_LABEL_UNTIL "Até"
#define STRING_COLUMN_LABEL_URGENCY "Urgência"