Guess locale using locale.getdefaultlocale()

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · May 24, 2017 · cf812c1 · cf812c1
1 parent ee96e2a
commit cf812c1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -16,8 +16,9 @@ Features
 Bugfixes
 --------
 
-* Save dependencies for template hooks properly (using .__doc__ or
-  .template_registry_identifier for callables)
+* Use ``locale.getdefaultlocale()`` for better locale guessing
+* Save dependencies for template hooks properly (using ``.__doc__`` or
+  ``.template_registry_identifier`` for callables)
 * Enable larger panorama thumbnails (Issue #2780)
 * Disable ``archive_rss`` link handler, which was useless because no
   such RSS was ever generated (Issue #2783)

diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -2817,6 +2817,12 @@ def guess_locale_from_lang_posix(lang):
     if is_valid_locale(str(lang)):
         locale_n = str(lang)
     else:
+        # Guess using locale.getdefaultlocale()
+        try:
+            locale_n = '.'.join(locale.getdefaultlocale())
+        except (ValueError, TypeError):
+            pass
+    if not is_valid_locale(locale_n):
         # this works in Travis when locale support set by Travis suggestion
         locale_n = str((locale.normalize(lang).split('.')[0]) + '.UTF-8')
     if not is_valid_locale(locale_n):