Skip to content

Added an extraction of the language setting from cookies #1097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sergei-bondarenko wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Added an extraction of the language setting from cookies #1097

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad06acb
Added an extraction of the language setting from cookies
sergei-bondarenko Aug 25, 2017
2f89dc6
Merge branch 'master' of git://github.com/HelloZeroNet/ZeroNet
sergei-bondarenko Sep 2, 2017
40c70d1
Fixed actionWrapper return bug
sergei-bondarenko Sep 2, 2017
615a07e
Merge branch 'master' of git://github.com/HelloZeroNet/ZeroNet
sergei-bondarenko Sep 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/Ui/UiServer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from Site import SiteManager
from Config import config
from Debug import Debug

import Translate

# Skip websocket handler if not necessary
class UiWSGIHandler(WSGIHandler):
Expand Down Expand Up @@ -87,6 +87,9 @@ def handleRequest(self, env, start_response):
else:
get = {}
ui_request = UiRequest(self, get, env, start_response)
lang = ui_request.getCookies().get('language')
if lang and lang != Translate.translate.lang:
Translate.translate.setLanguage(lang)
if config.debug: # Let the exception catched by werkezung
return ui_request.route(path)
else: # Catch and display the error
Expand Down Expand Up @@ -169,4 +172,4 @@ def stop(self):

self.server.socket.close()
self.server.stop()
time.sleep(1)
time.sleep(1)