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 /desktop-widgets | |
| 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 'desktop-widgets')
| -rw-r--r-- | desktop-widgets/diveplanner.cpp | 3 | ||||
| -rw-r--r-- | desktop-widgets/tab-widgets/maintab.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp index f8c6f3418..ad48ba3d4 100644 --- a/desktop-widgets/diveplanner.cpp +++ b/desktop-widgets/diveplanner.cpp @@ -5,6 +5,7 @@ #include "core/planner.h" #include "core/qthelper.h" #include "core/subsurface-qt/SettingsObjectWrapper.h" +#include "core/gettextfromc.h" #include "qt-models/cylindermodel.h" #include "qt-models/models.h" @@ -448,7 +449,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(tr(divemode_text_ui[i]))); + rebreather_modes.append(gettextFromC::instance()->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 fcd116a81..95fbb23c0 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -24,6 +24,7 @@ #include "qt-models/filtermodels.h" #include "core/divesite.h" #include "core/subsurface-string.h" +#include "core/gettextfromc.h" #include "desktop-widgets/locationinformation.h" #include "TabDiveExtraInfo.h" @@ -111,7 +112,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(tr(divemode_text_ui[i]))); + types.append(gettextFromC::instance()->tr(divemode_text_ui[i])); ui.DiveType->insertItems(0, types); connect(ui.DiveType, SIGNAL(currentIndexChanged(int)), this, SLOT(divetype_Changed(int))); |