simplify, and fix, setting the current locale

Fix test setup bogosities. Specifically, they weren't hermetic with respect to
locale env vars.

Rewrite the handling of locale vars to simplify the code and make it more like
the pattern most programs employ.

Fixes #3110

1 files changed, 3 insertions, 4 deletions

diff --git a/src/common.h b/src/common.h
index 07342436..87fefed3 100644
--- a/src/common.h
+++ b/src/common.h
@@ -627,10 +627,9 @@ wchar_t *quote_end(const wchar_t *in);
 /// interactive command executes, to allow new messages to be printed.
 void error_reset();
 
-/// This function behaves exactly like a wide character equivalent of the C function setlocale,
-/// except that it will also try to detect if the user is using a Unicode character set, and if so,
-/// use the unicode ellipsis character as ellipsis, instead of '$'.
-wcstring wsetlocale(int category, const wchar_t *locale);
+/// This function should be called after calling `setlocale()` to perform fish specific locale
+/// initialization.
+void fish_setlocale();
 
 /// Checks if \c needle is included in the list of strings specified. A warning is printed if needle
 /// is zero.