mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 06:15:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

core: move formatting of day-of-week to string-format.cpp

Browse source 
This was only used by the filter, but will also be used
by the statistics module. To avoid duplicate translation
strings, move to a common place.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2021-01-01 12:49:50 +01:00 • committed by bstoeger
parent b0b52d51bd
commit e23d103c5d
3 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
core/filterconstraint.cpp
View file

@ -7,6 +7,7 @@
#include "qthelper.h"
#include "tag.h"
#include "trip.h"
#include "string-format.h"
#include "subsurface-string.h"
#include "subsurface-time.h"
#include <QDateTime>
@ -409,17 +410,10 @@ QStringList filter_contraint_multiple_choice_translated(enum filter_constraint_t
types.append(gettextFromC::tr(divemode_text_ui[i]));
return types;
} else if (type == FILTER_CONSTRAINT_DAY_OF_WEEK) {
// I can't wrap my head around the fact that Sunday is the
// first day of the week, but that's how it is.
return QStringList {
gettextFromC::tr("Sunday"),
gettextFromC::tr("Monday"),
gettextFromC::tr("Tuesday"),
gettextFromC::tr("Wednesday"),
gettextFromC::tr("Thursday"),
gettextFromC::tr("Friday"),
gettextFromC::tr("Saturday"),
};
QStringList days;
for (int i = 0; i < 7; ++i)
days.push_back(formatDayOfWeek(i));
return days;
}
return QStringList();
}

16
core/string-format.cpp
View file

@ -257,3 +257,19 @@ QString formatDiveDateTime(const dive *d)
return QStringLiteral("%1 %2").arg(localTime.date().toString(prefs.date_format_short),
localTime.time().toString(prefs.time_format));
}
QString formatDayOfWeek(int day)
{
// I can't wrap my head around the fact that Sunday is the
// first day of the week, but that's how it is.
switch (day) {
default:
case 0: return gettextFromC::tr("Sunday");
case 1: return gettextFromC::tr("Monday");
case 2: return gettextFromC::tr("Tuesday");
case 3: return gettextFromC::tr("Wednesday");
case 4: return gettextFromC::tr("Thursday");
case 5: return gettextFromC::tr("Friday");
case 6: return gettextFromC::tr("Saturday");
}
}

1
core/string-format.h
View file

@ -25,5 +25,6 @@ QString formatDiveGPS(const dive *d);
QString formatDiveDate(const dive *d);
QString formatDiveTime(const dive *d);
QString formatDiveDateTime(const dive *d);
QString formatDayOfWeek(int day);
#endif