saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #31170 from rallytime/bp-31157

Browse source 
Back-port #31157 to 2015.8
This commit is contained in:
Mike Place 2016-02-12 11:27:49 -07:00
commit f2efd3e6c1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/modules/localemod.py
View file

@ -242,7 +242,7 @@ def gen_locale(locale, **kwargs):
locale_info = salt.utils.locales.split_locale(locale)
# if the charmap has not been supplied, normalize by appening it
if not locale_info['charmap']:
if not locale_info['charmap'] and not on_ubuntu:
locale_info['charmap'] = locale_info['codeset']
locale = salt.utils.locales.join_locale(locale_info)