Merge branch 'master' of https://github.com/thelia/thelia into coupon

# By Manuel Raynaud (8) and franck (2)
# Via franck
* 'master' of https://github.com/thelia/thelia:
  en_EN -> en_UK, the "en_EN" locale does not exists.
  Smarty inheritance in admin template.
  fix typo in phpdoc
  complete test for foramt_number smarty function
  test foramt_date without datetime object
  create foramt_number smarty function
  remove sqlmap file
  add some phpdoc
  complete test for format_date smarty function
  create new smarty function for displaying date in expected format

Conflicts:
	reset_install.sh

core/lib/Thelia/Config/Resources/action.xml

@@ -32,12 +32,17 @@
             <tag name="kernel.event_subscriber"/>
         </service>
 
-        <service id="thelia.action.category" class="Thelia\Action\Config">
+        <service id="thelia.action.config" class="Thelia\Action\Config">
             <argument type="service" id="service_container"/>
             <tag name="kernel.event_subscriber"/>
         </service>
 
-        <service id="thelia.action.messages" class="Thelia\Action\Message">
+        <service id="thelia.action.message" class="Thelia\Action\Message">
+            <argument type="service" id="service_container"/>
+            <tag name="kernel.event_subscriber"/>
+        </service>
+
+        <service id="thelia.action.currency" class="Thelia\Action\Currency">
             <argument type="service" id="service_container"/>
             <tag name="kernel.event_subscriber"/>
         </service>

core/lib/Thelia/Config/Resources/config.xml

@@ -54,6 +54,11 @@
 
         <form name="thelia.admin.message.creation" class="Thelia\Form\MessageCreationForm"/>
         <form name="thelia.admin.message.modification" class="Thelia\Form\MessageModificationForm"/>
+
+        <form name="thelia.admin.currency.creation" class="Thelia\Form\CurrencyCreationForm"/>
+        <form name="thelia.admin.currency.modification" class="Thelia\Form\CurrencyModificationForm"/>
+
+        <form name="thelia.admin.coupon.creation" class="Thelia\Form\CouponCreationForm"/>
     </forms>
 
 
@@ -122,6 +127,11 @@
             <tag name="thelia.parser.register_plugin"/>
         </service>
 
+        <service id="smarty.plugin.format" class="Thelia\Core\Template\Smarty\Plugins\Format" scope="request">
+            <argument type="service" id="request"/>
+            <tag name="thelia.parser.register_plugin"/>
+        </service>
+
         <service id="smarty.plugin.thelialoop" class="Thelia\Core\Template\Smarty\Plugins\TheliaLoop" scope="request">
             <tag name="thelia.parser.register_plugin"/>
 

core/lib/Thelia/Config/Resources/routing/admin.xml

@@ -47,18 +47,15 @@
 
     <!-- Route to the Coupon controller (process Coupon browsing) -->
     <route id="admin.coupon.list" path="/admin/coupon">
-        <default key="_controller">Thelia\Controller\Admin\CouponController::processAction</default>
-        <default key="action">browse</default>
+        <default key="_controller">Thelia\Controller\Admin\CouponController::browseAction</default>
     </route>
     <route id="admin.coupon.create" path="/admin/coupon/create">
-        <default key="_controller">Thelia\Controller\Admin\CouponController::processAction</default>
-        <default key="action">create</default>
+        <default key="_controller">Thelia\Controller\Admin\CouponController::createAction</default>
     </route>
-    <route id="admin.coupon.edit" path="/admin/coupon/edit/{id}">
-        <default key="_controller">Thelia\Controller\Admin\CouponController::processAction</default>
-        <default key="action">edit</default>
+    <route id="admin.coupon.edit" path="/admin/coupon/edit/{couponId}">
+        <default key="_controller">Thelia\Controller\Admin\CouponController::editAction</default>
     </route>
-    <route id="admin.coupon.read" path="/admin/coupon/read/{id}">
+    <route id="admin.coupon.read" path="/admin/coupon/read/{couponId}">
         <default key="_controller">Thelia\Controller\Admin\CouponController::readAction</default>
     </route>
 
@@ -115,6 +112,28 @@
         <default key="_controller">Thelia\Controller\Admin\MessageController::deleteAction</default>
     </route>
 
+    <!-- Routes to the Currencies controller -->
+
+    <route id="admin.configuration.currencies.default" path="/admin/configuration/currencies">
+        <default key="_controller">Thelia\Controller\Admin\CurrencyController::defaultAction</default>
+    </route>
+
+    <route id="admin.configuration.currencies.create" path="/admin/configuration/currencies/create">
+        <default key="_controller">Thelia\Controller\Admin\CurrencyController::createAction</default>
+    </route>
+
+    <route id="admin.configuration.currencies.change" path="/admin/configuration/currencies/change">
+        <default key="_controller">Thelia\Controller\Admin\CurrencyController::changeAction</default>
+    </route>
+
+    <route id="admin.configuration.currencies.save-change" path="/admin/configuration/currencies/save-change">
+        <default key="_controller">Thelia\Controller\Admin\CurrencyController::saveChangeAction</default>
+    </route>
+
+    <route id="admin.configuration.currencies.delete" path="/admin/configuration/currencies/delete">
+        <default key="_controller">Thelia\Controller\Admin\CurrencyController::deleteAction</default>
+    </route>
+
 	<!-- The default route, to display a template -->
 
     <route id="admin.processTemplate" path="/admin/{template}">