2 files changed, 13 insertions, 11 deletions

diff --git a/core/src/Model/Template/Template.hpp b/core/src/Model/Template/Template.hpp
index fdac574..7cfbb8b 100644
--- a/core/src/Model/Template/Template.hpp
+++ b/core/src/Model/Template/Template.hpp
@@ -64,7 +64,7 @@ protected:
 
 	virtual Template* LoadImpl(const SavedAsset& diskForm) const override;
 
-	virtual void DisplayAssetCreator(PopupState& state) override;
+	virtual void DisplayAssetCreator(ListState& state) override;
 
 	virtual void SetupDetailsTable(const char* tableId) const override;
 	virtual void DrawBigIcon(ListState& state, const SavedAsset& asset) const override;
diff --git a/core/src/Model/Template/Template_Main.cpp b/core/src/Model/Template/Template_Main.cpp
index ebec490..7d1b755 100644
--- a/core/src/Model/Template/Template_Main.cpp
+++ b/core/src/Model/Template/Template_Main.cpp
@@ -89,7 +89,7 @@ Template* TemplateAssetList::LoadImpl(const SavedAsset& asset) const
 	return tmpl.release();
 }
 
-void TemplateAssetList::DisplayAssetCreator(PopupState& state)
+void TemplateAssetList::DisplayAssetCreator(ListState& state)
 {
 	auto ls = LocaleStrings::Instance.get();
 
@@ -111,17 +111,17 @@ void TemplateAssetList::DisplayAssetCreator(PopupState& state)
 		switch (mACNewNameError) {
 			case NameSelectionError::None: break;
 			case NameSelectionError::Duplicated:
-				ImGui::ErrorMessage("Duplicate template name");
+				ImGui::ErrorMessage(ls->DuplicateNameError.Get());
 				break;
 			case NameSelectionError::Empty:
-				ImGui::ErrorMessage("Template name cannot be empty");
+				ImGui::ErrorMessage(ls->EmptyNameError.Get());
 				break;
 		}
 	};
 
 	auto ShowNewKindErrors = [&]() -> void {
 		if (mACNewKind == Template::InvalidKind) {
-			ImGui::ErrorMessage("Must select a valid template type");
+			ImGui::ErrorMessage(ls->InvalidTemplateTypeError.Get());
 		}
 	};
 
@@ -136,11 +136,11 @@ void TemplateAssetList::DisplayAssetCreator(PopupState& state)
 		ValidateNewName();
 	};
 
-	if (ImGui::InputText("Name", &mACNewName)) {
+	if (ImGui::InputText(ls->Name.Get(), &mACNewName)) {
 		ValidateNewName();
 	}
 
-	if (ImGui::BeginCombo("Type", Template::FormatKind(mACNewKind))) {
+	if (ImGui::BeginCombo(ls->Type.Get(), 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 +153,7 @@ void TemplateAssetList::DisplayAssetCreator(PopupState& state)
 	ShowNewNameErrors();
 	ShowNewKindErrors();
 
-	if (ImGui::Button(ls->DialogConfirm.Get(), !IsInputValid())) {
+	if (ImGui::Button(ls->Confirm.Get(), !IsInputValid())) {
 		ImGui::CloseCurrentPopup();
 
 		Create(SavedAsset{
@@ -163,17 +163,19 @@ void TemplateAssetList::DisplayAssetCreator(PopupState& state)
 		ResetState();
 	}
 	ImGui::SameLine();
-	if (ImGui::Button(ls->DialogCancel.Get())) {
+	if (ImGui::Button(ls->Cancel.Get())) {
 		ImGui::CloseCurrentPopup();
 	}
 }
 
 void TemplateAssetList::SetupDetailsTable(const char* tableId) const
 {
+	auto ls = LocaleStrings::Instance.get();
+
 	ImGui::BeginTable(tableId, 2, ImGuiTableFlags_Borders);
 
-	ImGui::TableSetupColumn("Name");
-	ImGui::TableSetupColumn("Type");
+	ImGui::TableSetupColumn(ls->Name.Get());
+	ImGui::TableSetupColumn(ls->Type.Get());
 	ImGui::TableHeadersRow();
 }