diff options
author | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-11-10 20:54:20 +0100 |
---|---|---|
committer | Nicolas Lœuillet <nicolas@loeuillet.org> | 2016-11-10 20:54:20 +0100 |
commit | ece4718f63078acf6d4ac1e68e47f088569add84 (patch) | |
tree | f9f4fe3f11b792d8800c2cab79cf5daaed263002 /src | |
parent | 5cf96040048452c60fbbbf6455426fdde414bf9e (diff) | |
download | wallabag-ece4718f63078acf6d4ac1e68e47f088569add84.tar.gz wallabag-ece4718f63078acf6d4ac1e68e47f088569add84.tar.zst wallabag-ece4718f63078acf6d4ac1e68e47f088569add84.zip |
Changed behavior when we change language
No need to disconnect to apply the language substitution
Diffstat (limited to 'src')
13 files changed, 14 insertions, 12 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 91cdcae5..46fb9503 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -38,6 +38,8 @@ class ConfigController extends Controller | |||
38 | $em->persist($config); | 38 | $em->persist($config); |
39 | $em->flush(); | 39 | $em->flush(); |
40 | 40 | ||
41 | $request->getSession()->set('_locale', $config->getLanguage()); | ||
42 | |||
41 | // switch active theme | 43 | // switch active theme |
42 | $activeTheme = $this->get('liip_theme.active_theme'); | 44 | $activeTheme = $this->get('liip_theme.active_theme'); |
43 | $activeTheme->setName($config->getTheme()); | 45 | $activeTheme->setName($config->getTheme()); |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index b73aff4a..1077e9d1 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml | |||
@@ -451,7 +451,7 @@ error: | |||
451 | flashes: | 451 | flashes: |
452 | config: | 452 | config: |
453 | notice: | 453 | notice: |
454 | config_saved: 'Opsætning gemt. Visse ændringer vil først fremgå ved næste login.' | 454 | config_saved: 'Opsætning gemt.' |
455 | password_updated: 'Adgangskode opdateret' | 455 | password_updated: 'Adgangskode opdateret' |
456 | # password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 456 | # password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
457 | user_updated: 'Oplysninger opdateret' | 457 | user_updated: 'Oplysninger opdateret' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index 5e8bb0e9..843102f4 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | |||
@@ -451,7 +451,7 @@ error: | |||
451 | flashes: | 451 | flashes: |
452 | config: | 452 | config: |
453 | notice: | 453 | notice: |
454 | config_saved: 'Konfiguration gespeichert. Einige Einstellungen werden erst nach einer erneuten Anmeldung übernommen.' | 454 | config_saved: 'Konfiguration gespeichert.' |
455 | password_updated: 'Kennwort aktualisiert' | 455 | password_updated: 'Kennwort aktualisiert' |
456 | password_not_updated_demo: "Im Testmodus kannst du das Kennwort nicht ändern." | 456 | password_not_updated_demo: "Im Testmodus kannst du das Kennwort nicht ändern." |
457 | user_updated: 'Information aktualisiert' | 457 | user_updated: 'Information aktualisiert' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index fe0876e7..3cee6468 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | |||
@@ -451,7 +451,7 @@ error: | |||
451 | flashes: | 451 | flashes: |
452 | config: | 452 | config: |
453 | notice: | 453 | notice: |
454 | config_saved: 'Config saved. Some parameters will be considered after disconnection.' | 454 | config_saved: 'Config saved.' |
455 | password_updated: 'Password updated' | 455 | password_updated: 'Password updated' |
456 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 456 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
457 | user_updated: 'Information updated' | 457 | user_updated: 'Information updated' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index b24bda89..480eacc4 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
@@ -451,7 +451,7 @@ error: | |||
451 | flashes: | 451 | flashes: |
452 | config: | 452 | config: |
453 | notice: | 453 | notice: |
454 | config_saved: 'Configuración guardada. Algunos parámetros serán recargados cuando se vuelva a conectar.' | 454 | config_saved: 'Configuración guardada.' |
455 | password_updated: 'Contraseña actualizada' | 455 | password_updated: 'Contraseña actualizada' |
456 | password_not_updated_demo: "En modo demo, no puede cambiar la contraseña del usuario." | 456 | password_not_updated_demo: "En modo demo, no puede cambiar la contraseña del usuario." |
457 | user_updated: 'Su información personal ha sido actualizada' | 457 | user_updated: 'Su información personal ha sido actualizada' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index a957b9a7..619b596a 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml | |||
@@ -450,7 +450,7 @@ error: | |||
450 | flashes: | 450 | flashes: |
451 | config: | 451 | config: |
452 | notice: | 452 | notice: |
453 | config_saved: 'پیکربندی ذخیره شد. برخی از تنظیمات پس از این که قطع شدید اعمال میشود.' | 453 | config_saved: 'پیکربندی ذخیره شد.' |
454 | password_updated: 'رمز بهروز شد' | 454 | password_updated: 'رمز بهروز شد' |
455 | password_not_updated_demo: "در حالت نمایشی نمیتوانید رمز کاربر را عوض کنید." | 455 | password_not_updated_demo: "در حالت نمایشی نمیتوانید رمز کاربر را عوض کنید." |
456 | user_updated: 'اطلاعات بهروز شد' | 456 | user_updated: 'اطلاعات بهروز شد' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index 3af5cc04..6871bbcf 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | |||
@@ -451,7 +451,7 @@ error: | |||
451 | flashes: | 451 | flashes: |
452 | config: | 452 | config: |
453 | notice: | 453 | notice: |
454 | config_saved: "Les paramètres ont bien été mis à jour. Certains seront pris en compte après déconnexion." | 454 | config_saved: "Les paramètres ont bien été mis à jour." |
455 | password_updated: "Votre mot de passe a bien été mis à jour" | 455 | password_updated: "Votre mot de passe a bien été mis à jour" |
456 | password_not_updated_demo: "En démo, vous ne pouvez pas changer le mot de passe de cet utilisateur." | 456 | password_not_updated_demo: "En démo, vous ne pouvez pas changer le mot de passe de cet utilisateur." |
457 | user_updated: "Vos informations personnelles ont bien été mises à jour" | 457 | user_updated: "Vos informations personnelles ont bien été mises à jour" |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 894eab24..eecd7882 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | |||
@@ -451,7 +451,7 @@ error: | |||
451 | flashes: | 451 | flashes: |
452 | config: | 452 | config: |
453 | notice: | 453 | notice: |
454 | config_saved: 'Configurazione salvata. Alcuni parametri verranno utilizzati dopo il logout/login.' | 454 | config_saved: 'Configurazione salvata.' |
455 | password_updated: 'Password aggiornata' | 455 | password_updated: 'Password aggiornata' |
456 | password_not_updated_demo: "In modalità demo, non puoi cambiare la password dell'utente." | 456 | password_not_updated_demo: "In modalità demo, non puoi cambiare la password dell'utente." |
457 | user_updated: 'Informazioni aggiornate' | 457 | user_updated: 'Informazioni aggiornate' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index efe46d9e..7fa31bce 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | |||
@@ -451,7 +451,7 @@ error: | |||
451 | flashes: | 451 | flashes: |
452 | config: | 452 | config: |
453 | notice: | 453 | notice: |
454 | config_saved: 'Los paramètres son ben estats meses a jorn. Certans seràn aplicats aprèp desconnexion.' | 454 | config_saved: 'Los paramètres son ben estats meses a jorn.' |
455 | password_updated: 'Vòstre senhal es ben estat mes a jorn' | 455 | password_updated: 'Vòstre senhal es ben estat mes a jorn' |
456 | password_not_updated_demo: "En demostration, podètz pas cambiar lo senhal d'aqueste utilizaire." | 456 | password_not_updated_demo: "En demostration, podètz pas cambiar lo senhal d'aqueste utilizaire." |
457 | user_updated: 'Vòstres informacions personnelas son ben estadas mesas a jorn' | 457 | user_updated: 'Vòstres informacions personnelas son ben estadas mesas a jorn' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index ca845e57..1b00fc6d 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | |||
@@ -451,7 +451,7 @@ error: | |||
451 | flashes: | 451 | flashes: |
452 | config: | 452 | config: |
453 | notice: | 453 | notice: |
454 | config_saved: 'Konfiguracja zapisana. Niektóre parametry zostaną uznane po rozłączeniu' | 454 | config_saved: 'Konfiguracja zapisana.' |
455 | password_updated: 'Hasło zaktualizowane' | 455 | password_updated: 'Hasło zaktualizowane' |
456 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 456 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
457 | user_updated: 'Informacje zaktualizowane' | 457 | user_updated: 'Informacje zaktualizowane' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index d75f8ce8..54316161 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | |||
@@ -448,7 +448,7 @@ user: | |||
448 | flashes: | 448 | flashes: |
449 | config: | 449 | config: |
450 | notice: | 450 | notice: |
451 | config_saved: 'Configiração salva. Alguns parâmetros podem ser considerados depois da desconexão.' | 451 | config_saved: 'Configiração salva.' |
452 | password_updated: 'Senha atualizada' | 452 | password_updated: 'Senha atualizada' |
453 | password_not_updated_demo: 'Em modo de demonstração, você não pode alterar a senha deste usuário.' | 453 | password_not_updated_demo: 'Em modo de demonstração, você não pode alterar a senha deste usuário.' |
454 | user_updated: 'Informação atualizada' | 454 | user_updated: 'Informação atualizada' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index f9559401..65cedfb2 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml | |||
@@ -451,7 +451,7 @@ error: | |||
451 | flashes: | 451 | flashes: |
452 | config: | 452 | config: |
453 | notice: | 453 | notice: |
454 | config_saved: 'Configurație salvată. Unii parametrii vor fi considerați după deconectare.' | 454 | config_saved: 'Configurație salvată.' |
455 | password_updated: 'Parolă actualizată' | 455 | password_updated: 'Parolă actualizată' |
456 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 456 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
457 | user_updated: 'Informație actualizată' | 457 | user_updated: 'Informație actualizată' |
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index da29456a..73fb6fce 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
@@ -450,7 +450,7 @@ error: | |||
450 | flashes: | 450 | flashes: |
451 | config: | 451 | config: |
452 | notice: | 452 | notice: |
453 | config_saved: 'Yapılandırma ayarları kaydedildi. Bazı yapılandırmalar tekrar giriş yaptığınızda aktif olacaktır.' | 453 | config_saved: 'Yapılandırma ayarları kaydedildi.' |
454 | password_updated: 'Şifre güncellendi' | 454 | password_updated: 'Şifre güncellendi' |
455 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." | 455 | password_not_updated_demo: "In demonstration mode, you can't change password for this user." |
456 | user_updated: 'Bilgiler güncellendi' | 456 | user_updated: 'Bilgiler güncellendi' |