From ce5f3aeee15f0537ccdbb5314842506959423676 Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Tue, 7 Jun 2016 17:43:46 -0400
Subject: [PATCH] Changed default LocalizationSettings.AvailableLocales to
 include all locales (#3280)

---
 model/config.go      | 12 +++++++++++-
 webapp/i18n/i18n.jsx |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/model/config.go b/model/config.go
index 7e810be02f..e63dca073d 100644
--- a/model/config.go
+++ b/model/config.go
@@ -6,6 +6,7 @@ package model
 import (
 	"encoding/json"
 	"io"
+	"strings"
 )
 
 const (
@@ -35,6 +36,15 @@ const (
 	FAKE_SETTING = "********************************"
 )
 
+// should match the values in webapp/i18n/i18n.jsx
+var LOCALES = []string{
+	"en",
+	"es",
+	"fr",
+	"ja",
+	"pt-BR",
+}
+
 type ServiceSettings struct {
 	ListenAddress                     string
 	MaximumLoginAttempts              int
@@ -541,7 +551,7 @@ func (o *Config) SetDefaults() {
 
 	if o.LocalizationSettings.AvailableLocales == nil {
 		o.LocalizationSettings.AvailableLocales = new(string)
-		*o.LocalizationSettings.AvailableLocales = *o.LocalizationSettings.DefaultClientLocale
+		*o.LocalizationSettings.AvailableLocales = strings.Join(LOCALES, ",")
 	}
 }
 
diff --git a/webapp/i18n/i18n.jsx b/webapp/i18n/i18n.jsx
index 783cef975b..3a66c5c338 100644
--- a/webapp/i18n/i18n.jsx
+++ b/webapp/i18n/i18n.jsx
@@ -13,6 +13,7 @@ import frLocaleData from 'react-intl/locale-data/fr';
 import jaLocaleData from 'react-intl/locale-data/ja';
 import ptLocaleData from 'react-intl/locale-data/pt';
 
+// should match the values in model/config.go
 const languages = {
     en: {
         value: 'en',