From ad06acb60d1fb16621344d882508bdccaca74ebc Mon Sep 17 00:00:00 2001 From: grez911 Date: Fri, 25 Aug 2017 21:29:28 +0300 Subject: [PATCH 1/2] Added an extraction of the language setting from cookies --- src/Ui/UiServer.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Ui/UiServer.py b/src/Ui/UiServer.py index 926f1fea2..687d8a218 100644 --- a/src/Ui/UiServer.py +++ b/src/Ui/UiServer.py @@ -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): @@ -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 @@ -169,4 +172,4 @@ def stop(self): self.server.socket.close() self.server.stop() - time.sleep(1) \ No newline at end of file + time.sleep(1) From 40c70d1228fae1768162d8d595ac472185182789 Mon Sep 17 00:00:00 2001 From: grez911 Date: Sat, 2 Sep 2017 15:32:34 +0300 Subject: [PATCH 2/2] Fixed actionWrapper return bug --- src/Ui/UiRequest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Ui/UiRequest.py b/src/Ui/UiRequest.py index 57c631a65..d2e4e27fa 100644 --- a/src/Ui/UiRequest.py +++ b/src/Ui/UiRequest.py @@ -282,7 +282,7 @@ def actionWrapper(self, path, extra_headers=None): return False self.sendHeader(extra_headers=extra_headers[:]) - return [self.renderWrapper(site, path, inner_path, title, extra_headers)] + return iter([self.renderWrapper(site, path, inner_path, title, extra_headers)]) # Make response be sent at once (see https://github.com/HelloZeroNet/ZeroNet/issues/1092) else: # Bad url