Convert runtime-loaded l10n to string literals chosen at compile time

1 files changed, 10 insertions, 14 deletions

diff --git a/core/src/Model/Template/Template_Main.cpp b/core/src/Model/Template/Template_Main.cpp
index 7d1b755..7dd5f87 100644
--- a/core/src/Model/Template/Template_Main.cpp
+++ b/core/src/Model/Template/Template_Main.cpp
@@ -2,7 +2,7 @@
 
 #include "Model/GlobalStates.hpp"
 #include "Model/Project.hpp"
-#include "UI/Localization.hpp"
+#include "Utils/I18n.hpp"
 #include "UI/UI.hpp"
 #include "Utils/UUID.hpp"
 
@@ -91,8 +91,6 @@ Template* TemplateAssetList::LoadImpl(const SavedAsset& asset) const
 
 void TemplateAssetList::DisplayAssetCreator(ListState& state)
 {
-	auto ls = LocaleStrings::Instance.get();
-
 	auto ValidateNewName = [&]() -> void {
 		if (mACNewName.empty()) {
 			mACNewNameError = NameSelectionError::Empty;
@@ -111,17 +109,17 @@ void TemplateAssetList::DisplayAssetCreator(ListState& state)
 		switch (mACNewNameError) {
 			case NameSelectionError::None: break;
 			case NameSelectionError::Duplicated:
-				ImGui::ErrorMessage(ls->DuplicateNameError.Get());
+				ImGui::ErrorMessage(I18N_TEXT("Duplicate name", L10N_DUPLICATE_NAME_ERROR));
 				break;
 			case NameSelectionError::Empty:
-				ImGui::ErrorMessage(ls->EmptyNameError.Get());
+				ImGui::ErrorMessage(I18N_TEXT("Name cannot be empty", L10N_EMPTY_NAME_ERROR));
 				break;
 		}
 	};
 
 	auto ShowNewKindErrors = [&]() -> void {
 		if (mACNewKind == Template::InvalidKind) {
-			ImGui::ErrorMessage(ls->InvalidTemplateTypeError.Get());
+			ImGui::ErrorMessage(I18N_TEXT("Invalid template type", L10N_TEMPLATE_INVALID_TYPE_ERROR));
 		}
 	};
 
@@ -136,11 +134,11 @@ void TemplateAssetList::DisplayAssetCreator(ListState& state)
 		ValidateNewName();
 	};
 
-	if (ImGui::InputText(ls->Name.Get(), &mACNewName)) {
+	if (ImGui::InputText(I18N_TEXT("Name", L10N_NAME), &mACNewName)) {
 		ValidateNewName();
 	}
 
-	if (ImGui::BeginCombo(ls->Type.Get(), Template::FormatKind(mACNewKind))) {
+	if (ImGui::BeginCombo(I18N_TEXT("Type", L10N_TYPE), Template::FormatKind(mACNewKind))) {
 		for (int i = 0; i < Template::KindCount; ++i) {
 			auto kind = static_cast<Template::Kind>(i);
 			if (ImGui::Selectable(Template::FormatKind(kind), mACNewKind == kind)) {
@@ -153,7 +151,7 @@ void TemplateAssetList::DisplayAssetCreator(ListState& state)
 	ShowNewNameErrors();
 	ShowNewKindErrors();
 
-	if (ImGui::Button(ls->Confirm.Get(), !IsInputValid())) {
+	if (ImGui::Button(I18N_TEXT("OK", L10N_CONFIRM), !IsInputValid())) {
 		ImGui::CloseCurrentPopup();
 
 		Create(SavedAsset{
@@ -163,19 +161,17 @@ void TemplateAssetList::DisplayAssetCreator(ListState& state)
 		ResetState();
 	}
 	ImGui::SameLine();
-	if (ImGui::Button(ls->Cancel.Get())) {
+	if (ImGui::Button(I18N_TEXT("Cancel", L10N_CANCEL))) {
 		ImGui::CloseCurrentPopup();
 	}
 }
 
 void TemplateAssetList::SetupDetailsTable(const char* tableId) const
 {
-	auto ls = LocaleStrings::Instance.get();
-
 	ImGui::BeginTable(tableId, 2, ImGuiTableFlags_Borders);
 
-	ImGui::TableSetupColumn(ls->Name.Get());
-	ImGui::TableSetupColumn(ls->Type.Get());
+	ImGui::TableSetupColumn(I18N_TEXT("Name", L10N_NAME));
+	ImGui::TableSetupColumn(I18N_TEXT("Type", L10N_TYPE));
 	ImGui::TableHeadersRow();
 }