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

Use Qt date localization instead of translated strings

Browse source 
This gets us consistent date format everywhere. The reordering of month
name and day of the month didn't work correctly on Windows, anyway.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-08-03 13:02:32 -07:00
parent fc75457cc8
commit 2ad433671f
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dive.h
View file

@ -760,6 +760,7 @@ extern double strtod_flags(const char *str, const char **ptr, unsigned int flags
extern void set_save_userid_local(short value);
extern void set_userid(char *user_id);
extern const char *get_dive_date_c_string(timestamp_t when);
#ifdef __cplusplus
}
#endif

3
libdivecomputer.c
View file

@ -435,8 +435,7 @@ static int dive_cb(const unsigned char *data, unsigned int size,
dive->when = dive->dc.when = utc_mktime(&tm);
// Parse the divetime.
dev_info(devdata, translate("gettextFromC", "Dive %d: %s %d %04d"), import_dive_number,
monthname(tm.tm_mon), tm.tm_mday, year(tm.tm_year));
dev_info(devdata, translate("gettextFromC", "Dive %d: %s"), import_dive_number, get_dive_date_c_string(dive->when));
unsigned int divetime = 0;
rc = dc_parser_get_field(parser, DC_FIELD_DIVETIME, 0, &divetime);
if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {

6
qt-gui.cpp
View file

@ -419,6 +419,12 @@ QString get_short_dive_date_string(timestamp_t when)
return loc.toString(ts.toUTC(), shortDateFormat + " " + timeFormat);
}
const char *get_dive_date_c_string(timestamp_t when)
{
QString text = get_dive_date_string(when);
return strdup(text.toUtf8().data());
}
QString get_trip_date_string(timestamp_t when, int nr)
{
struct tm tm;