Merge pull request #24061 from diego-XA/develop

Fix for #23221
saltstack · May 22, 2015 · 55732ab · 55732ab
2 parents d5b5fc1 + d2aec15
commit 55732ab
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/salt/modules/localemod.py b/salt/modules/localemod.py
@@ -208,7 +208,7 @@ def gen_locale(locale, **kwargs):
 
     if on_debian or on_gentoo:  # file-based search
         search = '/usr/share/i18n/SUPPORTED'
-        valid = __salt__['file.search'](search, '^{0}$'.format(locale))
+        valid = __salt__['file.search'](search, '^{0}( (UTF-8|ISO-8859-.).?)?$'.format(locale))
     else:  # directory-based search
         if on_suse:
             search = '/usr/share/locale'