From 4de4f682f7e5949545402921412ebad3296c1ddb Mon Sep 17 00:00:00 2001
From: Romain Neutron <imprec@gmail.com>
Date: Tue, 26 Nov 2013 18:59:35 +0100
Subject: [PATCH] Move locales to resources folder

---
 lib/Alchemy/Phrasea/Application.php                   | 11 ++++++-----
 .../phraseanet.po => resources/locales/messages.ar.po |  0
 .../phraseanet.po => resources/locales/messages.de.po |  0
 .../phraseanet.po => resources/locales/messages.en.po |  0
 .../phraseanet.po => resources/locales/messages.es.po |  0
 .../phraseanet.po => resources/locales/messages.fr.po |  0
 .../phraseanet.po => resources/locales/messages.nl.po |  0
 7 files changed, 6 insertions(+), 5 deletions(-)
 rename locale/ar_SA/LC_MESSAGES/phraseanet.po => resources/locales/messages.ar.po (100%)
 rename locale/de_DE/LC_MESSAGES/phraseanet.po => resources/locales/messages.de.po (100%)
 rename locale/en_GB/LC_MESSAGES/phraseanet.po => resources/locales/messages.en.po (100%)
 rename locale/es_ES/LC_MESSAGES/phraseanet.po => resources/locales/messages.es.po (100%)
 rename locale/fr_FR/LC_MESSAGES/phraseanet.po => resources/locales/messages.fr.po (100%)
 rename locale/nl_NL/LC_MESSAGES/phraseanet.po => resources/locales/messages.nl.po (100%)

diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php
index 5a305d5680..4b42e49ed1 100644
--- a/lib/Alchemy/Phrasea/Application.php
+++ b/lib/Alchemy/Phrasea/Application.php
@@ -137,6 +137,7 @@ use Silex\Provider\ValidatorServiceProvider;
 use Silex\Provider\ServiceControllerServiceProvider;
 use Symfony\Bridge\Twig\Extension\TranslationExtension;
 use Symfony\Component\Translation\Loader\MoFileLoader;
+use Symfony\Component\Translation\Translator;
 use Unoconv\UnoconvServiceProvider;
 use XPDF\PdfToText;
 use XPDF\XPDFServiceProvider;
@@ -310,12 +311,12 @@ class Application extends SilexApplication
             'locale_fallbacks' => ['fr_FR'],
         ]);
 
-        $this['translator'] = $this->share($this->extend('translator', function($translator, $app) {
+        $this['translator'] = $this->share($this->extend('translator', function(Translator $translator, $app) {
             $translator->addLoader('mo', new MoFileLoader());
-            $translator->addResource('mo', __DIR__.'/../../../locale/fr_FR/LC_MESSAGES/phraseanet.mo', 'fr_FR');
-            $translator->addResource('mo', __DIR__.'/../../../locale/en_GB/LC_MESSAGES/phraseanet.mo', 'en_GB');
-            $translator->addResource('mo', __DIR__.'/../../../locale/de_DE/LC_MESSAGES/phraseanet.mo', 'de_DE');
-            $translator->addResource('mo', __DIR__.'/../../../locale/nl_NL/LC_MESSAGES/phraseanet.mo', 'nl_NL');
+            $translator->addResource('mo', __DIR__.'/../../../resources/locales/messages.fr.mo', 'fr_FR', 'messages');
+            $translator->addResource('mo', __DIR__.'/../../../resources/locales/messages.en.mo', 'en_GB', 'messages');
+            $translator->addResource('mo', __DIR__.'/../../../resources/locales/messages.de.mo', 'de_DE', 'messages');
+            $translator->addResource('mo', __DIR__.'/../../../resources/locales/messages.nl.mo', 'nl_NL', 'messages');
 
             return $translator;
         }));
diff --git a/locale/ar_SA/LC_MESSAGES/phraseanet.po b/resources/locales/messages.ar.po
similarity index 100%
rename from locale/ar_SA/LC_MESSAGES/phraseanet.po
rename to resources/locales/messages.ar.po
diff --git a/locale/de_DE/LC_MESSAGES/phraseanet.po b/resources/locales/messages.de.po
similarity index 100%
rename from locale/de_DE/LC_MESSAGES/phraseanet.po
rename to resources/locales/messages.de.po
diff --git a/locale/en_GB/LC_MESSAGES/phraseanet.po b/resources/locales/messages.en.po
similarity index 100%
rename from locale/en_GB/LC_MESSAGES/phraseanet.po
rename to resources/locales/messages.en.po
diff --git a/locale/es_ES/LC_MESSAGES/phraseanet.po b/resources/locales/messages.es.po
similarity index 100%
rename from locale/es_ES/LC_MESSAGES/phraseanet.po
rename to resources/locales/messages.es.po
diff --git a/locale/fr_FR/LC_MESSAGES/phraseanet.po b/resources/locales/messages.fr.po
similarity index 100%
rename from locale/fr_FR/LC_MESSAGES/phraseanet.po
rename to resources/locales/messages.fr.po
diff --git a/locale/nl_NL/LC_MESSAGES/phraseanet.po b/resources/locales/messages.nl.po
similarity index 100%
rename from locale/nl_NL/LC_MESSAGES/phraseanet.po
rename to resources/locales/messages.nl.po