From 73175a018788a6ace96a4fb81ebd928d823db819 Mon Sep 17 00:00:00 2001
From: Sadie Powell <sadie@witchery.services>
Date: Mon, 17 Nov 2025 23:49:24 +0000
Subject: [PATCH] Use the name of the language in ns_set_language not the code.

---
 modules/nickserv/ns_set_language.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/modules/nickserv/ns_set_language.cpp b/modules/nickserv/ns_set_language.cpp
index 3245fdf81..dadff288e 100644
--- a/modules/nickserv/ns_set_language.cpp
+++ b/modules/nickserv/ns_set_language.cpp
@@ -14,12 +14,22 @@
 
 #include "module.h"
 
+#define ENGLISH _("English")
+
 class CommandNSSetLanguage
 	: public Command
 {
 protected:
 	Anope::map<Anope::string> &languages;
 
+	const char *GetDefaultLanguage() const
+	{
+		auto it = languages.find(Config->DefLanguage);
+		if (it != languages.end())
+			return it->second.c_str();
+		return ENGLISH;
+	}
+
 public:
 	CommandNSSetLanguage(Module *creator, Anope::map<Anope::string> &langs, const Anope::string &sname = "nickserv/set/language", size_t min = 0)
 		: Command(creator, sname, min, min + 1)
@@ -55,7 +65,7 @@ public:
 		Anope::string langname;
 		if (param.empty())
 		{
-			langname = Language::Translate(_("English"));
+			langname = Language::Translate(ENGLISH);
 			nc->language.clear();
 		}
 		else
@@ -109,7 +119,7 @@ public:
 				"used. Otherwise, \037language\037 should be chosen from the "
 				"following list of supported languages:"
 			),
-			Config->DefLanguage.c_str());
+			GetDefaultLanguage());
 
 		for (const auto &[langcode, langname] : languages)
 			source.Reply("    %s (%s)", langcode.c_str(), langname.c_str());
@@ -145,7 +155,7 @@ public:
 				"will be used. Otherwise, \037language\037 should be chosen from "
 				"the following list of supported languages:"
 			),
-			Config->DefLanguage.c_str());
+			GetDefaultLanguage());
 
 		for (const auto &[langcode, langname] : languages)
 			source.Reply("    %s (%s)", langcode.c_str(), langname.c_str());
@@ -174,9 +184,9 @@ public:
 
 		// Build a list of languages. This only needs to happen once as we
 		// only load the languages on boot.
-		languages.emplace("en_US.UTF-8", "English");
+		languages.emplace("en_US.UTF-8", ENGLISH);
 		for (const auto &language : Language::Languages)
-			languages.emplace(language, Language::Translate(language.c_str(), _("English")));
+			languages.emplace(language, Language::Translate(language.c_str(), ENGLISH));
 	}
 };