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

Super-important PR (#6900)

Browse source 
* Fix capitalisation errors and typos

* Oops
This commit is contained in:
Hula Hoop 2019-10-28 14:44:44 +00:00 • committed by Ivan
parent 479d92d075
commit 200ec5c4b3
3 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
rpcs3/rpcs3qt/update_manager.cpp
View file

@ -38,7 +38,7 @@ void update_manager::check_for_updates(bool automatic, QWidget* parent)
LOG_ERROR(GENERAL, "Unable to update RPCS3!Please make sure your system supports SSL. Visit our quickstart guide for more information: https://rpcs3.net/quickstart");
if (!automatic)
{
const QString message = tr("Unable to update RPCS3!<br>Please make sure your system supports SSL.<br>Visit our <a href='https://rpcs3.net/quickstart'>quickstart guide</a> for more information.");
const QString message = tr("Unable to update RPCS3!<br>Please make sure your system supports SSL.<br>Visit our <a href='https://rpcs3.net/quickstart'>Quickstart</a> guide for more information.");
QMessageBox box(QMessageBox::Icon::Warning, tr("Auto-updater"), message, QMessageBox::StandardButton::Ok, parent);
box.setTextFormat(Qt::RichText);
box.exec();
@ -69,7 +69,7 @@ void update_manager::check_for_updates(bool automatic, QWidget* parent)
connect(reply_json, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), this, &update_manager::handle_error);
connect(reply_json, &QNetworkReply::finished, [=]()
{
handle_reply(reply_json, &update_manager::handle_json, automatic, "Retrieved Json Info");
handle_reply(reply_json, &update_manager::handle_json, automatic, "Retrieved JSON Info");
});
// clang-format on
}
@ -108,7 +108,7 @@ bool update_manager::handle_reply(QNetworkReply* reply, std::function<bool(updat
m_progress_dialog->close();
if (!automatic)
QMessageBox::warning(m_parent, tr("Auto-updater"), tr("An error occured during the auto-updating process.\nCheck the log for more information."));
QMessageBox::warning(m_parent, tr("Auto-updater"), tr("An error occurred during the auto-updating process.\nCheck the log for more information."));
}
return true;
@ -141,7 +141,7 @@ bool update_manager::handle_json(const QByteArray& data, bool automatic)
// If a user clicks "Check for Updates" with a custom build ask him if he's sure he wants to update to latest version
if (!automatic && return_code == -1)
{
if (QMessageBox::question(m_progress_dialog, tr("Auto-updater"), tr("You're currently using a custom or PR build.\n\nDo you want to update to the latest official rpcs3 version?"),
if (QMessageBox::question(m_progress_dialog, tr("Auto-updater"), tr("You're currently using a custom or PR build.\n\nDo you want to update to the latest official RPCS3 version?"),
QMessageBox::Yes | QMessageBox::No) == QMessageBox::No)
{
m_progress_dialog->close();
@ -159,7 +159,7 @@ bool update_manager::handle_json(const QByteArray& data, bool automatic)
const auto& latest = json_data["latest_build"];
if (!latest.isObject())
{
LOG_ERROR(GENERAL, "[Auto-updater] Json doesn't contain latest_build section");
LOG_ERROR(GENERAL, "[Auto-updater] JSON doesn't contain latest_build section");
return false;
}
@ -170,7 +170,7 @@ bool update_manager::handle_json(const QByteArray& data, bool automatic)
#elif defined(__linux__)
os = "linux";
#else
LOG_ERROR(GENERAL, "[Auto-updater] Your os isn't currently supported by the auto-updater");
LOG_ERROR(GENERAL, "[Auto-updater] Your OS isn't currently supported by the auto-updater");
return false;
#endif
@ -299,7 +299,7 @@ bool update_manager::handle_rpcs3(const QByteArray& rpcs3_data, bool /*automatic
if (appimage_path != nullptr)
{
replace_path = appimage_path;
LOG_NOTICE(GENERAL, "[Auto-updater] Found appimage path: %s", appimage_path);
LOG_NOTICE(GENERAL, "[Auto-updater] Found AppImage path: %s", appimage_path);
}
else
{
@ -470,7 +470,7 @@ bool update_manager::handle_rpcs3(const QByteArray& rpcs3_data, bool /*automatic
{
if (temp_u16[index] > 0xFF)
{
LOG_ERROR(GENERAL, "[Auto-updater] 7z decoder error: Failed to convert utf-16 to utf-8");
LOG_ERROR(GENERAL, "[Auto-updater] 7z decoder error: Failed to convert UTF-16 to UTF-8");
error_free7z();
return false;
}