diff --git a/app/gui/oven_control/stringer.cpp b/app/gui/oven_control/stringer.cpp index ca58764..d0faf91 100644 --- a/app/gui/oven_control/stringer.cpp +++ b/app/gui/oven_control/stringer.cpp @@ -63,11 +63,11 @@ QString Stringer::remainingTime(int msecs) case RemainingTime: msecs /= 1000; if (msecs >= 3600) - return QString("%1시간 %2분").arg(msecs / 3600).arg((msecs % 3600) / 60, 2, 10, QLatin1Char('0')); + return qApp->tr("%1시간 %2분").arg(msecs / 3600).arg((msecs % 3600) / 60, 2, 10, QLatin1Char('0')); if (msecs >= 60) - return QString("%1분 %2초").arg(msecs / 60).arg(msecs % 60, 2, 10, QLatin1Char('0')); + return qApp->tr("%1분 %2초").arg(msecs / 60).arg(msecs % 60, 2, 10, QLatin1Char('0')); - return QString("%1초").arg(msecs); + return qApp->tr("%1초").arg(msecs); case FinishTime: QDateTime dateTime = QDateTime::currentDateTime().addMSecs(msecs); switch (realTimeFormat()) @@ -90,20 +90,20 @@ QString Stringer::remainingTime(int msecs, QString style) msecs /= 1000; if (msecs >= 3600) { - QString hour = heavySpan.arg(msecs / 3600) + lightSpan.arg("시간"); - QString min = heavySpan.arg((msecs % 3600) / 60, 2, 10, QLatin1Char('0')) + lightSpan.arg("분"); + QString hour = heavySpan.arg(msecs / 3600) + lightSpan.arg(qApp->tr("시간")); + QString min = heavySpan.arg((msecs % 3600) / 60, 2, 10, QLatin1Char('0')) + lightSpan.arg(qApp->tr("분")); return style + QString("%1 %2").arg(hour).arg(min); } if (msecs >= 60) { - QString min = heavySpan.arg(msecs / 60) + lightSpan.arg("분"); - QString sec = heavySpan.arg(msecs % 60, 2, 10, QLatin1Char('0')) + lightSpan.arg("초"); + QString min = heavySpan.arg(msecs / 60) + lightSpan.arg(qApp->tr("분")); + QString sec = heavySpan.arg(msecs % 60, 2, 10, QLatin1Char('0')) + lightSpan.arg(qApp->tr("초")); return style + QString("%1 %2").arg(min).arg(sec); } - return style + heavySpan.arg(msecs) + lightSpan.arg("초"); + return style + heavySpan.arg(msecs) + lightSpan.arg(qApp->tr("초")); case FinishTime: QDateTime dateTime = QDateTime::currentDateTime().addMSecs(msecs); switch (realTimeFormat()) @@ -125,11 +125,11 @@ QString Stringer::remainingTime(qint64 msecs) case RemainingTime: msecs /= 1000; if (msecs >= 3600) - return QString("%1시간 %2분").arg(msecs / 3600).arg((msecs % 3600) / 60, 2, 10, QLatin1Char('0')); + return qApp->tr("%1시간 %2분").arg(msecs / 3600).arg((msecs % 3600) / 60, 2, 10, QLatin1Char('0')); if (msecs >= 60) - return QString("%1분 %2초").arg(msecs / 60).arg(msecs % 60, 2, 10, QLatin1Char('0')); + return qApp->tr("%1분 %2초").arg(msecs / 60).arg(msecs % 60, 2, 10, QLatin1Char('0')); - return QString("%1초").arg(msecs); + return qApp->tr("%1초").arg(msecs); case FinishTime: QDateTime dateTime = QDateTime::currentDateTime().addMSecs(msecs); switch (realTimeFormat()) @@ -217,7 +217,8 @@ QString Stringer::unusedTemperature(QString style) } -QString Stringer::DateTimeString(const QDateTime &dt_tm, datetime_string_type type){ +QString Stringer::DateTimeString(const QDateTime &dt_tm, datetime_string_type type) +{ QString strTemp; Define::config_item item = Config::getInstance()->getConfigValue(Define::config_time_type); switch(item.d32){