FlapJackApps/subsurface
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use correct "tr" call for translating dive mode names

Browse Source 
Correctly use gettextFromC::instance()->tr(); instead of a simple
tr(); to translate the dive mode names.
This goes on top of 0bc9edf855
and finally makes the whole thing work.

Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
This commit is contained in:
Stefan Fuchs
2018-06-17 08:48:54 +02:00
committed by bstoeger
parent 2466351a5f
commit 88e6ba2f61
6 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
profile-widget/diveeventitem.cpp
View File

@@ -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);

9
profile-widget/profilewidget2.cpp
View File

@@ -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);