Translation : Ordering existing translations by keys. This should ease the merge process when conflicts occur

Fixed issue #123. Introduced NumberFormat::formatStandardNumber()

Adding translation for Backoffice

Adding translation for Backoffice

fix close #131

fix updatePositionDownTest

Translation : Ordering existing translations by keys. This should ease the merge process when conflicts occur

Translation : Ordering existing translations by keys, This should ease the merge process when conflicts occur

Translation : Ordering existing translations by keys, This should ease the merge process when conflicts occur

core/lib/Thelia/Tests/Action/FolderTest.php

@@ -162,14 +162,19 @@ class FolderTest extends BaseAction
 
     public function testUpdatePositionDown()
     {
-        $folder = FolderQuery::create()
-            ->filterByPosition(1)
+        $nextFolder = FolderQuery::create()
+            ->filterByPosition(2)
             ->findOne();
 
-        if (null === $folder) {
+        if (null === $nextFolder) {
             $this->fail('use fixtures before launching test, there is no folder in database');
         }
 
+        $folder = FolderQuery::create()
+            ->filterByPosition(1)
+            ->filterByParent($nextFolder->getParent())
+            ->findOne();
+
         $newPosition = $folder->getPosition()+1;
 
         $event = new UpdatePositionEvent($folder->getId(), UpdatePositionEvent::POSITION_DOWN);