diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2018-07-03 16:52:20 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-07-04 05:33:31 +0800 |
| commit | 57c01f7a66ccd04fc2e83b67a840519db4661798 (patch) | |
| tree | 4134dd2be823ea62ab3370cfb7ee567a6a53d4ec /desktop-widgets/templatelayout.h | |
| parent | 2f951413303e10a80e540cacd0c6c282f8ce82cc (diff) | |
| download | subsurface-57c01f7a66ccd04fc2e83b67a840519db4661798.tar.gz | |
Translations: unify gettextFromC::tr() and QObject::tr()
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>
Diffstat (limited to 'desktop-widgets/templatelayout.h')
| -rw-r--r-- | desktop-widgets/templatelayout.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop-widgets/templatelayout.h b/desktop-widgets/templatelayout.h index 2f5b24354..3b574c0db 100644 --- a/desktop-widgets/templatelayout.h +++ b/desktop-widgets/templatelayout.h @@ -107,8 +107,8 @@ if (property == "year") { } else if (property == "max_temp") { return object.year->max_temp.mkelvin == 0 ? "0" : get_temperature_string(object.year->max_temp, true); } else if (property == "total_time") { - return get_dive_duration_string(object.year->total_time.seconds, QObject::tr("h"), - QObject::tr("min"), QObject::tr("sec"), " "); + return get_dive_duration_string(object.year->total_time.seconds, gettextFromC::tr("h"), + gettextFromC::tr("min"), gettextFromC::tr("sec"), " "); } else if (property == "avg_time") { return get_minutes(object.year->total_time.seconds / object.year->selection_size); } else if (property == "shortest_time") { |