diff options
| author | Pavel Zuna <pzuna@redhat.com> | 2011-02-15 14:10:38 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2011-03-01 10:31:37 -0500 |
| commit | bfca99b420d72388cf0230ff6f5481878e336ca7 (patch) | |
| tree | a1c18e8337a0f3f5d56aa39e9f707f4a12242b9e /ipaserver/rpcserver.py | |
| parent | 6eb70ea8e2e61d20b6832a85ff4928b216f6f78c (diff) | |
| download | freeipa-bfca99b420d72388cf0230ff6f5481878e336ca7.tar.gz freeipa-bfca99b420d72388cf0230ff6f5481878e336ca7.tar.xz freeipa-bfca99b420d72388cf0230ff6f5481878e336ca7.zip | |
Send Accept-Language header over XML-RPC and translate on server.
Fix #904
Fix #917
Diffstat (limited to 'ipaserver/rpcserver.py')
| -rw-r--r-- | ipaserver/rpcserver.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py index 701ebb651..3d93abe95 100644 --- a/ipaserver/rpcserver.py +++ b/ipaserver/rpcserver.py @@ -193,11 +193,17 @@ class WSGIExecutioner(Executioner): result = None error = None _id = None - lang= os.environ['LANG'] + lang = os.environ['LANG'] try: if ('HTTP_ACCEPT_LANGUAGE' in environ): - os.environ['LANG']=string.split( - environ['HTTP_ACCEPT_LANGUAGE'],",")[0].split(';')[0] + lang_reg_w_q = environ['HTTP_ACCEPT_LANGUAGE'].split(',')[0] + lang_reg = lang_reg_w_q.split(';')[0] + lang_ = lang_reg.split('-')[0] + if '-' in lang_reg: + reg = lang_reg.split('-')[1].upper(); + else: + reg = lang_.upper() + os.environ['LANG'] = '%s_%s' % (lang_, reg) if ( environ.get('CONTENT_TYPE', '').startswith(self.content_type) and environ['REQUEST_METHOD'] == 'POST' @@ -217,7 +223,7 @@ class WSGIExecutioner(Executioner): ) error = InternalError() finally: - os.environ['LANG']=lang + os.environ['LANG'] = lang params = self.Command[name].args_options_2_params(*args, **options) if error: self.info('%s: %s(%s): %s', context.principal, name, ', '.join(self.Command[name]._repr_iter(**params)), e.__class__.__name__) |