Merge pull request #2571 from wallabag/change-language-without-logout

Changed behavior when we change language
This commit is contained in:
Nicolas Lœuillet 2016-11-11 18:27:04 +01:00 committed by GitHub
commit 8315507384
13 changed files with 14 additions and 12 deletions

View File

@ -38,6 +38,8 @@ class ConfigController extends Controller
$em->persist($config);
$em->flush();
$request->getSession()->set('_locale', $config->getLanguage());
// switch active theme
$activeTheme = $this->get('liip_theme.active_theme');
$activeTheme->setName($config->getTheme());

View File

@ -451,7 +451,7 @@ error:
flashes:
config:
notice:
config_saved: 'Opsætning gemt. Visse ændringer vil først fremgå ved næste login.'
config_saved: 'Opsætning gemt.'
password_updated: 'Adgangskode opdateret'
# password_not_updated_demo: "In demonstration mode, you can't change password for this user."
user_updated: 'Oplysninger opdateret'

View File

@ -451,7 +451,7 @@ error:
flashes:
config:
notice:
config_saved: 'Konfiguration gespeichert. Einige Einstellungen werden erst nach einer erneuten Anmeldung übernommen.'
config_saved: 'Konfiguration gespeichert.'
password_updated: 'Kennwort aktualisiert'
password_not_updated_demo: "Im Testmodus kannst du das Kennwort nicht ändern."
user_updated: 'Information aktualisiert'

View File

@ -451,7 +451,7 @@ error:
flashes:
config:
notice:
config_saved: 'Config saved. Some parameters will be considered after disconnection.'
config_saved: 'Config saved.'
password_updated: 'Password updated'
password_not_updated_demo: "In demonstration mode, you can't change password for this user."
user_updated: 'Information updated'

View File

@ -451,7 +451,7 @@ error:
flashes:
config:
notice:
config_saved: 'Configuración guardada. Algunos parámetros serán recargados cuando se vuelva a conectar.'
config_saved: 'Configuración guardada.'
password_updated: 'Contraseña actualizada'
password_not_updated_demo: "En modo demo, no puede cambiar la contraseña del usuario."
user_updated: 'Su información personal ha sido actualizada'

View File

@ -450,7 +450,7 @@ error:
flashes:
config:
notice:
config_saved: 'پیکربندی ذخیره شد. برخی از تنظیمات پس از این که قطع شدید اعمال می‌شود.'
config_saved: 'پیکربندی ذخیره شد.'
password_updated: 'رمز به‌روز شد'
password_not_updated_demo: "در حالت نمایشی نمی‌توانید رمز کاربر را عوض کنید."
user_updated: 'اطلاعات به‌روز شد'

View File

@ -451,7 +451,7 @@ error:
flashes:
config:
notice:
config_saved: "Les paramètres ont bien été mis à jour. Certains seront pris en compte après déconnexion."
config_saved: "Les paramètres ont bien été mis à jour."
password_updated: "Votre mot de passe a bien été mis à jour"
password_not_updated_demo: "En démo, vous ne pouvez pas changer le mot de passe de cet utilisateur."
user_updated: "Vos informations personnelles ont bien été mises à jour"

View File

@ -451,7 +451,7 @@ error:
flashes:
config:
notice:
config_saved: 'Configurazione salvata. Alcuni parametri verranno utilizzati dopo il logout/login.'
config_saved: 'Configurazione salvata.'
password_updated: 'Password aggiornata'
password_not_updated_demo: "In modalità demo, non puoi cambiare la password dell'utente."
user_updated: 'Informazioni aggiornate'

View File

@ -451,7 +451,7 @@ error:
flashes:
config:
notice:
config_saved: 'Los paramètres son ben estats meses a jorn. Certans seràn aplicats aprèp desconnexion.'
config_saved: 'Los paramètres son ben estats meses a jorn.'
password_updated: 'Vòstre senhal es ben estat mes a jorn'
password_not_updated_demo: "En demostration, podètz pas cambiar lo senhal d'aqueste utilizaire."
user_updated: 'Vòstres informacions personnelas son ben estadas mesas a jorn'

View File

@ -451,7 +451,7 @@ error:
flashes:
config:
notice:
config_saved: 'Konfiguracja zapisana. Niektóre parametry zostaną uznane po rozłączeniu'
config_saved: 'Konfiguracja zapisana.'
password_updated: 'Hasło zaktualizowane'
password_not_updated_demo: "In demonstration mode, you can't change password for this user."
user_updated: 'Informacje zaktualizowane'

View File

@ -448,7 +448,7 @@ user:
flashes:
config:
notice:
config_saved: 'Configiração salva. Alguns parâmetros podem ser considerados depois da desconexão.'
config_saved: 'Configiração salva.'
password_updated: 'Senha atualizada'
password_not_updated_demo: 'Em modo de demonstração, você não pode alterar a senha deste usuário.'
user_updated: 'Informação atualizada'

View File

@ -451,7 +451,7 @@ error:
flashes:
config:
notice:
config_saved: 'Configurație salvată. Unii parametrii vor fi considerați după deconectare.'
config_saved: 'Configurație salvată.'
password_updated: 'Parolă actualizată'
password_not_updated_demo: "In demonstration mode, you can't change password for this user."
user_updated: 'Informație actualizată'

View File

@ -450,7 +450,7 @@ error:
flashes:
config:
notice:
config_saved: 'Yapılandırma ayarları kaydedildi. Bazı yapılandırmalar tekrar giriş yaptığınızda aktif olacaktır.'
config_saved: 'Yapılandırma ayarları kaydedildi.'
password_updated: 'Şifre güncellendi'
password_not_updated_demo: "In demonstration mode, you can't change password for this user."
user_updated: 'Bilgiler güncellendi'