aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2013-11-07 16:52:39 +0900
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-11-07 16:52:39 +0900
commitf2035bcd797cab0b6be180b160bca3e768ccb652 (patch)
tree0371585caf90d058594963e9c5f72806b6ffec33
parentf11b2274ec8921235ff534a6f138a3f69b69531a (diff)
downloadsubsurface-f2035bcd797cab0b6be180b160bca3e768ccb652.tar.gz
Don't translate the fake DC models
Since the model name is written into the XML file it has to be a literal string that isn't translated. Otherwise a datafile written in one locale behaves differently when opened by Subsurface under a different locale. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--planner.c2
-rw-r--r--qt-ui/mainwindow.cpp7
-rw-r--r--qt-ui/profilegraphics.cpp2
3 files changed, 5 insertions, 6 deletions
diff --git a/planner.c b/planner.c
index 74eadb7af..81f96937d 100644
--- a/planner.c
+++ b/planner.c
@@ -214,7 +214,7 @@ struct dive *create_dive_from_plan(struct diveplan *diveplan, const char **error
dive->when = diveplan->when;
dive->dc.surface_pressure.mbar = diveplan->surface_pressure;
dc = &dive->dc;
- dc->model = strdup(translate("gettextFromC","Simulated Dive"));
+ dc->model = "planned dive"; /* do not translate here ! */
dp = diveplan->dp;
/* let's start with the gas given on the first segment */
diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp
index 7709ff10b..4489569fb 100644
--- a/qt-ui/mainwindow.cpp
+++ b/qt-ui/mainwindow.cpp
@@ -280,8 +280,7 @@ void MainWindow::on_actionAddDive_triggered()
// now cheat - create one dive that we use to store the info tab data in
struct dive *dive = alloc_dive();
dive->when = QDateTime::currentMSecsSinceEpoch() / 1000L + gettimezoneoffset();
- const char* model = strdup(tr("manually added dive").toLocal8Bit().constData());
- dive->dc.model = model; // do not use tr here since it expects a char*.
+ dive->dc.model = "manually added dive"; // don't translate! this is stored in the XML file
record_dive(dive);
select_dive(get_divenr(dive));
ui.InfoWidget->updateDiveInfo(selected_dive);
@@ -826,7 +825,7 @@ void MainWindow::editCurrentDive()
struct dive *d = current_dive;
QString defaultDC(d->dc.model);
- if (defaultDC == tr("manually added dive")){
+ if (defaultDC == "manually added dive"){
disableDcShortcuts();
DivePlannerPointsModel::instance()->setPlanMode(false);
ui.stackedWidget->setCurrentIndex(PLANNERPROFILE); // Planner.
@@ -834,7 +833,7 @@ void MainWindow::editCurrentDive()
DivePlannerPointsModel::instance()->loadFromDive(d);
ui.InfoWidget->enableEdition(MainTab::MANUALLY_ADDED_DIVE);
}
- else if (defaultDC == tr("Simulated Dive")){
+ else if (defaultDC == "planned dive"){
// this looks like something is missing here
}
}
diff --git a/qt-ui/profilegraphics.cpp b/qt-ui/profilegraphics.cpp
index 0eed723dd..d2fa701f7 100644
--- a/qt-ui/profilegraphics.cpp
+++ b/qt-ui/profilegraphics.cpp
@@ -394,7 +394,7 @@ void ProfileGraphicsView::addControlItems(struct dive *d)
//Put it into the lower right corner of the profile
QString defaultDC(d->dc.model);
- if (defaultDC == tr("manually added dive") || defaultDC == tr("Simulated Dive")) {
+ if (defaultDC == "manually added dive" || defaultDC == "planned dive") {
QAction *editAction = new QAction(QIcon(":edit"), tr("Edit"), this);
toolBar->addAction(editAction);
connect(editAction, SIGNAL(triggered()), mainWindow(), SLOT(editCurrentDive()));