From 856c858cc3d6c4ba49d3e3be0534bad9284690d5 Mon Sep 17 00:00:00 2001 From: Serghei MIHAI Date: Thu, 26 Feb 2015 17:09:58 +0100 Subject: [PATCH] country code check in locale (#6610) --- ckanext/ozwillo_pyoidc/plugin.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ckanext/ozwillo_pyoidc/plugin.py b/ckanext/ozwillo_pyoidc/plugin.py index f9b313c..48cd69a 100755 --- a/ckanext/ozwillo_pyoidc/plugin.py +++ b/ckanext/ozwillo_pyoidc/plugin.py @@ -131,6 +131,10 @@ class OpenidController(base.BaseController): userinfo = client.callback(request.GET) log.info('Received userinfo: %s' % userinfo) userobj = model.User.get(userinfo['sub']) + locale = userinfo.get('locale') + if '-' in locale: + locale, country = locale.split('-') + if userobj: if 'given_name' in userinfo: userobj.fullname = userinfo['given_name'] @@ -144,7 +148,7 @@ class OpenidController(base.BaseController): controller="organization", action='read', id=g.name, - locale=userinfo.get('locale'), + locale=locale, qualified=True) redirect_to(str(org_url))