Merge pull request #881 from mwhudson/lp-1912967
switch language in the client, not the server
This commit is contained in:
commit
beae2d4974
|
@ -15,6 +15,7 @@
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
|
from subiquitycore import i18n
|
||||||
from subiquity.client.controller import SubiquityTuiController
|
from subiquity.client.controller import SubiquityTuiController
|
||||||
from subiquity.ui.views.welcome import WelcomeView
|
from subiquity.ui.views.welcome import WelcomeView
|
||||||
|
|
||||||
|
@ -40,6 +41,7 @@ class WelcomeController(SubiquityTuiController):
|
||||||
|
|
||||||
def done(self, code):
|
def done(self, code):
|
||||||
log.debug("WelcomeController.done %s next_screen", code)
|
log.debug("WelcomeController.done %s next_screen", code)
|
||||||
|
i18n.switch_language(code)
|
||||||
self.signal.emit_signal('l10n:language-selected', code)
|
self.signal.emit_signal('l10n:language-selected', code)
|
||||||
self.app.next_screen(self.endpoint.POST(code))
|
self.app.next_screen(self.endpoint.POST(code))
|
||||||
|
|
||||||
|
|
|
@ -15,9 +15,6 @@
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from subiquitycore import i18n
|
|
||||||
|
|
||||||
|
|
||||||
log = logging.getLogger('subiquity.models.locale')
|
log = logging.getLogger('subiquity.models.locale')
|
||||||
|
|
||||||
|
|
||||||
|
@ -31,7 +28,6 @@ class LocaleModel(object):
|
||||||
|
|
||||||
def switch_language(self, code):
|
def switch_language(self, code):
|
||||||
self.selected_language = code
|
self.selected_language = code
|
||||||
i18n.switch_language(code)
|
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return "<Selected: {}>".format(self.selected_language)
|
return "<Selected: {}>".format(self.selected_language)
|
||||||
|
|
Loading…
Reference in New Issue