From 0bc9edf855caf95e2d58ccaf704ceeda079e06f1 Mon Sep 17 00:00:00 2001 From: Stefan Fuchs Date: Sat, 16 Jun 2018 16:30:03 +0200 Subject: Fix an error around translation of dive modes in the UI This fixes an mistake introduced in 3d1072f8862e4c329dc2678df52a24137b8d4704 Signed-off-by: Stefan Fuchs --- profile-widget/diveeventitem.cpp | 2 +- profile-widget/profilewidget2.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'profile-widget') diff --git a/profile-widget/diveeventitem.cpp b/profile-widget/diveeventitem.cpp index 9e868e0b3..45b9da363 100644 --- a/profile-widget/diveeventitem.cpp +++ b/profile-widget/diveeventitem.cpp @@ -194,7 +194,7 @@ void DiveEventItem::setupToolTipString(struct gasmix *lastgasmix) } *lastgasmix = *mix; } else if (same_string(internalEvent->name, "modechange")) { - name += QString(": %1").arg(divemode_text_ui[internalEvent->value]); + name += QString(": %1").arg(tr(divemode_text_ui[internalEvent->value])); } else if (value) { if (type == SAMPLE_EVENT_PO2 && same_string(internalEvent->name, "SP change")) { name += QString(": %1bar").arg((double)value / 1000, 0, 'f', 1); diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index 142514a2d..708b7a4fc 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -1436,21 +1436,21 @@ void ProfileWidget2::contextMenuEvent(QContextMenuEvent *event) QMenu *changeMode = m.addMenu(tr("Change divemode")); if (divemode != OC) { QAction *action = new QAction(&m); - action->setText(divemode_text_ui[OC]); + action->setText(tr(divemode_text_ui[OC])); connect(action, SIGNAL(triggered(bool)), this, SLOT(addDivemodeSwitch())); action->setData(event->globalPos()); changeMode->addAction(action); } if (divemode != CCR) { QAction *action = new QAction(&m); - action->setText(divemode_text_ui[CCR]); + action->setText(tr(divemode_text_ui[CCR])); connect(action, SIGNAL(triggered(bool)), this, SLOT(addDivemodeSwitch())); action->setData(event->globalPos()); changeMode->addAction(action); } if (divemode != PSCR) { QAction *action = new QAction(&m); - action->setText(divemode_text_ui[PSCR]); + action->setText(tr(divemode_text_ui[PSCR])); connect(action, SIGNAL(triggered(bool)), this, SLOT(addDivemodeSwitch())); action->setData(event->globalPos()); changeMode->addAction(action); @@ -1622,7 +1622,7 @@ void ProfileWidget2::addDivemodeSwitch() QAction *action = qobject_cast(sender()); QPointF scenePos = mapToScene(mapFromGlobal(action->data().toPoint())); for (i = 0; i < UNDEF_COMP_TYPE; i++) - if (QString(divemode_text_ui[i]) == action->text()) + if (QString(tr(divemode_text_ui[i])) == action->text()) add_event(current_dc, lrint(timeAxis->valueAt(scenePos)), 8, 0, i, QT_TRANSLATE_NOOP("gettextFromC", "modechange")); invalidate_dive_cache(current_dive); -- cgit v1.2.3-70-g09d2