diff options
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/ConfigController.php | 18 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 26 | ||||
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/TagController.php | 2 |
3 files changed, 28 insertions, 18 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index d24066b3..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'); |
@@ -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'); |
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 0fae3a0f..1a0b80ac 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -55,7 +55,7 @@ class EntryController extends Controller | |||
55 | if (false !== $existingEntry) { | 55 | if (false !== $existingEntry) { |
56 | $this->get('session')->getFlashBag()->add( | 56 | $this->get('session')->getFlashBag()->add( |
57 | 'notice', | 57 | 'notice', |
58 | 'Entry already saved on '.$existingEntry->getCreatedAt()->format('d-m-Y') | 58 | $this->get('translator')->trans('flashes.entry.notice.entry_already_saved', array('%date%' => $existingEntry->getCreatedAt()->format('d-m-Y'))) |
59 | ); | 59 | ); |
60 | 60 | ||
61 | return $this->redirect($this->generateUrl('view', array('id' => $existingEntry->getId()))); | 61 | return $this->redirect($this->generateUrl('view', array('id' => $existingEntry->getId()))); |
@@ -64,7 +64,7 @@ class EntryController extends Controller | |||
64 | $this->updateEntry($entry); | 64 | $this->updateEntry($entry); |
65 | $this->get('session')->getFlashBag()->add( | 65 | $this->get('session')->getFlashBag()->add( |
66 | 'notice', | 66 | 'notice', |
67 | 'Entry saved' | 67 | 'flashes.entry.notice.entry_saved' |
68 | ); | 68 | ); |
69 | 69 | ||
70 | return $this->redirect($this->generateUrl('homepage')); | 70 | return $this->redirect($this->generateUrl('homepage')); |
@@ -128,7 +128,7 @@ class EntryController extends Controller | |||
128 | 128 | ||
129 | $this->get('session')->getFlashBag()->add( | 129 | $this->get('session')->getFlashBag()->add( |
130 | 'notice', | 130 | 'notice', |
131 | 'Entry updated' | 131 | 'flashes.entry.notice.entry_updated' |
132 | ); | 132 | ); |
133 | 133 | ||
134 | return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); | 134 | return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); |
@@ -304,9 +304,9 @@ class EntryController extends Controller | |||
304 | { | 304 | { |
305 | $this->checkUserAction($entry); | 305 | $this->checkUserAction($entry); |
306 | 306 | ||
307 | $message = 'Entry reloaded'; | 307 | $message = 'flashes.entry.notice.entry_reloaded'; |
308 | if (false === $this->updateEntry($entry)) { | 308 | if (false === $this->updateEntry($entry)) { |
309 | $message = 'Failed to reload entry'; | 309 | $message = 'flashes.entry.notice.entry_reload_failed'; |
310 | } | 310 | } |
311 | 311 | ||
312 | $this->get('session')->getFlashBag()->add( | 312 | $this->get('session')->getFlashBag()->add( |
@@ -334,9 +334,14 @@ class EntryController extends Controller | |||
334 | $entry->toggleArchive(); | 334 | $entry->toggleArchive(); |
335 | $this->getDoctrine()->getManager()->flush(); | 335 | $this->getDoctrine()->getManager()->flush(); |
336 | 336 | ||
337 | $message = 'flashes.entry.notice.entry_unarchived'; | ||
338 | if ($entry->isArchived()) { | ||
339 | $message = 'flashes.entry.notice.entry_archived'; | ||
340 | } | ||
341 | |||
337 | $this->get('session')->getFlashBag()->add( | 342 | $this->get('session')->getFlashBag()->add( |
338 | 'notice', | 343 | 'notice', |
339 | 'Entry '.($entry->isArchived() ? 'archived' : 'unarchived') | 344 | $message |
340 | ); | 345 | ); |
341 | 346 | ||
342 | return $this->redirect($request->headers->get('referer')); | 347 | return $this->redirect($request->headers->get('referer')); |
@@ -359,9 +364,14 @@ class EntryController extends Controller | |||
359 | $entry->toggleStar(); | 364 | $entry->toggleStar(); |
360 | $this->getDoctrine()->getManager()->flush(); | 365 | $this->getDoctrine()->getManager()->flush(); |
361 | 366 | ||
367 | $message = 'flashes.entry.notice.entry_unstarred'; | ||
368 | if ($entry->isStarred()) { | ||
369 | $message = 'flashes.entry.notice.entry_starred'; | ||
370 | } | ||
371 | |||
362 | $this->get('session')->getFlashBag()->add( | 372 | $this->get('session')->getFlashBag()->add( |
363 | 'notice', | 373 | 'notice', |
364 | 'Entry '.($entry->isStarred() ? 'starred' : 'unstarred') | 374 | $message |
365 | ); | 375 | ); |
366 | 376 | ||
367 | return $this->redirect($request->headers->get('referer')); | 377 | return $this->redirect($request->headers->get('referer')); |
@@ -394,7 +404,7 @@ class EntryController extends Controller | |||
394 | 404 | ||
395 | $this->get('session')->getFlashBag()->add( | 405 | $this->get('session')->getFlashBag()->add( |
396 | 'notice', | 406 | 'notice', |
397 | 'Entry deleted' | 407 | 'flashes.entry.notice.entry_deleted' |
398 | ); | 408 | ); |
399 | 409 | ||
400 | // don't redirect user to the deleted entry | 410 | // don't redirect user to the deleted entry |
diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php index 7b34939d..56e5195c 100644 --- a/src/Wallabag/CoreBundle/Controller/TagController.php +++ b/src/Wallabag/CoreBundle/Controller/TagController.php | |||
@@ -43,7 +43,7 @@ class TagController extends Controller | |||
43 | 43 | ||
44 | $this->get('session')->getFlashBag()->add( | 44 | $this->get('session')->getFlashBag()->add( |
45 | 'notice', | 45 | 'notice', |
46 | 'Tag added' | 46 | 'flashes.tag.notice.tag_added' |
47 | ); | 47 | ); |
48 | 48 | ||
49 | return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); | 49 | return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); |