Fix an error around translation of dive modes in the UI

This fixes an mistake introduced in
3d1072f8862e4c329dc2678df52a24137b8d4704

Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>

8 files changed, 14 insertions, 14 deletions

diff --git a/core/dive.c b/core/dive.c
index 6821629d1..38994aab4 100644
--- a/core/dive.c
+++ b/core/dive.c
@@ -36,7 +36,7 @@ const char *cylinderuse_text[] = {
 	QT_TRANSLATE_NOOP("gettextFromC", "OC-gas"), QT_TRANSLATE_NOOP("gettextFromC", "diluent"), QT_TRANSLATE_NOOP("gettextFromC", "oxygen"), QT_TRANSLATE_NOOP("gettextFromC", "not used")
 };
 
-// For user visible text
+// For user visible text but still not translated
 const char *divemode_text_ui[] = {
 	QT_TRANSLATE_NOOP("gettextFromC", "Open circuit"),
 	QT_TRANSLATE_NOOP("gettextFromC", "CCR"),
diff --git a/core/statistics.c b/core/statistics.c
index 49a2493a5..58d851611 100644
--- a/core/statistics.c
+++ b/core/statistics.c
@@ -140,13 +140,13 @@ void process_all_dives(struct dive *dive, struct dive **prev_dive)
 	 * field in the statistics window */
 	stats_by_type[0].location = strdup(translate("gettextFromC", "All (by type stats)"));
 	stats_by_type[0].is_trip = true;
-	stats_by_type[1].location = strdup(divemode_text_ui[OC]);
+	stats_by_type[1].location = strdup(translate("gettextFromC", divemode_text_ui[OC]));
 	stats_by_type[1].is_trip = true;
-	stats_by_type[2].location = strdup(divemode_text_ui[CCR]);
+	stats_by_type[2].location = strdup(translate("gettextFromC", divemode_text_ui[CCR]));
 	stats_by_type[2].is_trip = true;
-	stats_by_type[3].location = strdup(divemode_text_ui[PSCR]);
+	stats_by_type[3].location = strdup(translate("gettextFromC", divemode_text_ui[PSCR]));
 	stats_by_type[3].is_trip = true;
-	stats_by_type[4].location = strdup(divemode_text_ui[FREEDIVE]);
+	stats_by_type[4].location = strdup(translate("gettextFromC", divemode_text_ui[FREEDIVE]));
 	stats_by_type[4].is_trip = true;
 
 	/* this relies on the fact that the dives in the dive_table
diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp
index 82ff4db79..f8c6f3418 100644
--- a/desktop-widgets/diveplanner.cpp
+++ b/desktop-widgets/diveplanner.cpp
@@ -448,7 +448,7 @@ PlannerSettingsWidget::PlannerSettingsWidget(QWidget *parent, Qt::WindowFlags f)
 
 	// should be the same order as in dive_comp_type!
 	for (int i=0; i < FREEDIVE; i++)
-		rebreather_modes.append(QString(divemode_text_ui[i]));
+		rebreather_modes.append(QString(tr(divemode_text_ui[i])));
 	ui.rebreathermode->insertItems(0, rebreather_modes);
 
 	modeMapper = new QSignalMapper(this);
diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp
index 62925ee52..fcd116a81 100644
--- a/desktop-widgets/tab-widgets/maintab.cpp
+++ b/desktop-widgets/tab-widgets/maintab.cpp
@@ -111,7 +111,7 @@ MainTab::MainTab(QWidget *parent) : QTabWidget(parent),
 	// This needs to be the same order as enum dive_comp_type in dive.h!
 	QStringList types = QStringList();
 	for (int i = 0; i < NUM_DIVEMODE; i++)
-		types.append(QString(divemode_text_ui[i]));
+		types.append(QString(tr(divemode_text_ui[i])));
 	ui.DiveType->insertItems(0, types);
 	connect(ui.DiveType, SIGNAL(currentIndexChanged(int)), this, SLOT(divetype_Changed(int)));
 
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<QAction *>(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);
diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp
index 2e3cb12a1..601b76cc0 100644
--- a/qt-models/diveplannermodel.cpp
+++ b/qt-models/diveplannermodel.cpp
@@ -252,7 +252,7 @@ QVariant DivePlannerPointsModel::data(const QModelIndex &index, int role) const
 			else
 				return p.time / 60;
 		case DIVEMODE:
-			return QString(divemode_text[p.divemode]);
+			return QString(tr(divemode_text_ui[p.divemode]));
 		case GAS:
 			/* Check if we have the same gasmix two or more times
 			 * If yes return more verbose string */
diff --git a/qt-models/models.cpp b/qt-models/models.cpp
index 74abf0533..5d96d4da4 100644
--- a/qt-models/models.cpp
+++ b/qt-models/models.cpp
@@ -83,7 +83,7 @@ void DiveTypeSelectionModel::repopulate()
 {
 	QStringList modes = QStringList();
 	for (int i = 0; i < FREEDIVE; i++)
-		modes.append(QString(divemode_text[i]));
+		modes.append(QString(tr(divemode_text_ui[i])));
 	setStringList(modes);
 }