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 /core/divelogexportlogic.cpp | |
| 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 'core/divelogexportlogic.cpp')
| -rw-r--r-- | core/divelogexportlogic.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/divelogexportlogic.cpp b/core/divelogexportlogic.cpp index 7617e6c23..82c8b452f 100644 --- a/core/divelogexportlogic.cpp +++ b/core/divelogexportlogic.cpp @@ -53,7 +53,7 @@ static void exportHTMLstatisticsTotal(QTextStream &out, stats_t *total_stats) out << "\"YEAR\":\"Total\","; out << "\"DIVES\":\"" << total_stats->selection_size << "\","; out << "\"TOTAL_TIME\":\"" << get_dive_duration_string(total_stats->total_time.seconds, - QObject::tr("h"), QObject::tr("min"), QObject::tr("sec"), " ") << "\","; + gettextFromC::tr("h"), gettextFromC::tr("min"), gettextFromC::tr("sec"), " ") << "\","; out << "\"AVERAGE_TIME\":\"--\","; out << "\"SHORTEST_TIME\":\"--\","; out << "\"LONGEST_TIME\":\"--\","; @@ -89,7 +89,7 @@ static void exportHTMLstatistics(const QString filename, struct htmlExportSettin out << "\"YEAR\":\"" << stats_yearly[i].period << "\","; out << "\"DIVES\":\"" << stats_yearly[i].selection_size << "\","; out << "\"TOTAL_TIME\":\"" << get_dive_duration_string(stats_yearly[i].total_time.seconds, - QObject::tr("h"), QObject::tr("min"), QObject::tr("sec"), " ") << "\","; + gettextFromC::tr("h"), gettextFromC::tr("min"), gettextFromC::tr("sec"), " ") << "\","; out << "\"AVERAGE_TIME\":\"" << get_minutes(stats_yearly[i].total_time.seconds / stats_yearly[i].selection_size) << "\","; out << "\"SHORTEST_TIME\":\"" << get_minutes(stats_yearly[i].shortest_time.seconds) << "\","; out << "\"LONGEST_TIME\":\"" << get_minutes(stats_yearly[i].longest_time.seconds) << "\","; |