diff options
| -rw-r--r-- | dive.c | 7 | ||||
| -rw-r--r-- | qt-ui/modeldelegates.cpp | 7 | ||||
| -rw-r--r-- | qt-ui/models.cpp | 2 |
3 files changed, 9 insertions, 7 deletions
@@ -26,10 +26,11 @@ static const char *default_tags[] = { QT_TRANSLATE_NOOP("gettextFromC", "deco") }; -const char *cylinderuse_text[] = { "OC-gas", "diluent", "oxygen" }; +const char *cylinderuse_text[] = { + QT_TRANSLATE_NOOP("gettextFromC", "OC-gas"), QT_TRANSLATE_NOOP("gettextFromC", "diluent"), QT_TRANSLATE_NOOP("gettextFromC", "oxygen") +}; const char *dctype_text[] = { "OC", "CCR", "PSCR" }; - int event_is_gaschange(struct event *ev) { return ev->type == SAMPLE_EVENT_GASCHANGE || @@ -586,7 +587,7 @@ void copy_cylinders(struct dive *s, struct dive *d, bool used_only) int cylinderuse_from_text(const char *text) { for (enum cylinderuse i = 0; i < NUM_GAS_USE; i++) { - if (same_string(text, cylinderuse_text[i])) + if (same_string(text, cylinderuse_text[i]) || same_string(text, translate("gettextFromC", cylinderuse_text[i]))) return i; } return -1; diff --git a/qt-ui/modeldelegates.cpp b/qt-ui/modeldelegates.cpp index 85be9ba62..9720e3f9e 100644 --- a/qt-ui/modeldelegates.cpp +++ b/qt-ui/modeldelegates.cpp @@ -1,10 +1,11 @@ #include "modeldelegates.h" -#include "../dive.h" -#include "../divelist.h" +#include "dive.h" +#include "divelist.h" #include "starwidget.h" #include "models.h" #include "diveplanner.h" #include "simplewidgets.h" +#include "gettextfromc.h" #include <QtDebug> #include <QPainter> @@ -286,7 +287,7 @@ QWidget *TankUseDelegate::createEditor(QWidget * parent, const QStyleOptionViewI { QComboBox *comboBox = new QComboBox(parent); for (int i = 0; i < NUM_GAS_USE; i++) - comboBox->addItem(QString(cylinderuse_text[i])); + comboBox->addItem(gettextFromC::instance()->trGettext(cylinderuse_text[i])); return comboBox; } diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 9464d6c37..f22a1f6c9 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -173,7 +173,7 @@ QVariant CylindersModel::data(const QModelIndex &index, int role) const ret = get_depth_string(cyl->depth, true); break; case USE: - ret = QString(cylinderuse_text[cyl->cylinder_use]); + ret = gettextFromC::instance()->trGettext(cylinderuse_text[cyl->cylinder_use]); break; } break; |