Merge a5110b90c3
into 0de3ffab0c
This commit is contained in:
commit
c6f2be6b28
|
@ -3008,7 +3008,7 @@ void Achievements::DrawAchievement(const rc_client_achievement_t* cheevo)
|
|||
if (is_unlocked)
|
||||
{
|
||||
const std::string date =
|
||||
Host::FormatNumber(Host::NumberFormatType::ShortDateTime, static_cast<s64>(cheevo->unlock_time));
|
||||
Host::FormatNumber(Host::NumberFormatType::LongDateTime, static_cast<s64>(cheevo->unlock_time));
|
||||
text.format(TRANSLATE_FS("Achievements", "Unlocked: {} | {:.1f}% of players have this achievement"), date,
|
||||
rarity_to_display);
|
||||
|
||||
|
@ -3498,7 +3498,7 @@ void Achievements::DrawLeaderboardEntry(const rc_client_leaderboard_entry_t& ent
|
|||
const ImRect time_bb(ImVec2(text_start_x, bb.Min.y), ImVec2(bb.Max.x, midpoint));
|
||||
|
||||
const std::string submit_time =
|
||||
Host::FormatNumber(Host::NumberFormatType::ShortDateTime, static_cast<s64>(entry.submitted));
|
||||
Host::FormatNumber(Host::NumberFormatType::LongDateTime, static_cast<s64>(entry.submitted));
|
||||
RenderShadowedTextClipped(UIStyle.Font, UIStyle.LargeFontSize, UIStyle.BoldFontWeight, time_bb.Min, time_bb.Max,
|
||||
text_color, submit_time, nullptr, ImVec2(0.0f, 0.0f), 0.0f, &time_bb);
|
||||
|
||||
|
|
|
@ -107,7 +107,7 @@ struct Entry
|
|||
std::string_view publisher;
|
||||
std::string_view compatibility_version_tested;
|
||||
std::string_view compatibility_comments;
|
||||
u64 release_date;
|
||||
u64 release_date; ///< Number of seconds since Epoch.
|
||||
u8 min_players;
|
||||
u8 max_players;
|
||||
u8 min_blocks;
|
||||
|
|
|
@ -199,10 +199,11 @@ void AchievementSettingsWidget::updateLoginState()
|
|||
{
|
||||
const u64 login_unix_timestamp =
|
||||
StringUtil::FromChars<u64>(Host::GetBaseStringSettingValue("Cheevos", "LoginTimestamp", "0")).value_or(0);
|
||||
const QDateTime login_timestamp(QDateTime::fromSecsSinceEpoch(static_cast<qint64>(login_unix_timestamp)));
|
||||
const QString login_timestamp = QtHost::FormatNumber(Host::NumberFormatType::ShortDateTime,
|
||||
static_cast<s64>(login_unix_timestamp));
|
||||
m_ui.loginStatus->setText(tr("Username: %1\nLogin token generated on %2.")
|
||||
.arg(QString::fromStdString(username))
|
||||
.arg(login_timestamp.toString(Qt::TextDate)));
|
||||
.arg(login_timestamp));
|
||||
m_ui.loginButton->setText(tr("Logout"));
|
||||
}
|
||||
else
|
||||
|
|
|
@ -161,8 +161,11 @@ void GameSummaryWidget::populateUi(const std::string& path, const std::string& s
|
|||
|
||||
QString release_info;
|
||||
if (entry->release_date != 0)
|
||||
release_info =
|
||||
tr("Released %1").arg(QDateTime::fromSecsSinceEpoch(entry->release_date, QTimeZone::utc()).date().toString());
|
||||
{
|
||||
const QString date = QDateTime::fromSecsSinceEpoch(static_cast<qint64>(entry->release_date), QTimeZone::utc())
|
||||
.toString(QtHost::GetApplicationLocale().dateFormat());
|
||||
release_info = tr("Released %1").arg(date);
|
||||
}
|
||||
if (entry->min_players != 0)
|
||||
{
|
||||
if (!release_info.isEmpty())
|
||||
|
|
|
@ -2217,7 +2217,7 @@ QString QtHost::FormatNumber(Host::NumberFormatType type, s64 value)
|
|||
}
|
||||
break;
|
||||
|
||||
DefaultCaseIsUnreachable();
|
||||
DefaultCaseIsUnreachable();
|
||||
}
|
||||
|
||||
ret = QDateTime::fromSecsSinceEpoch(value, QTimeZone::utc()).toLocalTime().toString(format);
|
||||
|
|
|
@ -672,10 +672,11 @@ void SetupWizardDialog::updateAchievementsLoginState()
|
|||
{
|
||||
const u64 login_unix_timestamp =
|
||||
StringUtil::FromChars<u64>(Host::GetBaseStringSettingValue("Cheevos", "LoginTimestamp", "0")).value_or(0);
|
||||
const QDateTime login_timestamp(QDateTime::fromSecsSinceEpoch(static_cast<qint64>(login_unix_timestamp)));
|
||||
const QString login_timestamp = QtHost::FormatNumber(Host::NumberFormatType::ShortDateTime,
|
||||
static_cast<s64>(login_unix_timestamp));
|
||||
m_ui.loginStatus->setText(tr("Username: %1\nLogin token generated on %2.")
|
||||
.arg(QString::fromStdString(username))
|
||||
.arg(login_timestamp.toString(Qt::TextDate)));
|
||||
.arg(login_timestamp));
|
||||
m_ui.loginButton->setText(tr("Logout"));
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue