diff options
| author |  Stefan Fuchs <sfuchs@gmx.de> | 2018-06-17 08:48:54 +0200 |
|---|---|---|
| committer |  bstoeger <32835590+bstoeger@users.noreply.github.com> | 2018-06-18 07:42:39 +0200 |
| commit | 88e6ba2f61cb1cf92787d8bdd2be499744ac546d (patch) | |
| tree | 3a26eb3e40f9f82002ead8ef5defd9bb55376c70 /profile-widget | |
| parent | 2466351a5f2aa0085e11f11e2c9fc0431ebdcc5b (diff) | |
| download | subsurface-88e6ba2f61cb1cf92787d8bdd2be499744ac546d.tar.gz | |
Use correct "tr" call for translating dive mode names
Correctly use gettextFromC::instance()->tr(); instead of a simple
tr(); to translate the dive mode names.
This goes on top of 0bc9edf855caf95e2d58ccaf704ceeda079e06f1
and finally makes the whole thing work.
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
Diffstat (limited to 'profile-widget')
| -rw-r--r-- | profile-widget/diveeventitem.cpp | 2 | ||||
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/profile-widget/diveeventitem.cpp b/profile-widget/diveeventitem.cpp index 45b9da363..e106a3c26 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(tr(divemode_text_ui[internalEvent->value])); + name += QString(": %1").arg(gettextFromC::instance()->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 708b7a4fc..a296c25da 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -22,6 +22,7 @@ #include "desktop-widgets/simplewidgets.h" #include "desktop-widgets/divepicturewidget.h" #include "core/qthelper.h" +#include "core/gettextfromc.h" #endif #include <libdivecomputer/parser.h> @@ -1436,21 +1437,21 @@ void ProfileWidget2::contextMenuEvent(QContextMenuEvent *event) QMenu *changeMode = m.addMenu(tr("Change divemode")); if (divemode != OC) { QAction *action = new QAction(&m); - action->setText(tr(divemode_text_ui[OC])); + action->setText(gettextFromC::instance()->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(tr(divemode_text_ui[CCR])); + action->setText(gettextFromC::instance()->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(tr(divemode_text_ui[PSCR])); + action->setText(gettextFromC::instance()->tr(divemode_text_ui[PSCR])); connect(action, SIGNAL(triggered(bool)), this, SLOT(addDivemodeSwitch())); action->setData(event->globalPos()); changeMode->addAction(action); @@ -1622,7 +1623,7 @@ void ProfileWidget2::addDivemodeSwitch() QAction *action = qobject_cast<QAction *>(sender()); QPointF scenePos = mapToScene(mapFromGlobal(action->data().toPoint())); for (i = 0; i < UNDEF_COMP_TYPE; i++) - if (QString(tr(divemode_text_ui[i])) == action->text()) + if (gettextFromC::instance()->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); |