Merge pull request #2174 from Gizmokid2005/master

dgw · web-flow · commit 710a20d26f25 · 2021-11-01T12:21:42.000-05:00
Update to check for proper UTF8 on Windows
diff --git a/sopel/__init__.py b/sopel/__init__.py
@@ -34,7 +34,7 @@
 ]
 
 loc = locale.getlocale()
-if not loc[1] or 'UTF-8' not in loc[1]:
+if not loc[1] or ('UTF-8' not in loc[1] and 'utf8' not in loc[1]):
     print('WARNING!!! You are running with a non-UTF8 locale environment '
           'variable (e.g. LC_ALL is set to "C"), which makes Python 3 do '
           'stupid things. If you get strange errors, please set it to '

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`]`
`35`	`35`
`36`	`36`	`loc = locale.getlocale()`
`37`		`-if not loc[1] or 'UTF-8' not in loc[1]:`
	`37`	`+if not loc[1] or ('UTF-8' not in loc[1] and 'utf8' not in loc[1]):`
`38`	`38`	`print('WARNING!!! You are running with a non-UTF8 locale environment '`
`39`	`39`	`'variable (e.g. LC_ALL is set to "C"), which makes Python 3 do '`
`40`	`40`	`'stupid things. If you get strange errors, please set it to '`