diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-13 08:19:23 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-06-13 20:00:20 +0200 |
| commit | 788c513dd4090dcba78b51b1a419ea504ec74672 (patch) | |
| tree | efbbdba11e73bfdfce9dcea77c63f626f48b4d71 | |
| parent | e34da61362c0a64b8fd932c3363421c766595d4a (diff) | |
| download | subsurface-788c513dd4090dcba78b51b1a419ea504ec74672.tar.gz | |
Improve the trip header
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | divelist.c | 9 | ||||
| -rw-r--r-- | qt-ui/models.cpp | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/divelist.c b/divelist.c index 7abad667b..606c30e01 100644 --- a/divelist.c +++ b/divelist.c @@ -607,12 +607,11 @@ char *get_trip_date_string(timestamp_t when, int nr) struct tm tm; utc_mkdate(when, &tm); snprintf(buffer, MAX_DATE_STRING, - /*++GETTEXT 60 char buffer weekday, monthname, day of month, year, nr dives */ - ngettext("Trip %1$s, %2$s %3$d, %4$d (%5$d dive)", - "Trip %1$s, %2$s %3$d, %4$d (%5$d dives)", nr), - weekday(tm.tm_wday), + /*++GETTEXT 60 char buffer monthname, year, nr dives */ + ngettext("%1$s %2$d (%3$d dive)", + "%1$s %2$d (%3$d dives)", nr), monthname(tm.tm_mon), - tm.tm_mday, tm.tm_year + 1900, + tm.tm_year + 1900, nr); } return buffer; diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 1cc9ab869..601f2f628 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -786,7 +786,7 @@ QVariant TripItem::data(int column, int role) const if (role == Qt::DisplayRole) { switch (column) { case NR: - ret = QString(trip->location) + QString(get_trip_date_string(trip->when, trip->nrdives)); + ret = QString(trip->location) + ", " + QString(get_trip_date_string(trip->when, trip->nrdives)); break; } } |