diff options
| author | 2019-07-25 12:35:07 -0400 | |
|---|---|---|
| committer | 2019-07-25 12:35:07 -0400 | |
| commit | ccbc5549490de065fd989cd7f1025dba10cb0c32 (patch) | |
| tree | d30cc4410dda64161e47bd6cd61b2e14092411ff | |
| parent | Merge pull request #2743 from FernandoS27/surpress-assert (diff) | |
| parent | yuzu/main: Make error messages within OnCoreError more localization-friendly (diff) | |
| download | yuzu-ccbc5549490de065fd989cd7f1025dba10cb0c32.tar.gz yuzu-ccbc5549490de065fd989cd7f1025dba10cb0c32.tar.xz yuzu-ccbc5549490de065fd989cd7f1025dba10cb0c32.zip | |
Merge pull request #2689 from lioncash/tl
yuzu/main: Make error messages within OnCoreError more localization-friendly
| -rw-r--r-- | src/yuzu/main.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index ae21f4753..381644694 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -1843,13 +1843,14 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det | |||
| 1843 | "data, or other bugs."); | 1843 | "data, or other bugs."); |
| 1844 | switch (result) { | 1844 | switch (result) { |
| 1845 | case Core::System::ResultStatus::ErrorSystemFiles: { | 1845 | case Core::System::ResultStatus::ErrorSystemFiles: { |
| 1846 | QString message = tr("yuzu was unable to locate a Switch system archive"); | 1846 | QString message; |
| 1847 | if (!details.empty()) { | 1847 | if (details.empty()) { |
| 1848 | message.append(tr(": %1. ").arg(QString::fromStdString(details))); | 1848 | message = |
| 1849 | tr("yuzu was unable to locate a Switch system archive. %1").arg(common_message); | ||
| 1849 | } else { | 1850 | } else { |
| 1850 | message.append(tr(". ")); | 1851 | message = tr("yuzu was unable to locate a Switch system archive: %1. %2") |
| 1852 | .arg(QString::fromStdString(details), common_message); | ||
| 1851 | } | 1853 | } |
| 1852 | message.append(common_message); | ||
| 1853 | 1854 | ||
| 1854 | answer = QMessageBox::question(this, tr("System Archive Not Found"), message, | 1855 | answer = QMessageBox::question(this, tr("System Archive Not Found"), message, |
| 1855 | QMessageBox::Yes | QMessageBox::No, QMessageBox::No); | 1856 | QMessageBox::Yes | QMessageBox::No, QMessageBox::No); |
| @@ -1858,8 +1859,8 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det | |||
| 1858 | } | 1859 | } |
| 1859 | 1860 | ||
| 1860 | case Core::System::ResultStatus::ErrorSharedFont: { | 1861 | case Core::System::ResultStatus::ErrorSharedFont: { |
| 1861 | QString message = tr("yuzu was unable to locate the Switch shared fonts. "); | 1862 | const QString message = |
| 1862 | message.append(common_message); | 1863 | tr("yuzu was unable to locate the Switch shared fonts. %1").arg(common_message); |
| 1863 | answer = QMessageBox::question(this, tr("Shared Fonts Not Found"), message, | 1864 | answer = QMessageBox::question(this, tr("Shared Fonts Not Found"), message, |
| 1864 | QMessageBox::Yes | QMessageBox::No, QMessageBox::No); | 1865 | QMessageBox::Yes | QMessageBox::No, QMessageBox::No); |
| 1865 | status_message = tr("Shared Font Missing"); | 1866 | status_message = tr("Shared Font Missing"); |