Update default ignored folders. Update search path. Merge config from…

… base file.
PhiloNL · Feb 2, 2015 · 62fa20c · 62fa20c
1 parent fc1f534
commit 62fa20c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/Philo/Translate/TranslateManager.php b/src/Philo/Translate/TranslateManager.php
@@ -153,7 +153,7 @@ public function getTranslationVariables($line)
 	 */
 	public function findLineCount($group, $line)
 	{
-		return App::make('Finder')->files()->name('*.php')->in(app_path())->exclude($this->getIgnoredFolders())->contains("$group.$line")->count();
+		return App::make('Finder')->files()->name('*.php')->in(base_path())->exclude($this->getIgnoredFolders())->contains("$group.$line")->count();
 	}
 
 	/**
@@ -328,7 +328,7 @@ protected function getLanguagePath()
 	 */
 	protected function getIgnoredFiles()
 	{
-		return Config::get('translate::search_exclude_files');
+		return Config::get('translate.search_exclude_files');
 	}
 
 	/**
@@ -337,7 +337,7 @@ protected function getIgnoredFiles()
 	 */
 	protected function getIgnoredFolders()
 	{
-		return Config::get('translate::search_ignore_folders');
+		return Config::get('translate.search_ignore_folders');
 	}
 
 	/**
@@ -346,7 +346,7 @@ protected function getIgnoredFolders()
 	 */
 	protected function getDiggFolders()
 	{
-		return Config::get('translate::digg_folders');
+		return Config::get('translate.digg_folders');
 	}
 
 }
diff --git a/src/Philo/Translate/TranslateServiceProvider.php b/src/Philo/Translate/TranslateServiceProvider.php
@@ -22,6 +22,10 @@ public function boot()
 			__DIR__.'/config.php' => config_path('translate.php'),
 		]);
 
+		$this->mergeConfigFrom(
+			__DIR__.'/config.php', 'translate'
+		);
+
 		$this->app->bind('Finder', function($app)
 		{
 			return new \Symfony\Component\Finder\Finder();

diff --git a/src/Philo/Translate/config.php b/src/Philo/Translate/config.php
@@ -1,7 +1,7 @@
 <?php
 
 return array(
-	'search_ignore_folders' => array('commands', 'config', 'database', 'lang', 'start', 'storage', 'tests'),
-	'search_exclude_files'  => array('pagination', 'reminders', 'validation'),
+	'search_ignore_folders' => array('bootstrap', 'config', 'database', 'public', 'storage', 'tests', 'vendor'),
+	'search_exclude_files'  => array('pagination', 'passwords', 'validation'),
 	'digg_folders'          => array('app/models', 'app/views', 'app/controllers'),
 );