mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	Reset locale on login (#17734)
When logging in reset the user's locale to ensure that it matches their preferred locale. Fix #15612 Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
		@@ -245,6 +245,9 @@ func APIAuth(authMethod auth.Method) func(*APIContext) {
 | 
			
		||||
		// Get user from session if logged in.
 | 
			
		||||
		ctx.User = authMethod.Verify(ctx.Req, ctx.Resp, ctx, ctx.Session)
 | 
			
		||||
		if ctx.User != nil {
 | 
			
		||||
			if ctx.Locale.Language() != ctx.User.Language {
 | 
			
		||||
				ctx.Locale = middleware.Locale(ctx.Resp, ctx.Req)
 | 
			
		||||
			}
 | 
			
		||||
			ctx.IsBasicAuth = ctx.Data["AuthedMethod"].(string) == auth.BasicMethodName
 | 
			
		||||
			ctx.IsSigned = true
 | 
			
		||||
			ctx.Data["IsSigned"] = ctx.IsSigned
 | 
			
		||||
 
 | 
			
		||||
@@ -614,6 +614,9 @@ func Auth(authMethod auth.Method) func(*Context) {
 | 
			
		||||
	return func(ctx *Context) {
 | 
			
		||||
		ctx.User = authMethod.Verify(ctx.Req, ctx.Resp, ctx, ctx.Session)
 | 
			
		||||
		if ctx.User != nil {
 | 
			
		||||
			if ctx.Locale.Language() != ctx.User.Language {
 | 
			
		||||
				ctx.Locale = middleware.Locale(ctx.Resp, ctx.Req)
 | 
			
		||||
			}
 | 
			
		||||
			ctx.IsBasicAuth = ctx.Data["AuthedMethod"].(string) == auth.BasicMethodName
 | 
			
		||||
			ctx.IsSigned = true
 | 
			
		||||
			ctx.Data["IsSigned"] = ctx.IsSigned
 | 
			
		||||
 
 | 
			
		||||
@@ -572,6 +572,10 @@ func handleSignInFull(ctx *context.Context, u *models.User, remember bool, obeyR
 | 
			
		||||
 | 
			
		||||
	middleware.SetLocaleCookie(ctx.Resp, u.Language, 0)
 | 
			
		||||
 | 
			
		||||
	if ctx.Locale.Language() != u.Language {
 | 
			
		||||
		ctx.Locale = middleware.Locale(ctx.Resp, ctx.Req)
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// Clear whatever CSRF has right now, force to generate a new one
 | 
			
		||||
	middleware.DeleteCSRFCookie(ctx.Resp)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user