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

Translations: unify gettextFromC::tr() and QObject::tr()

Browse source 
There were two catch-all classes for translations outside of class
context. gettextFromC was used exclusively from C, but C++ used
both, gettextFromC and QObject. Some of the string were even present
in both. Therefore, unify to gettextFromC throughout the code base.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-07-03 16:52:20 +02:00 • committed by Dirk Hohndel
parent 2f95141330
commit 57c01f7a66
11 changed files with 41 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/subsurface-qt/DiveObjectHelper.cpp
View file

@ -27,7 +27,7 @@ static QString getFormattedCylinder(struct dive *dive, unsigned int idx)
const char *desc = cyl->type.description;
if (!desc && idx > 0)
return QString(EMPTY_DIVE_STRING);
QString fmt = desc ? QString(desc) : QObject::tr("unknown");
QString fmt = desc ? QString(desc) : gettextFromC::tr("unknown");
fmt += ", " + get_volume_string(cyl->type.size, true);
fmt += ", " + get_pressure_string(cyl->type.workingpressure, true);
fmt += ", " + get_pressure_string(cyl->start, false) + " - " + get_pressure_string(cyl->end, true);
@ -129,7 +129,7 @@ QVariant DiveObjectHelper::dive_site_uuid() const
QString DiveObjectHelper::duration() const
{
return get_dive_duration_string(m_dive->duration.seconds, QObject::tr("h"), QObject::tr("min"));
return get_dive_duration_string(m_dive->duration.seconds, gettextFromC::tr("h"), gettextFromC::tr("min"));
}
bool DiveObjectHelper::noDive() const