The_Great_Archive/xca
1
0
Fork 0
mirror of https://github.com/chris2511/xca.git synced 2026-09-12 19:51:05 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace TR() by QObject::tr() to get catched by lupdate

Browse Source 
lupdate does not find TR(), only tr()
This commit is contained in:
Christian Hohnstaedt 2018-06-27 16:23:10 +02:00
parent dc5199205c
commit 2f8c25ba6f
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/asn1time.cpp
View File

@ -22,8 +22,6 @@
#define UTC_FORMAT "yyMMddHHmmss'Z'"
#define GEN_FORMAT "yy" UTC_FORMAT
#define TR QObject::tr
bool a1time::isUndefined() const
{
return toTime_t() == 0;
@ -154,9 +152,9 @@ a1time &a1time::set(const ASN1_TIME *a)
QString a1time::toString(QString fmt, Qt::TimeSpec spec) const
{
if (isUndefined())
return TR("Undefined");
return QObject::tr("Undefined");
if (!isValid())
return TR("Broken / Invalid");
return QObject::tr("Broken / Invalid");
return XCA_application::language().toString(
spec == Qt::UTC ? toUTC() : toLocalTime(), fmt);
}
@ -202,17 +200,20 @@ QString a1time::toFancy() const
diff *= -1;
}
if (diff < 2 * SECS_PER_MINUTE) {
fmt = future ? TR("in %1 seconds") : TR("%1 seconds ago");
fmt = future ? QObject::tr("in %1 seconds") :
QObject::tr("%1 seconds ago");
} else if (diff < 2 *SECS_PER_HOUR) {
diff /= SECS_PER_MINUTE;
fmt = future ? TR("in %1 minutes") : TR("%1 minutes ago");
fmt = future ? QObject::tr("in %1 minutes") :
QObject::tr("%1 minutes ago");
} else if (dtn == 1) {
return TR("Yesterday");
return QObject::tr("Yesterday");
} else if (dtn == -1) {
return TR("Tomorrow");
return QObject::tr("Tomorrow");
} else if (diff < SECS_PER_DAY) {
diff /= SECS_PER_HOUR;
fmt = future ? TR("in %1 hours") : TR("%1 hours ago");
fmt = future ? QObject::tr("in %1 hours") :
QObject::tr("%1 hours ago");
} else {
return XCA_application::language().toString(date(),
QLocale::ShortFormat);