14 files changed, 39 insertions, 32 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index b761f8f2..214b906b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,11 +1,16 @@
 | Q             | A
 | ------------- | ---
-| Bug fix?      | yes|no
+| Bug fix?      | yes/no
-| New feature?  | yes|no
+| New feature?  | yes/no
-| BC breaks?    | yes|no
+| BC breaks?    | yes/no
-| Deprecations? | yes|no
+| Deprecations? | yes/no
-| Tests pass?   | yes|no
+| Tests pass?   | yes/no
-| Documentation | yes|no
+| Documentation | yes/no
-| Translation   | yes|no
+| Translation   | yes/no
-| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
+| Fixed tickets | #...
 | License       | MIT
+<!--
+- Please fill in this template according to the PR you're about to submit.
+- Replace this comment by a description of what your PR is solving.
+-->
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
            $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());
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 6ca7e459..1077e9d1 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -229,7 +229,7 @@ about:
    getting_help:
        documentation: 'Dokumentation'
        bug_reports: 'Bugs'
-        support: '<a href="https://support.wallabag.org">På vor support-side</a> eller <a href="https://github.com/wallabag/wallabag/issues">på GitHub</a>'
+        support: '<a href="https://github.com/wallabag/wallabag/issues">på GitHub</a>'
    helping:
        description: 'wallabag er gratis og Open source. Du kan hjælpe os:'
        by_contributing: 'ved at bidrage til projektet:'
@@ -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'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 8fd1d82a..843102f4 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -229,7 +229,7 @@ about:
    getting_help:
        documentation: 'Dokumentation'
        bug_reports: 'Fehlerberichte'
-        support: '<a href="https://support.wallabag.org">Auf unserer Support-Webseite</a> oder <a href="https://github.com/wallabag/wallabag/issues">auf GitHub</a>'
+        support: '<a href="https://github.com/wallabag/wallabag/issues">auf GitHub</a>'
    helping:
        description: 'wallabag ist frei und Open Source. Du kannst uns helfen:'
        by_contributing: 'indem du zu dem Projekt beiträgst:'
@@ -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'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 02f56535..3cee6468 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -229,7 +229,7 @@ about:
    getting_help:
        documentation: 'Documentation'
        bug_reports: 'Bug reports'
-        support: '<a href="https://support.wallabag.org">On our support website</a> or <a href="https://github.com/wallabag/wallabag/issues">on GitHub</a>'
+        support: '<a href="https://github.com/wallabag/wallabag/issues">on GitHub</a>'
    helping:
        description: 'wallabag is free and open source. You can help us:'
        by_contributing: 'by contributing to the project:'
@@ -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'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 42ec8183..480eacc4 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -229,7 +229,7 @@ about:
    getting_help:
        documentation: 'Documentación'
        bug_reports: 'Reporte de errores'
-        support: '<a href="https://support.wallabag.org">En nuestra web de apoyo website</a> o <a href="https://github.com/wallabag/wallabag/issues">en GitHub</a>'
+        support: '<a href="https://github.com/wallabag/wallabag/issues">en GitHub</a>'
    helping:
        description: 'wallabag es libre y gratuito. Usted puede ayudarnos :'
        by_contributing: 'contribuyendo al proyecto :'
@@ -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'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index f82167df..619b596a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -229,7 +229,7 @@ about:
    getting_help:
        documentation: 'راهنما'
        bug_reports: 'گزارش اشکال‌ها'
-        support: '<a href="https://support.wallabag.org">در وب‌گاه پشتیبانی</a> یا <a href="https://github.com/wallabag/wallabag/issues">روی GitHub</a>'
+        support: '<a href="https://github.com/wallabag/wallabag/issues">روی GitHub</a>'
    helping:
        description: 'wallabag رایگان، آزاد، و متن‌باز است. شما می‌توانید به ما کمک کنید:'
        by_contributing: 'با مشارکت در پروژه:'
@@ -450,7 +450,7 @@ error:
 flashes:
    config:
        notice:
-            config_saved: 'پیکربندی ذخیره شد. برخی از تنظیمات پس از این که قطع شدید اعمال می‌شود.'
+            config_saved: 'پیکربندی ذخیره شد.'
            password_updated: 'رمز به‌روز شد'
            password_not_updated_demo: "در حالت نمایشی نمی‌توانید رمز کاربر را عوض کنید."
            user_updated: 'اطلاعات به‌روز شد'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 421cb8b5..6871bbcf 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -229,7 +229,7 @@ about:
    getting_help:
        documentation: "Documentation"
        bug_reports: "Rapport de bogue"
