From 8e3f7f956507fc139f4a7be95540d4077eab6e77 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 8 Nov 2020 14:38:59 -0800 Subject: desktop: fix translation implementation We need to always call the tr() function of the base class. This will have consequences for our translations. See: #3068 Signed-off-by: Dirk Hohndel --- commands/command_edit.cpp | 12 ++++++------ commands/command_event.cpp | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'commands') diff --git a/commands/command_edit.cpp b/commands/command_edit.cpp index 96678996c..686b5b91d 100644 --- a/commands/command_edit.cpp +++ b/commands/command_edit.cpp @@ -1030,9 +1030,9 @@ AddCylinder::AddCylinder(bool currentDiveOnly) : if (dives.empty()) return; else if (dives.size() == 1) - setText(tr("Add cylinder")); + setText(Command::Base::tr("Add cylinder")); else - setText(tr("Add cylinder (%n dive(s))", "", dives.size())); + setText(Command::Base::tr("Add cylinder (%n dive(s))", "", dives.size())); cyl = create_new_cylinder(dives[0]); } @@ -1151,9 +1151,9 @@ RemoveCylinder::RemoveCylinder(int index, bool currentDiveOnly) : EditCylinderBase(index, currentDiveOnly, true, SAME_TYPE | SAME_PRESS | SAME_GAS) { if (dives.size() == 1) - setText(tr("Remove cylinder")); + setText(Command::Base::tr("Remove cylinder")); else - setText(tr("Remove cylinder (%n dive(s))", "", dives.size())); + setText(Command::Base::tr("Remove cylinder (%n dive(s))", "", dives.size())); } void RemoveCylinder::undo() @@ -1201,9 +1201,9 @@ EditCylinder::EditCylinder(int index, cylinder_t cylIn, EditCylinderType typeIn, return; if (dives.size() == 1) - setText(tr("Edit cylinder")); + setText(Command::Base::tr("Edit cylinder")); else - setText(tr("Edit cylinder (%n dive(s))", "", dives.size())); + setText(Command::Base::tr("Edit cylinder (%n dive(s))", "", dives.size())); // Try to untranslate the cylinder type QString description = cylIn.type.description; diff --git a/commands/command_event.cpp b/commands/command_event.cpp index 11b9a56fc..5c71aaebd 100644 --- a/commands/command_event.cpp +++ b/commands/command_event.cpp @@ -64,26 +64,26 @@ void AddEventBase::undoit() AddEventBookmark::AddEventBookmark(struct dive *d, int dcNr, int seconds) : AddEventBase(d, dcNr, create_event(seconds, SAMPLE_EVENT_BOOKMARK, 0, 0, "bookmark")) { - setText(tr("Add bookmark")); + setText(Command::Base::tr("Add bookmark")); } AddEventDivemodeSwitch::AddEventDivemodeSwitch(struct dive *d, int dcNr, int seconds, int divemode) : AddEventBase(d, dcNr, create_event(seconds, SAMPLE_EVENT_BOOKMARK, 0, divemode, QT_TRANSLATE_NOOP("gettextFromC", "modechange"))) { - setText(tr("Add dive mode switch to %1").arg(gettextFromC::tr(divemode_text_ui[divemode]))); + setText(Command::Base::tr("Add dive mode switch to %1").arg(gettextFromC::tr(divemode_text_ui[divemode]))); } AddEventSetpointChange::AddEventSetpointChange(struct dive *d, int dcNr, int seconds, pressure_t pO2) : AddEventBase(d, dcNr, create_event(seconds, SAMPLE_EVENT_PO2, 0, pO2.mbar, QT_TRANSLATE_NOOP("gettextFromC", "SP change"))) { - setText(tr("Add set point change")); // TODO: format pO2 value in bar or psi. + setText(Command::Base::tr("Add set point change")); // TODO: format pO2 value in bar or psi. } RenameEvent::RenameEvent(struct dive *d, int dcNr, struct event *ev, const char *name) : EventBase(d, dcNr), eventToAdd(clone_event_rename(ev, name)), eventToRemove(ev) { - setText(tr("Rename bookmark to %1").arg(name)); + setText(Command::Base::tr("Rename bookmark to %1").arg(name)); } bool RenameEvent::workToBeDone() @@ -111,7 +111,7 @@ RemoveEvent::RemoveEvent(struct dive *d, int dcNr, struct event *ev) : EventBase cylinder(ev->type == SAMPLE_EVENT_GASCHANGE2 || ev->type == SAMPLE_EVENT_GASCHANGE ? ev->gas.index : -1) { - setText(tr("Remove %1 event").arg(ev->name)); + setText(Command::Base::tr("Remove %1 event").arg(ev->name)); } bool RemoveEvent::workToBeDone() -- cgit v1.2.3-70-g09d2