diff options
author | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-03-21 12:47:57 +0100 |
---|---|---|
committer | Nicolas LÅ“uillet <nicolas@loeuillet.org> | 2016-03-21 12:47:57 +0100 |
commit | 439b36323e37f669b056cc5228c44bb91196256c (patch) | |
tree | ecd84477adf3e12819b26aff2a6d2e644e45ea72 /src/Wallabag/CoreBundle/Controller/EntryController.php | |
parent | bd46de6b25f982e1a0d3f975971fe8014db13833 (diff) | |
parent | 4083887afe4dd3f568b2dfea3392506b554c79b8 (diff) | |
download | wallabag-439b36323e37f669b056cc5228c44bb91196256c.tar.gz wallabag-439b36323e37f669b056cc5228c44bb91196256c.tar.zst wallabag-439b36323e37f669b056cc5228c44bb91196256c.zip |
Merge pull request #1774 from wallabag/v2-key-translation
Switch to keys in translated files
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/EntryController.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/EntryController.php | 26 |
1 files changed, 18 insertions, 8 deletions
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 |