-        support: "<a href=\"https://support.wallabag.org\">Sur notre site de support</a> ou <a href=\"https://github.com/wallabag/wallabag/issues\">sur GitHub</a>"
+        support: "<a href=\"https://github.com/wallabag/wallabag/issues\">sur GitHub</a>"
    helping:
        description: "wallabag est gratuit et opensource. Vous pouvez nous aider :"
        by_contributing: "en contribuant au projet :"
@@ -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"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index d679ef00..eecd7882 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -229,7 +229,7 @@ about:
    getting_help:
        documentation: 'Documentazione'
        bug_reports: 'Bug reports'
-        support: '<a href="https://support.wallabag.org">Sul nostro sito di supporto</a> o <a href="https://github.com/wallabag/wallabag/issues">su GitHub</a>'
+        support: '<a href="https://github.com/wallabag/wallabag/issues">su GitHub</a>'
    helping:
        description: 'wallabag è gratuito opensource. Puoi aiutarci:'
        by_contributing: 'per contribuire al progetto:'
@@ -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'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index af0fba0d..7fa31bce 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -229,7 +229,7 @@ about:
    getting_help:
        documentation: 'Documentacion'
        bug_reports: 'Rapòrt de bugs'
-        support: "<a href=\"https://support.wallabag.org\">Sus nòstre site d'assisténcia</a> ou <a href=\"https://github.com/wallabag/wallabag/issues\">sur GitHub</a>"
+        support: "<a href=\"https://github.com/wallabag/wallabag/issues\">sur GitHub</a>"
    helping:
        description: 'wallabag es a gratuit e opensource. Nos podètz ajudar :'
        by_contributing: 'en ajudant lo projècte :'
@@ -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'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index bf47b58a..1b00fc6d 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -229,7 +229,7 @@ about:
    getting_help:
        documentation: 'Dokumentacja'
        bug_reports: 'Raportuj błędy'
-        support: '<a href="https://support.wallabag.org">Na naszej stronie wsparcia technicznego</a> lub <a href="https://github.com/wallabag/wallabag/issues">na GitHubie</a>'
+        support: '<a href="https://github.com/wallabag/wallabag/issues">na GitHubie</a>'
    helping:
        description: 'wallabag jest darmowy i otwartoźródłowy. Możesz nam pomóc:'
        by_contributing: 'przez przyłączenie się do projektu:'
@@ -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'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index f10dc9aa..54316161 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -229,7 +229,7 @@ about:
    getting_help:
        documentation: 'Documentação'
        bug_reports: 'Informar bugs'
-        support: '<a href="https://support.wallabag.org">Em nosso site de suporte</a> ou <a href="https://github.com/wallabag/wallabag/issues">no GitHub</a>'
+        support: '<a href="https://github.com/wallabag/wallabag/issues">no GitHub</a>'
    helping:
        description: 'wallabag é livre e software livre. Você pode nos ajudar:'
        by_contributing: 'contribuindo com o projeto:'
@@ -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'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 875c82e8..65cedfb2 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -229,7 +229,7 @@ about:
    getting_help:
        documentation: 'Documentație'
        bug_reports: 'Bug-uri'
-        support: '<a href="https://support.wallabag.org">Pe site-ul nostru de suport</a> sau <a href="https://github.com/wallabag/wallabag/issues">pe GitHub</a>'
+        support: '<a href="https://github.com/wallabag/wallabag/issues">pe GitHub</a>'
    helping:
        description: 'wallabag este gratis și Open-Source. Cum ne poți ajuta:'
        by_contributing: 'contribuind la proiect:'
@@ -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ă'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index f50f629a..73fb6fce 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -228,7 +228,7 @@ about:
    getting_help:
        documentation: 'Dokümantasyon'
        bug_reports: 'Sorun bildir'
-        support: '<a href="https://support.wallabag.org">Destek internet sitesinde</a> ya da <a href="https://github.com/wallabag/wallabag/issues">GitHub üzerinde</a>'
+        support: '<a href="https://github.com/wallabag/wallabag/issues">GitHub üzerinde</a>'
    helping:
        description: 'wallabag açık kaynak kodlu ve ücretsizdir. Bize destek ol :'
        by_contributing: 'projemize katkıda bulunun :'
@@ -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'