archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 23:41:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt: simplify GetVerboseTimeByMs logic (#8824)

Browse source 
* Qt: simplify GetVerboseTimeByMs logic

Follow recommandation from QT : https://doc.qt.io/qt-5/i18n-source-translation.html#handling-plurals
#8473
This commit is contained in:
Jacques Yakoub 2020-09-02 18:06:16 +02:00 • committed by GitHub
parent 006f546e7c
commit ddfa077c3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

64
rpcs3/rpcs3qt/localized.cpp
View file

@ -27,25 +27,13 @@ QString Localized::GetVerboseTimeByMs(qint64 elapsed_ms, bool show_days) const
if (hours <= 0) if (hours <= 0)
{ {
if (days == 1) return tr("%n day(s)", "", days);
{
return tr("%0 day").arg(days);
}
return tr("%0 days").arg(days);
}
if (days == 1 && hours == 1)
{
return tr("%0 day and %1 hour").arg(days).arg(hours);
} }
if (days == 1) if (days == 1)
{ {
return tr("%0 day and %1 hours").arg(days).arg(hours); return tr("%0 day and %n hour(s)", "", hours).arg(days);
} }
if (hours == 1) return tr("%0 days and %n hour(s)", "", hours).arg(days);
{
return tr("%0 days and %1 hour").arg(days).arg(hours);
}
return tr("%0 days and %1 hours").arg(days).arg(hours);
} }
const qint64 minutes = (elapsed_seconds % 3600) / 60; const qint64 minutes = (elapsed_seconds % 3600) / 60;
@ -55,55 +43,31 @@ QString Localized::GetVerboseTimeByMs(qint64 elapsed_ms, bool show_days) const
{ {
if (minutes <= 0) if (minutes <= 0)
{ {
if (seconds == 1) return tr("%n second(s)", "", seconds);
{
return tr("%0 second").arg(seconds);
}
return tr("%0 seconds").arg(seconds);
} }
if (seconds <= 0) if (seconds <= 0)
{ {
if (minutes == 1) return tr("%n minute(s)", "", minutes);
{
return tr("%0 minute").arg(minutes);
}
return tr("%0 minutes").arg(minutes);
}
if (minutes == 1 && seconds == 1)
{
return tr("%0 minute and %1 second").arg(minutes).arg(seconds);
} }
if (minutes == 1) if (minutes == 1)
{ {
return tr("%0 minute and %1 seconds").arg(minutes).arg(seconds); return tr("%0 minute and %n second(s)", "", seconds).arg(minutes);
} }
if (seconds == 1)
{ return tr("%0 minutes and %n second(s)", "", seconds).arg(minutes);
return tr("%0 minutes and %1 second").arg(minutes).arg(seconds);
}
return tr("%0 minutes and %1 seconds").arg(minutes).arg(seconds);
} }
if (minutes <= 0) if (minutes <= 0)
{ {
if (hours == 1) return tr("%n hour(s)", "", hours);
{
return tr("%0 hour").arg(hours);
}
return tr("%0 hours").arg(hours);
}
if (hours == 1 && minutes == 1)
{
return tr("%0 hour and %1 minute").arg(hours).arg(minutes);
} }
if (hours == 1) if (hours == 1)
{ {
return tr("%0 hour and %1 minutes").arg(hours).arg(minutes); return tr("%0 hour and %n minute(s)", "", minutes).arg(hours);
} }
if (minutes == 1)
{ return tr("%0 hours and %n minute(s)", "", minutes).arg(hours);
return tr("%0 hours and %1 minute").arg(hours).arg(minutes);
}
return tr("%0 hours and %1 minutes").arg(hours).arg(minutes);
} }