Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

locale: Fix incorrect use of locale-gen to generate locales. 

Previously, we were having issues installing on Debian Stretch with
non-English locales, because `locale-gen` actually doesn't take a
locale as an argument (and thus `locale-gen en_US.UTF-8` did nothing).
We should instead be calling localedef directly.

Thanks to Tom Daff for debugging this.

Fixes #10629.
This commit is contained in:
Tim Abbott 2018-10-11 14:40:58 -07:00
parent d60a088a49
commit 9054ce278f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile-dev
View File

@ -4,7 +4,7 @@ EXPOSE 9991
RUN apt-get update && apt-get install -y wget RUN apt-get update && apt-get install -y wget
RUN locale-gen en_US.UTF-8 RUN localedef -i en_US -f UTF-8 en_US.UTF-8
RUN useradd -d /home/zulip -m zulip && echo 'zulip ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers RUN useradd -d /home/zulip -m zulip && echo 'zulip ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers

2
scripts/lib/install
View File

@ -73,7 +73,7 @@ set -x
ZULIP_PATH="$(readlink -f $(dirname $0)/../..)" ZULIP_PATH="$(readlink -f $(dirname $0)/../..)"
# Force a known locale. Some packages on PyPI fail to install in some locales. # Force a known locale. Some packages on PyPI fail to install in some locales.
locale-gen en_US.UTF-8 localedef -i en_US -f UTF-8 en_US.UTF-8
export LC_ALL="en_US.UTF-8" export LC_ALL="en_US.UTF-8"
export LANG="en_US.UTF-8" export LANG="en_US.UTF-8"
export LANGUAGE="en_US.UTF-8" export LANGUAGE="en_US.UTF-8"