CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2689 from lioncash/tl 

yuzu/main: Make error messages within OnCoreError more localization-friendly
master
bunnei 2019-07-25 12:35:07 +07:00 committed by GitHub
parent 31e8a61527 5085a16d78
commit ccbc554949
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/yuzu/main.cpp
Unescape Escape View File

@ -1843,13 +1843,14 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det
"data, or other bugs."); "data, or other bugs.");
switch (result) { switch (result) {
case Core::System::ResultStatus::ErrorSystemFiles: { case Core::System::ResultStatus::ErrorSystemFiles: {
QString message = tr("yuzu was unable to locate a Switch system archive"); QString message;
if (!details.empty()) { if (details.empty()) {
message.append(tr(": %1. ").arg(QString::fromStdString(details))); message =
tr("yuzu was unable to locate a Switch system archive. %1").arg(common_message);
} else { } else {
message.append(tr(". ")); message = tr("yuzu was unable to locate a Switch system archive: %1. %2")
.arg(QString::fromStdString(details), common_message);
} }
message.append(common_message);
answer = QMessageBox::question(this, tr("System Archive Not Found"), message, answer = QMessageBox::question(this, tr("System Archive Not Found"), message,
QMessageBox::Yes | QMessageBox::No, QMessageBox::No); QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
@ -1858,8 +1859,8 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det
} }
case Core::System::ResultStatus::ErrorSharedFont: { case Core::System::ResultStatus::ErrorSharedFont: {
QString message = tr("yuzu was unable to locate the Switch shared fonts. "); const QString message =
message.append(common_message); tr("yuzu was unable to locate the Switch shared fonts. %1").arg(common_message);
answer = QMessageBox::question(this, tr("Shared Fonts Not Found"), message, answer = QMessageBox::question(this, tr("Shared Fonts Not Found"), message,
QMessageBox::Yes | QMessageBox::No, QMessageBox::No); QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
status_message = tr("Shared Font Missing"); status_message = tr("Shared Font Missing");