diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/ConfigController.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/ConfigController.php | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 1930a2ae..779be268 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -45,7 +45,7 @@ class ConfigController extends Controller | |||
45 | 45 | ||
46 | $this->get('session')->getFlashBag()->add( | 46 | $this->get('session')->getFlashBag()->add( |
47 | 'notice', | 47 | 'notice', |
48 | 'Config saved. Some parameters will be considered after disconnection.' | 48 | 'flashes.config.notice.config_saved' |
49 | ); | 49 | ); |
50 | 50 | ||
51 | return $this->redirect($this->generateUrl('config')); | 51 | return $this->redirect($this->generateUrl('config')); |
@@ -57,9 +57,9 @@ class ConfigController extends Controller | |||
57 | 57 | ||
58 | if ($pwdForm->isValid()) { | 58 | if ($pwdForm->isValid()) { |
59 | if ($this->get('craue_config')->get('demo_mode_enabled') && $this->get('craue_config')->get('demo_mode_username') === $user->getUsername()) { | 59 | if ($this->get('craue_config')->get('demo_mode_enabled') && $this->get('craue_config')->get('demo_mode_username') === $user->getUsername()) { |
60 | $message = 'In demonstration mode, you can\'t change password for this user.'; | 60 | $message = 'flashes.config.notice.password_not_updated_demo'; |
61 | } else { | 61 | } else { |
62 | $message = 'Password updated'; | 62 | $message = 'flashes.config.notice.password_updated'; |
63 | 63 | ||
64 | $user->setPlainPassword($pwdForm->get('new_password')->getData()); | 64 | $user->setPlainPassword($pwdForm->get('new_password')->getData()); |
65 | $userManager->updateUser($user, true); | 65 | $userManager->updateUser($user, true); |
@@ -82,7 +82,7 @@ class ConfigController extends Controller | |||
82 | 82 | ||
83 | $this->get('session')->getFlashBag()->add( | 83 | $this->get('session')->getFlashBag()->add( |
84 | 'notice', | 84 | 'notice', |
85 | 'Information updated' | 85 | 'flashes.config.notice.user_updated' |
86 | ); | 86 | ); |
87 | 87 | ||
88 | return $this->redirect($this->generateUrl('config').'#set3'); | 88 | return $this->redirect($this->generateUrl('config').'#set3'); |
@@ -98,7 +98,7 @@ class ConfigController extends Controller | |||
98 | 98 | ||
99 | $this->get('session')->getFlashBag()->add( | 99 | $this->get('session')->getFlashBag()->add( |
100 | 'notice', | 100 | 'notice', |
101 | 'RSS information updated' | 101 | 'flashes.config.notice.rss_updated' |
102 | ); | 102 | ); |
103 | 103 | ||
104 | return $this->redirect($this->generateUrl('config').'#set2'); | 104 | return $this->redirect($this->generateUrl('config').'#set2'); |
@@ -116,7 +116,7 @@ class ConfigController extends Controller | |||
116 | 116 | ||
117 | $this->get('session')->getFlashBag()->add( | 117 | $this->get('session')->getFlashBag()->add( |
118 | 'notice', | 118 | 'notice', |
119 | 'Tagging rules updated' | 119 | 'flashes.config.notice.tagging_rules_updated' |
120 | ); | 120 | ); |
121 | 121 | ||
122 | return $this->redirect($this->generateUrl('config').'#set5'); | 122 | return $this->redirect($this->generateUrl('config').'#set5'); |
@@ -147,7 +147,7 @@ class ConfigController extends Controller | |||
147 | 147 | ||
148 | $this->get('session')->getFlashBag()->add( | 148 | $this->get('session')->getFlashBag()->add( |
149 | 'notice', | 149 | 'notice', |
150 | $this->get('translator')->trans('User "%username%" added', array('%username%' => $newUser->getUsername())) | 150 | $this->get('translator')->trans('flashes.config.notice.user_added', array('%username%' => $newUser->getUsername())) |
151 | ); | 151 | ); |
152 | 152 | ||
153 | return $this->redirect($this->generateUrl('config').'#set6'); | 153 | return $this->redirect($this->generateUrl('config').'#set6'); |
@@ -192,7 +192,7 @@ class ConfigController extends Controller | |||
192 | 192 | ||
193 | $this->get('session')->getFlashBag()->add( | 193 | $this->get('session')->getFlashBag()->add( |
194 | 'notice', | 194 | 'notice', |
195 | 'RSS token updated' | 195 | 'flashes.config.notice.rss_token_updated' |
196 | ); | 196 | ); |
197 | 197 | ||
198 | return $this->redirect($this->generateUrl('config').'#set2'); | 198 | return $this->redirect($this->generateUrl('config').'#set2'); |
@@ -210,7 +210,7 @@ class ConfigController extends Controller | |||
210 | public function deleteTaggingRuleAction(TaggingRule $rule) | 210 | public function deleteTaggingRuleAction(TaggingRule $rule) |
211 | { | 211 | { |
212 | if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) { | 212 | if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) { |
213 | throw $this->createAccessDeniedException('You can not access this tagging ryle.'); | 213 | throw $this->createAccessDeniedException('You can not access this tagging rule.'); |
214 | } | 214 | } |
215 | 215 | ||
216 | $em = $this->getDoctrine()->getManager(); | 216 | $em = $this->getDoctrine()->getManager(); |
@@ -219,7 +219,7 @@ class ConfigController extends Controller | |||
219 | 219 | ||
220 | $this->get('session')->getFlashBag()->add( | 220 | $this->get('session')->getFlashBag()->add( |
221 | 'notice', | 221 | 'notice', |
222 | 'Tagging rule deleted' | 222 | 'flashes.config.notice.tagging_rules_deleted' |
223 | ); | 223 | ); |
224 | 224 | ||
225 | return $this->redirect($this->generateUrl('config').'#set5'); | 225 | return $this->redirect($this->generateUrl('config').'#set5'); |