mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

3
desktop-widgets/diveplanner.cpp
View file

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

3
desktop-widgets/tab-widgets/maintab.cpp
View file

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

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

3
qt-models/diveplannermodel.cpp
View file

@ -7,6 +7,7 @@
#include "core/device.h"
#include "core/qthelper.h"
#include "core/subsurface-qt/SettingsObjectWrapper.h"
#include "core/gettextfromc.h"
#include <QApplication>
#include <QTextDocument>
#include <QtConcurrent>
@ -252,7 +253,7 @@ QVariant DivePlannerPointsModel::data(const QModelIndex &index, int role) const
else
return p.time / 60;
case DIVEMODE:
return QString(tr(divemode_text_ui[p.divemode]));
return gettextFromC::instance()->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 */

3
qt-models/models.cpp
View file

@ -7,6 +7,7 @@
*/
#include "qt-models/models.h"
#include "core/qthelper.h"
#include "core/gettextfromc.h"
#include <QLocale>
@ -83,7 +84,7 @@ void DiveTypeSelectionModel::repopulate()
{
QStringList modes = QStringList();
for (int i = 0; i < FREEDIVE; i++)
modes.append(QString(tr(divemode_text_ui[i])));
modes.append(gettextFromC::instance()->tr(divemode_text_ui[i]));
setStringList(modes);
}