summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
Diffstat (limited to 'web')
-rw-r--r--web/react/components/login.jsx17
-rw-r--r--web/static/i18n/en.json4
-rw-r--r--web/static/i18n/es.json4
-rw-r--r--web/web.go34
4 files changed, 36 insertions, 23 deletions
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 1d9b3e906..6887489a7 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -7,6 +7,8 @@ import LoginLdap from './login_ldap.jsx';
import * as Utils from '../utils/utils.jsx';
import Constants from '../utils/constants.jsx';
+var FormattedMessage = ReactIntl.FormattedMessage;
+
export default class Login extends React.Component {
constructor(props) {
super(props);
@@ -86,7 +88,12 @@ export default class Login extends React.Component {
if (emailSignup) {
forgotPassword = (
<div className='form-group'>
- <a href={'/' + teamName + '/reset_password'}>{'I forgot my password'}</a>
+ <a href={'/' + teamName + '/reset_password'}>
+ <FormattedMessage
+ id='login.forgot_password'
+ defaultMessage='I forgot my password'
+ />
+ </a>
</div>
);
}
@@ -141,7 +148,13 @@ export default class Login extends React.Component {
{ldapLogin}
{userSignUp}
<div className='form-group margin--extra form-group--small'>
- <span><a href='/find_team'>{'Find your other teams'}</a></span>
+ <span>
+ <a href='/find_team'>
+ <FormattedMessage
+ id='login.find_teams'
+ defaultMessage='Find your other teams'
+ />
+ </a></span>
</div>
{forgotPassword}
{teamSignUp}
diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json
index 4b3397a08..038b1342d 100644
--- a/web/static/i18n/en.json
+++ b/web/static/i18n/en.json
@@ -1,4 +1,4 @@
{
- "about.close": "Close",
- "about.date": "Build Date:"
+ "login.find_teams": "Find your other teams",
+ "login.forgot_password": "I forgot my password"
} \ No newline at end of file
diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json
index 4b3397a08..b849489cb 100644
--- a/web/static/i18n/es.json
+++ b/web/static/i18n/es.json
@@ -1,4 +1,4 @@
{
- "about.close": "Close",
- "about.date": "Build Date:"
+ "login.find_teams": "Find your other teams (spanish!)",
+ "login.forgot_password": "I forgot my password (spanish!)"
} \ No newline at end of file
diff --git a/web/web.go b/web/web.go
index a02019730..391b268cd 100644
--- a/web/web.go
+++ b/web/web.go
@@ -24,7 +24,7 @@ var Templates *template.Template
type HtmlTemplatePage api.Page
-func NewHtmlTemplatePage(templateName string, title string) *HtmlTemplatePage {
+func NewHtmlTemplatePage(templateName string, title string, locale string) *HtmlTemplatePage {
if len(title) > 0 {
title = utils.Cfg.TeamSettings.SiteName + " - " + title
@@ -37,7 +37,7 @@ func NewHtmlTemplatePage(templateName string, title string) *HtmlTemplatePage {
Props: props,
ClientCfg: utils.ClientCfg,
ClientLicense: utils.ClientLicense,
- Locale: model.DEFAULT_LOCALE,
+ Locale: locale,
}
}
@@ -171,7 +171,7 @@ func root(c *api.Context, w http.ResponseWriter, r *http.Request) {
}
if len(c.Session.UserId) == 0 {
- page := NewHtmlTemplatePage("signup_team", "Signup")
+ page := NewHtmlTemplatePage("signup_team", "Signup", c.Locale)
if result := <-api.Srv.Store.Team().GetAllTeamListing(); result.Err != nil {
c.Err = result.Err
@@ -210,7 +210,7 @@ func root(c *api.Context, w http.ResponseWriter, r *http.Request) {
user = ur.Data.(*model.User)
}
- page := NewHtmlTemplatePage("home", "Home")
+ page := NewHtmlTemplatePage("home", "Home", c.Locale)
page.Team = team
page.User = user
page.Render(c, w)
@@ -223,7 +223,7 @@ func signup(c *api.Context, w http.ResponseWriter, r *http.Request) {
return
}
- page := NewHtmlTemplatePage("signup_team", "Signup")
+ page := NewHtmlTemplatePage("signup_team", "Signup", c.Locale)
page.Render(c, w)
}
@@ -258,7 +258,7 @@ func login(c *api.Context, w http.ResponseWriter, r *http.Request) {
return
}
- page := NewHtmlTemplatePage("login", "Login")
+ page := NewHtmlTemplatePage("login", "Login", c.Locale)
page.Props["TeamDisplayName"] = team.DisplayName
page.Props["TeamName"] = team.Name
@@ -272,7 +272,7 @@ func login(c *api.Context, w http.ResponseWriter, r *http.Request) {
func signupTeamConfirm(c *api.Context, w http.ResponseWriter, r *http.Request) {
email := r.FormValue("email")
- page := NewHtmlTemplatePage("signup_team_confirm", "Signup Email Sent")
+ page := NewHtmlTemplatePage("signup_team_confirm", "Signup Email Sent", c.Locale)
page.Props["Email"] = email
page.Render(c, w)
}
@@ -294,7 +294,7 @@ func signupTeamComplete(c *api.Context, w http.ResponseWriter, r *http.Request)
return
}
- page := NewHtmlTemplatePage("signup_team_complete", "Complete Team Sign Up")
+ page := NewHtmlTemplatePage("signup_team_complete", "Complete Team Sign Up", c.Locale)
page.Props["Email"] = props["email"]
page.Props["Data"] = data
page.Props["Hash"] = hash
@@ -344,7 +344,7 @@ func signupUserComplete(c *api.Context, w http.ResponseWriter, r *http.Request)
}
}
- page := NewHtmlTemplatePage("signup_user_complete", "Complete User Sign Up")
+ page := NewHtmlTemplatePage("signup_user_complete", "Complete User Sign Up", c.Locale)
page.Props["Email"] = props["email"]
page.Props["TeamDisplayName"] = props["display_name"]
page.Props["TeamName"] = props["name"]
@@ -528,7 +528,7 @@ func doLoadChannel(c *api.Context, w http.ResponseWriter, r *http.Request, team
user = ur.Data.(*model.User)
}
- page := NewHtmlTemplatePage("channel", "")
+ page := NewHtmlTemplatePage("channel", "", c.Locale)
page.Props["Title"] = channel.DisplayName + " - " + team.DisplayName + " " + page.ClientCfg["SiteName"]
page.Props["TeamDisplayName"] = team.DisplayName
page.Props["ChannelName"] = channel.Name
@@ -585,7 +585,7 @@ func verifyEmail(c *api.Context, w http.ResponseWriter, r *http.Request) {
}
}
- page := NewHtmlTemplatePage("verify", "Email Verified")
+ page := NewHtmlTemplatePage("verify", "Email Verified", c.Locale)
page.Props["TeamURL"] = c.GetTeamURLFromTeam(team)
page.Props["UserEmail"] = email
page.Props["ResendSuccess"] = resendSuccess
@@ -593,7 +593,7 @@ func verifyEmail(c *api.Context, w http.ResponseWriter, r *http.Request) {
}
func findTeam(c *api.Context, w http.ResponseWriter, r *http.Request) {
- page := NewHtmlTemplatePage("find_team", "Find Team")
+ page := NewHtmlTemplatePage("find_team", "Find Team", c.Locale)
page.Render(c, w)
}
@@ -601,7 +601,7 @@ func docs(c *api.Context, w http.ResponseWriter, r *http.Request) {
params := mux.Vars(r)
doc := params["doc"]
- page := NewHtmlTemplatePage("docs", "Documentation")
+ page := NewHtmlTemplatePage("docs", "Documentation", c.Locale)
page.Props["Site"] = doc
page.Render(c, w)
}
@@ -643,7 +643,7 @@ func resetPassword(c *api.Context, w http.ResponseWriter, r *http.Request) {
teamDisplayName = team.DisplayName
}
- page := NewHtmlTemplatePage("password_reset", "")
+ page := NewHtmlTemplatePage("password_reset", "", c.Locale)
page.Props["Title"] = "Reset Password " + page.ClientCfg["SiteName"]
page.Props["TeamDisplayName"] = teamDisplayName
page.Props["TeamName"] = teamName
@@ -821,7 +821,7 @@ func adminConsole(c *api.Context, w http.ResponseWriter, r *http.Request) {
activeTab := params["tab"]
teamId := params["team"]
- page := NewHtmlTemplatePage("admin_console", "Admin Console")
+ page := NewHtmlTemplatePage("admin_console", "Admin Console", c.Locale)
page.User = user
page.Team = team
page.Props["ActiveTab"] = activeTab
@@ -867,7 +867,7 @@ func authorizeOAuth(c *api.Context, w http.ResponseWriter, r *http.Request) {
team = result.Data.(*model.Team)
}
- page := NewHtmlTemplatePage("authorize", "Authorize Application")
+ page := NewHtmlTemplatePage("authorize", "Authorize Application", c.Locale)
page.Props["TeamName"] = team.Name
page.Props["AppName"] = app.Name
page.Props["ResponseType"] = responseType
@@ -1165,7 +1165,7 @@ func claimAccount(c *api.Context, w http.ResponseWriter, r *http.Request) {
}
}
- page := NewHtmlTemplatePage("claim_account", "Claim Account")
+ page := NewHtmlTemplatePage("claim_account", "Claim Account", c.Locale)
page.Props["Email"] = email
page.Props["CurrentType"] = authType
page.Props["NewType"] = newType
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-10 04:02:58 +0000