aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1001 from ctrlaltca/fix_999

Browse source 
Permit translation in "game created" column; Fix #999
This commit is contained in:
ctrlaltca 2015-04-22 09:51:09 +02:00
commit 36a0d25ceb
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/gamesmodel.cpp
View file

@ -20,12 +20,12 @@ const QString GamesModel::getGameCreatedString(const int secs) const {
else if (secs < SECS_PER_HOUR)
ret = QString::number(secs / SECS_PER_MIN).append(tr("m ago"));
else if (secs < SECS_PER_MIN * 90) {
ret = tr("1hr ").append(QString::number((secs / SECS_PER_MIN) - 60)).append(tr("m ago"));
ret = tr("1hr %1m ago").arg(QString::number((secs / SECS_PER_MIN) - 60));
} else if (secs < SECS_PER_HOUR * 4) {
unsigned int hours = secs / SECS_PER_HOUR;
if (secs % SECS_PER_HOUR >= SECS_PER_MIN * 30)
hours++;
ret = QString::number(hours).append(tr("hr ago"));
ret = tr("%1hr ago").arg(QString::number(hours));
} else
ret = tr("5+ hrs ago");

5
cockatrice/translations/cockatrice_en.ts
View file

@ -1297,18 +1297,17 @@ Would you like to change your database location setting?</source>
</message>
<message>
<location filename="../src/gamesmodel.cpp" line="21"/>
<location filename="../src/gamesmodel.cpp" line="23"/>
<source>m ago</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gamesmodel.cpp" line="23"/>
<source>1hr </source>
<source>1hr %1m ago</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gamesmodel.cpp" line="28"/>
<source>hr ago</source>
<source>%1hr ago</source>
<translation type="unfinished"></translation>
</message>
<message>