From 3269d703b20e5641d5492dbad2f9d6b8ed913fd3 Mon Sep 17 00:00:00 2001
From: Subhraman Sarkar <suvrax@gmail.com>
Date: Thu, 5 Sep 2024 21:23:24 +0530
Subject: [PATCH] file dialog: improve checking and adjust strings

1. selecting an item from the file list will cause validation to run
2. strings adjusted so they are correctly picked up by gettext
---
 src/gui/dialogs/file_dialog.cpp | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/gui/dialogs/file_dialog.cpp b/src/gui/dialogs/file_dialog.cpp
index 191354c90ae..9a19b5c8279 100644
--- a/src/gui/dialogs/file_dialog.cpp
+++ b/src/gui/dialogs/file_dialog.cpp
@@ -35,6 +35,7 @@
 #include "log.hpp"
 #include "serialization/unicode.hpp"
 
+#include <algorithm>
 #include <functional>
 
 static lg::log_domain log_filedlg{"gui/dialogs/file_dialog"};
@@ -170,14 +171,14 @@ void file_dialog::check_filename() {
 	button& save_btn = find_widget<button>(get_window(), "ok", false);
 
 	// empty filename
-	std::string filename = file_textbox.get_value();
+	const std::string& filename = file_textbox.get_value();
 	styled_widget& validation_msg = find_widget<styled_widget>(get_window(), "validation_msg", false);
 
 	bool stat_invalid = filename.empty() || (filename.substr(0,1) == ".");
 	bool wrong_ext = false;
 
 	if (stat_invalid) {
-		validation_msg.set_label("<span color='#00dcff' size='small'>please enter a filename</span>");
+		validation_msg.set_label(_("<span color='#00dcff' size='small'>please enter a filename</span>"));
 		save_btn.set_active(false);
 	} else {
 		// wrong extension check
@@ -197,7 +198,12 @@ void file_dialog::check_filename() {
 		}
 
 		if (wrong_ext) {
-			validation_msg.set_label("<span color='red' face='DejaVuSans'>✘</span><span color='red' size='small'>wrong extension, use " + utils::join(extensions_, ", ") + "</span>");
+			utils::string_map i18n_strings;
+			i18n_strings["extensions"] = utils::join(extensions_, ", ");
+			validation_msg.set_label(VGETTEXT("<span color='red'><span face='DejaVuSans'>✘</span> <span size='small'>wrong extension, use $extensions</span></span>", i18n_strings));
+			save_btn.set_active(false);
+		} else if (std::find_if(filename.begin(), filename.end(), isspace) != filename.end()) {
+			validation_msg.set_label(_("<span color='red'><span face='DejaVuSans'>✘</span> <span size='small'>whitespace is not allowed in filename</span></span>"));
 			save_btn.set_active(false);
 		} else {
 			validation_msg.set_label("");
@@ -512,6 +518,7 @@ void file_dialog::set_input_text(text_box& t, const std::string& value)
 	}
 
 	t.set_value(value);
+	check_filename();
 
 	const std::size_t vallen = t.get_length();
 	const std::size_t extlen = utf8::size(extension_);