2 files changed +13
-2
lines changed Original file line number Diff line number Diff line change
1
+ New in master
2
+ =============
3
+
4
+ Features
5
+ --------
6
+
7
+ Bugfixes
8
+ --------
9
+
10
+ * Capitalize "UTF-8" properly in locale guessing (Issue #2137)
11
+
1
12
New in v7.7.2
2
13
=============
3
14
Original file line number Diff line number Diff line change @@ -2254,7 +2254,7 @@ def valid_locale_fallback(desired_locale=None):
2254
2254
"""
2255
2255
# Whenever fallbacks change, adjust test TestHarcodedFallbacksWork
2256
2256
candidates_windows = [str ('English' ), str ('C' )]
2257
- candidates_posix = [str ('en_US.utf8 ' ), str ('C' )]
2257
+ candidates_posix = [str ('en_US.UTF-8 ' ), str ('C' )]
2258
2258
candidates = candidates_windows if sys .platform == 'win32' else candidates_posix
2259
2259
if desired_locale :
2260
2260
candidates = list (candidates )
@@ -2288,7 +2288,7 @@ def guess_locale_from_lang_posix(lang):
2288
2288
locale_n = str (lang )
2289
2289
else :
2290
2290
# this works in Travis when locale support set by Travis suggestion
2291
- locale_n = str ((locale .normalize (lang ).split ('.' )[0 ]) + '.utf8 ' )
2291
+ locale_n = str ((locale .normalize (lang ).split ('.' )[0 ]) + '.UTF-8 ' )
2292
2292
if not is_valid_locale (locale_n ):
2293
2293
# http://thread.gmane.org/gmane.comp.web.nikola/337/focus=343
2294
2294
locale_n = str ((locale .normalize (lang ).split ('.' )[0 ]))
0 commit comments