Backport #6791 from master to 3.7-stable

jekyll · Feb 25, 2018 · 31130f7 · 31130f7
1 parent 053acd3
commit 31130f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
@@ -35,7 +35,6 @@ def require_all(path)
 require "i18n"
 
 SafeYAML::OPTIONS[:suppress_warnings] = true
-I18n.config.available_locales = :en
 
 module Jekyll
   # internal requires

diff --git a/lib/jekyll/utils.rb b/lib/jekyll/utils.rb
@@ -203,7 +203,10 @@ def slugify(string, mode: nil, cased: false)
       end
 
       # Drop accent marks from latin characters. Everything else turns to ?
-      string = ::I18n.transliterate(string) if mode == "latin"
+      if mode == "latin"
+        I18n.config.available_locales = :en if I18n.config.available_locales.empty?
+        string = I18n.transliterate(string)
+      end
 
       slug = replace_character_sequence_with_hyphen(string, :mode => mode)