X-Git-Url: https://git.rapsys.eu/.gitweb.cgi/airbundle/blobdiff_plain/b15c9995f718bb2b82a7d0487d6922ddb4cf2e2b..741cdfe32a8529ef11e24ddccafd0013289c56e5:/Controller/DefaultController.php?ds=sidebyside

diff --git a/Controller/DefaultController.php b/Controller/DefaultController.php
index 4c81688..54250c9 100644
--- a/Controller/DefaultController.php
+++ b/Controller/DefaultController.php
@@ -104,7 +104,7 @@ class DefaultController extends AbstractController {
 		//Create the form according to the FormType created previously.
 		//And give the proper parameters
 		$form = $this->factory->create('Rapsys\AirBundle\Form\ContactType', $data, [
-			'action' => $this->generateUrl('rapsys_air_contact'),
+			'action' => $this->generateUrl('rapsysair_contact'),
 			'method' => 'POST'
 		]);
 
@@ -395,7 +395,7 @@ class DefaultController extends AbstractController {
 			$this->context['title']['page'] = $this->translator->trans('Libre Air user list');
 
 			//Set section
-			$this->context['title']['section'] = $this->translator->trans('Users');
+			$this->context['title']['section'] = $this->translator->trans('User');
 
 			//Set description
 			$this->context['description'] = $this->translator->trans('Lists Libre air users');
@@ -405,7 +405,7 @@ class DefaultController extends AbstractController {
 			$this->context['title']['page'] = $this->translator->trans('Libre Air organizer list');
 
 			//Set section
-			$this->context['title']['section'] = $this->translator->trans('Organizers');
+			$this->context['title']['section'] = $this->translator->trans('Organizer');
 
 			//Set description
 			$this->context['description'] = $this->translator->trans('Lists Libre air organizers');
@@ -465,7 +465,7 @@ class DefaultController extends AbstractController {
 		//With invalid user slug
 		if ($this->context['user']['slug'] !== $user) {
 			//Redirect to cleaned url
-			return $this->redirectToRoute('rapsys_air_user_view', ['id' => $id, 'user' => $this->context['user']['slug']]);
+			return $this->redirectToRoute('rapsysair_user_view', ['id' => $id, 'user' => $this->context['user']['slug']]);
 		}
 
 		//Fetch calendar
@@ -599,7 +599,7 @@ class DefaultController extends AbstractController {
 		$this->context['title']['page'] = $this->translator->trans('%pseudonym% organizer', ['%pseudonym%' => $this->context['user']['pseudonym']]);
 
 		//Set section
-		$this->context['title']['section'] = $this->translator->trans('Users');
+		$this->context['title']['section'] = $this->translator->trans('User');
 
 		//With locations
 		if (!empty($locations)) {
@@ -635,16 +635,7 @@ class DefaultController extends AbstractController {
 				//Without existing snippet
 				} else {
 					//Init snippet
-					$current = new Snippet();
-
-					//Set default locale
-					$current->setLocale($this->locale);
-
-					//Set default user
-					$current->setUser($user);
-
-					//Set default location
-					$current->setLocation($this->doctrine->getRepository(Location::class)->findOneById($location['id']));
+					$current = new Snippet($this->locale, $this->doctrine->getRepository(Location::class)->findOneById($location['id']), $user);
 				}
 
 				//Create SnippetType form
@@ -676,7 +667,7 @@ class DefaultController extends AbstractController {
 					$this->addFlash('notice', $this->translator->trans('Snippet for %user% %location% updated', ['%location%' => $location['at'], '%user%' => $this->context['user']['pseudonym']]));
 
 					//Redirect to cleaned url
-					return $this->redirectToRoute('rapsys_air_user_view', ['id' => $id, 'user' => $this->context['user']['slug']]);
+					return $this->redirectToRoute('rapsysair_user_view', ['id' => $id, 'user' => $this->context['user']['slug']]);
 				}
 
 				//Add form to context
@@ -727,7 +718,7 @@ class DefaultController extends AbstractController {
 							$this->addFlash('notice', $this->translator->trans('Image for %user% %location% deleted', ['%location%' => $location['at'], '%user%' => $this->context['user']['pseudonym']]));
 
 							//Redirect to cleaned url
-							return $this->redirectToRoute('rapsys_air_user_view', ['id' => $id, 'user' => $this->context['user']['slug']]);
+							return $this->redirectToRoute('rapsysair_user_view', ['id' => $id, 'user' => $this->context['user']['slug']]);
 						}
 					}
 
@@ -767,7 +758,7 @@ class DefaultController extends AbstractController {
 						$this->addFlash('notice', $this->translator->trans('Image for %user% %location% updated', ['%location%' => $location['at'], '%user%' => $this->context['user']['pseudonym']]));
 
 						//Redirect to cleaned url
-						return $this->redirectToRoute('rapsys_air_user_view', ['id' => $id, 'user' => $this->context['user']['slug']]);
+						return $this->redirectToRoute('rapsysair_user_view', ['id' => $id, 'user' => $this->context['user']['slug']]);
 					}
 				}