From 3e62f8e1392118106f8cb06d5ba78f8aee4e02bb Mon Sep 17 00:00:00 2001 From: Joern Date: Mon, 30 Jun 2014 14:07:10 +0200 Subject: [PATCH] Some more AM/APs ... some more AP/AM changes (hopefulyl the last ones) ... Setttings.h - the GC_DATETIMEFORMAT constant is not used anywhere (old usages are de-activated) --- src/CPPlot.cpp | 2 +- src/RideItem.cpp | 6 +++--- src/RideNavigator.cpp | 2 +- src/RideSummaryWindow.cpp | 2 +- src/Settings.h | 2 +- src/SummaryWindow.cpp | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/CPPlot.cpp b/src/CPPlot.cpp index cf97468b0..1711055b0 100644 --- a/src/CPPlot.cpp +++ b/src/CPPlot.cpp @@ -982,7 +982,7 @@ CPPlot::plotRide(RideItem *rideItem) if (maxNonZero == 1) return; // Right, lets actually plot the ride - rideCurve = new QwtPlotCurve(rideItem->dateTime.toString(tr("ddd MMM d, yyyy h:mm AP"))); + rideCurve = new QwtPlotCurve(rideItem->dateTime.toString(tr("ddd MMM d, yyyy hh:mm"))); rideCurve->setRenderHint(QwtPlotItem::RenderAntialiased); rideCurve->setBrush(QBrush(Qt::NoBrush)); // never filled diff --git a/src/RideItem.cpp b/src/RideItem.cpp index 70a5e2f1a..1d9f53c62 100644 --- a/src/RideItem.cpp +++ b/src/RideItem.cpp @@ -159,9 +159,9 @@ void RideItem::setStartTime(QDateTime newDateTime) { dateTime = newDateTime; - setText(0, dateTime.toString("ddd")); - setText(1, dateTime.toString("MMM d, yyyy")); - setText(2, dateTime.toString("h:mm AP")); + setText(0, dateTime.toString(tr("ddd"))); + setText(1, dateTime.toString(tr("MMM d, yyyy"))); + setText(2, dateTime.toString("hh:mm")); ride()->setStartTime(newDateTime); context->notifyRideSelected(this); diff --git a/src/RideNavigator.cpp b/src/RideNavigator.cpp index bbf1ca24d..5b99069ba 100644 --- a/src/RideNavigator.cpp +++ b/src/RideNavigator.cpp @@ -1004,7 +1004,7 @@ void NavigatorCellDelegate::paint(QPainter *painter, const QStyleOptionViewItem } else if (columnName == tr("Last updated")) { QDateTime dateTime; dateTime.setTime_t(index.model()->data(index, Qt::DisplayRole).toInt()); - value = dateTime.toString(tr("ddd MMM d, yyyy h:mm AP")); // same format as ride list + value = dateTime.toString(tr("ddd MMM d, yyyy hh:mm")); // same format as ride list } } diff --git a/src/RideSummaryWindow.cpp b/src/RideSummaryWindow.cpp index b42ac4e95..b0a3d3cf8 100644 --- a/src/RideSummaryWindow.cpp +++ b/src/RideSummaryWindow.cpp @@ -308,7 +308,7 @@ RideSummaryWindow::refresh() if (ridesummary) { RideItem *rideItem = myRideItem; - setSubTitle(rideItem->dateTime.toString(tr("dddd MMMM d, yyyy, h:mm AP"))); + setSubTitle(rideItem->dateTime.toString(tr("dddd MMMM d, yyyy, hh:mm"))); } else { if (myDateRange.name != "") setSubTitle(myDateRange.name); diff --git a/src/Settings.h b/src/Settings.h index d132031f7..c39c17667 100644 --- a/src/Settings.h +++ b/src/Settings.h @@ -46,7 +46,7 @@ #define GC_SETTINGS_BESTS_METRICS_DEFAULT "5s_critical_power,1m_critical_power,5m_critical_power,20m_critical_power,60m_critical_power" #define GC_SETTINGS_SUMMARY_METRICS_DEFAULT "skiba_xpower,skiba_relative_intensity,skiba_bike_score,daniels_points,daniels_equivalent_power,trimp_points,aerobic_decoupling" #define GC_SETTINGS_INTERVAL_METRICS_DEFAULT "workout_time,total_distance,total_work,average_power,skiba_xpower,max_power,average_hr,ninety_five_percent_hr,average_cad,average_speed" -#define GC_DATETIME_FORMAT "ddd MMM dd, yyyy, hh:mm AP" +#define GC_DATETIME_FORMAT "ddd MMM dd, yyyy, hh:mm" #define GC_UNIT "unit" #define GC_LANG "lang" #define GC_NICKNAME "nickname" diff --git a/src/SummaryWindow.cpp b/src/SummaryWindow.cpp index 6cd95c068..622c12da3 100644 --- a/src/SummaryWindow.cpp +++ b/src/SummaryWindow.cpp @@ -47,5 +47,5 @@ SummaryWindow::rideItemChanged() rideMetadata->setProperty("ride", property("ride")); RideItem *rideItem = myRideItem; - if (rideItem) setSubTitle(rideItem->dateTime.toString(tr("dddd MMMM d, yyyy, h:mm AP"))); + if (rideItem) setSubTitle(rideItem->dateTime.toString(tr("dddd MMMM d, yyyy, hh:mm"))); }