From fea1c4e115cebea14b91ae37bb3e33bc70ed0e3a Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 28 Jun 2020 03:06:40 -0400 Subject: [PATCH] CEditorApplication: Mark strings as translatable where applicable --- src/Editor/CEditorApplication.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/Editor/CEditorApplication.cpp b/src/Editor/CEditorApplication.cpp index 1cda2350..c837518d 100644 --- a/src/Editor/CEditorApplication.cpp +++ b/src/Editor/CEditorApplication.cpp @@ -86,7 +86,7 @@ bool CEditorApplication::OpenProject(const QString& rkProjPath) // Load new project TString Path = TO_TSTRING(rkProjPath); - CProgressDialog Dialog("Opening " + TO_QSTRING(Path.GetFileName()), true, true, mpWorldEditor); + CProgressDialog Dialog(tr("Opening %1").arg(TO_QSTRING(Path.GetFileName())), true, true, mpWorldEditor); Dialog.DisallowCanceling(); // Gross, but necessary until QtConcurrent supports move only types. QFuture Future = QtConcurrent::run([](const auto& path, auto* dialog) { return CGameProject::LoadProject(path, dialog).release(); }, Path, &Dialog); @@ -101,7 +101,7 @@ bool CEditorApplication::OpenProject(const QString& rkProjPath) } else { - UICommon::ErrorMsg(mpWorldEditor, "Failed to open project!"); + UICommon::ErrorMsg(mpWorldEditor, tr("Failed to open project!")); return false; } } @@ -125,7 +125,7 @@ void CEditorApplication::EditResource(CResourceEntry *pEntry) if (!pRes) { - UICommon::ErrorMsg(mpWorldEditor, "Failed to load resource!"); + UICommon::ErrorMsg(mpWorldEditor, tr("Failed to load resource!")); return; } @@ -143,7 +143,7 @@ void CEditorApplication::EditResource(CResourceEntry *pEntry) CWorld *pWorld = (CWorld*) It->Load(); uint32 AreaIdx = pWorld->AreaIndex(pEntry->ID()); - if (AreaIdx != -1) + if (AreaIdx != UINT32_MAX) { mpWorldEditor->SetArea(pWorld, AreaIdx); break; @@ -192,7 +192,9 @@ void CEditorApplication::EditResource(CResourceEntry *pEntry) mEditingMap[pEntry] = pEd; } else if (pEntry->ResourceType() != EResourceType::Area) - UICommon::InfoMsg(mpWorldEditor, "Unsupported Resource", "This resource type is currently unsupported for editing."); + { + UICommon::InfoMsg(mpWorldEditor, tr("Unsupported Resource"), tr("This resource type is currently unsupported for editing.")); + } } } @@ -275,7 +277,7 @@ bool CEditorApplication::RebuildResourceDatabase() emit ActiveProjectChanged(nullptr); // Rebuild - CProgressDialog Dialog("Rebuilding resource database", true, false, mpWorldEditor); + CProgressDialog Dialog(tr("Rebuilding resource database"), true, false, mpWorldEditor); Dialog.SetOneShotTask("Rebuilding resource database"); Dialog.DisallowCanceling(); @@ -288,7 +290,7 @@ bool CEditorApplication::RebuildResourceDatabase() mpActiveProject->TweakManager()->LoadTweaks(); emit ActiveProjectChanged(mpActiveProject.get()); - UICommon::InfoMsg(mpWorldEditor, "Success", "Resource database rebuilt successfully!"); + UICommon::InfoMsg(mpWorldEditor, tr("Success"), tr("Resource database rebuilt successfully!")); return true; }