From 91010d1607f5a974a9b8de1af7d4d6b355a68e47 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Wed, 22 Jul 2015 16:05:24 +0930
Subject: [PATCH] Move locale files

---
 framework/core/locale/{en/config.js => en.js}         | 0
 framework/core/locale/{en/config.php => en.php}       | 0
 framework/core/locale/{en/translations.yml => en.yml} | 0
 framework/core/src/Locale/LocaleServiceProvider.php   | 8 ++++----
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename framework/core/locale/{en/config.js => en.js} (100%)
 rename framework/core/locale/{en/config.php => en.php} (100%)
 rename framework/core/locale/{en/translations.yml => en.yml} (100%)

diff --git a/framework/core/locale/en/config.js b/framework/core/locale/en.js
similarity index 100%
rename from framework/core/locale/en/config.js
rename to framework/core/locale/en.js
diff --git a/framework/core/locale/en/config.php b/framework/core/locale/en.php
similarity index 100%
rename from framework/core/locale/en/config.php
rename to framework/core/locale/en.php
diff --git a/framework/core/locale/en/translations.yml b/framework/core/locale/en.yml
similarity index 100%
rename from framework/core/locale/en/translations.yml
rename to framework/core/locale/en.yml
diff --git a/framework/core/src/Locale/LocaleServiceProvider.php b/framework/core/src/Locale/LocaleServiceProvider.php
index 0ce07488e..510e50413 100644
--- a/framework/core/src/Locale/LocaleServiceProvider.php
+++ b/framework/core/src/Locale/LocaleServiceProvider.php
@@ -21,11 +21,11 @@ class LocaleServiceProvider extends ServiceProvider
 
     public function registerLocale(LocaleManager $manager, $locale)
     {
-        $dir = __DIR__.'/../../locale/'.$locale;
+        $path = __DIR__.'/../../locale/'.$locale;
 
-        $manager->addTranslations($locale, $dir.'/translations.yml');
-        $manager->addConfig($locale, $dir.'/config.php');
-        $manager->addJsFile($locale, $dir.'/config.js');
+        $manager->addTranslations($locale, $path.'.yml');
+        $manager->addConfig($locale, $path.'.php');
+        $manager->addJsFile($locale, $path.'.js');
     }
 
     public function register()