Merge branch 'Namoshek-make-texts-translateable'

mpociot · mpociot · commit f9a96e900a65 · 2018-07-08T21:18:28.000+02:00
diff --git a/src/Checks/AppKeyIsSet.php b/src/Checks/AppKeyIsSet.php
@@ -11,7 +11,7 @@ class AppKeyIsSet implements Check
      */
     public function name(array $config): string
     {
-        return 'App key is set';
+        return trans('self-diagnosis::checks.app_key_is_set.name');
     }
 
     /**
@@ -31,6 +31,6 @@ public function check(array $config): bool
      */
     public function message(array $config): string
     {
-        return 'The application key is not set. Call "php artisan key:generate" to create it.';
+        return trans('self-diagnosis::checks.app_key_is_set.message');
     }
 }
diff --git a/src/Checks/ComposerWithDevDependenciesIsUpToDate.php b/src/Checks/ComposerWithDevDependenciesIsUpToDate.php
@@ -26,7 +26,7 @@ public function __construct(Composer $composer)
      */
     public function name(array $config): string
     {
-        return 'Composer dependencies are up to date with the composer.lock file.';
+        return trans('self-diagnosis::checks.composer_with_dev_dependencies_is_up_to_date.name');
     }
 
     /**
@@ -48,6 +48,8 @@ public function check(array $config): bool
      */
     public function message(array $config): string
     {
-        return 'Your composer dependencies are not up to date. Call "composer install".' . $this->output;
+        return trans('self-diagnosis::checks.composer_with_dev_dependencies_is_up_to_date.message', [
+            'more' => $this->output,
+        ]);
     }
 }
diff --git a/src/Checks/ComposerWithoutDevDependenciesIsUpToDate.php b/src/Checks/ComposerWithoutDevDependenciesIsUpToDate.php
@@ -26,7 +26,7 @@ public function __construct(Composer $composer)
      */
     public function name(array $config): string
     {
-        return 'Composer dependencies (without dev) are up to date with the composer.lock file.';
+        return trans('self-diagnosis::checks.composer_without_dev_dependencies_is_up_to_date.name');
     }
 
     /**
@@ -48,6 +48,8 @@ public function check(array $config): bool
      */
     public function message(array $config): string
     {
-        return 'Your composer dependencies are not up to date. Call "composer install".' . $this->output;
+        return trans('self-diagnosis::checks.composer_without_dev_dependencies_is_up_to_date.message', [
+            'more' => $this->output,
+        ]);
     }
 }
diff --git a/src/Checks/ConfigurationIsCached.php b/src/Checks/ConfigurationIsCached.php
@@ -14,7 +14,7 @@ class ConfigurationIsCached implements Check
      */
     public function name(array $config): string
     {
-        return 'Configuration is cached';
+        return trans('self-diagnosis::checks.configuration_is_cached.name');
     }
 
     /**
@@ -34,6 +34,6 @@ public function check(array $config): bool
      */
     public function message(array $config): string
     {
-        return 'Your configuration files should be cached in production. Call "php artisan config:cache" to cache the configuration.';
+        return trans('self-diagnosis::checks.configuration_is_cached.message');
     }
 }
diff --git a/src/Checks/ConfigurationIsNotCached.php b/src/Checks/ConfigurationIsNotCached.php
@@ -14,7 +14,7 @@ class ConfigurationIsNotCached implements Check
      */
     public function name(array $config): string
     {
-        return 'Configuration is not cached';
+        return trans('self-diagnosis::checks.configuration_is_not_cached.name');
     }
 
     /**
@@ -34,6 +34,6 @@ public function check(array $config): bool
      */
     public function message(array $config): string
     {
-        return 'Your configuration files should not be cached during development. Call "php artisan config:clear" to clear the config cache.';
+        return trans('self-diagnosis::checks.configuration_is_not_cached.message');
     }
 }
diff --git a/src/Checks/CorrectPhpVersionIsInstalled.php b/src/Checks/CorrectPhpVersionIsInstalled.php
@@ -21,7 +21,7 @@ public function __construct(Filesystem $filesystem)
      */
     public function name(array $config): string
     {
-        return 'The correct PHP version is installed';
+        return trans('self-diagnosis::checks.correct_php_version_is_installed.name');
     }
 
     /**
@@ -43,7 +43,10 @@ public function check(array $config): bool
      */
     public function message(array $config): string
     {
-        return 'You do not have the required PHP version installed.'.PHP_EOL.'Required: '.$this->getRequiredPhpVersion().PHP_EOL.'Used: '.phpversion();
+        return trans('self-diagnosis::checks.correct_php_version_is_installed.message', [
+            'required' => $this->getRequiredPhpVersion(),
+            'used' => phpversion(),
+        ]);
     }
 
     /**
diff --git a/src/Checks/DatabaseCanBeAccessed.php b/src/Checks/DatabaseCanBeAccessed.php
@@ -15,7 +15,7 @@ class DatabaseCanBeAccessed implements Check
      */
     public function name(array $config): string
     {
-        return 'The database can be accessed';
+        return trans('self-diagnosis::checks.database_can_be_accessed.name');
     }
 
     /**
@@ -42,6 +42,8 @@ public function check(array $config): bool
      */
     public function message(array $config): string
     {
-        return 'The database can not be accessed: '.$this->message;
+        return trans('self-diagnosis::checks.database_can_be_accessed.message', [
+            'error' => $this->message,
+        ]);
     }
 }
diff --git a/src/Checks/DebugModeIsNotEnabled.php b/src/Checks/DebugModeIsNotEnabled.php
@@ -14,7 +14,7 @@ class DebugModeIsNotEnabled implements Check
      */
     public function name(array $config): string
     {
-        return 'Debug mode is not enabled';
+        return trans('self-diagnosis::checks.debug_mode_is_not_enabled.name');
     }
 
     /**
@@ -34,6 +34,6 @@ public function check(array $config): bool
      */
     public function message(array $config): string
     {
-        return 'You should not use debug mode in production. Set APP_DEBUG to false.';
+        return trans('self-diagnosis::checks.debug_mode_is_not_enabled.message');
     }
 }
diff --git a/src/Checks/DirectoriesHaveCorrectPermissions.php b/src/Checks/DirectoriesHaveCorrectPermissions.php
@@ -29,7 +29,7 @@ public function __construct(Filesystem $filesystem)
      */
     public function name(array $config): string
     {
-        return 'The directories have the correct permissions.';
+        return trans('self-diagnosis::checks.directories_have_correct_permissions.name');
     }
 
     /**
@@ -39,7 +39,9 @@ public function name(array $config): string
      */
     public function message(array $config): string
     {
-        return 'The following directories are not writable: '.PHP_EOL.$this->paths->implode(PHP_EOL);
+        return trans('self-diagnosis::checks.directories_have_correct_permissions.message', [
+            'directories' => $this->paths->implode(PHP_EOL),
+        ]);
     }
 
     /**
diff --git a/src/Checks/EnvFileExists.php b/src/Checks/EnvFileExists.php
@@ -22,7 +22,7 @@ public function __construct(Filesystem $filesystem)
      */
     public function name(array $config): string
     {
-        return 'The environment file exists';
+        return trans('self-diagnosis::checks.env_file_exists.name');
     }
 
     /**
@@ -42,6 +42,6 @@ public function check(array $config): bool
      */
     public function message(array $config): string
     {
-        return 'These .env file does not exist. Please copy your .env.example file as .env';
+        return trans('self-diagnosis::checks.env_file_exists.message');
     }
 }
diff --git a/src/Checks/ExampleEnvironmentVariablesAreSet.php b/src/Checks/ExampleEnvironmentVariablesAreSet.php
@@ -18,7 +18,7 @@ class ExampleEnvironmentVariablesAreSet implements Check
      */
     public function name(array $config): string
     {
-        return 'The example environment variables are set';
+        return trans('self-diagnosis::checks.example_environment_variables_are_set.name');
     }
 
     /**
@@ -47,6 +47,8 @@ public function check(array $config): bool
      */
     public function message(array $config): string
     {
-        return 'These example environment variables are missing in your .env file, but are defined in your .env.example: '.PHP_EOL.$this->envVariables->implode(PHP_EOL);
+        return trans('self-diagnosis::checks.example_environment_variables_are_set.message', [
+            'variables' => $this->envVariables->implode(PHP_EOL),
+        ]);
     }
 }
diff --git a/src/Checks/MigrationsAreUpToDate.php b/src/Checks/MigrationsAreUpToDate.php
@@ -15,7 +15,7 @@ class MigrationsAreUpToDate implements Check
      */
     public function name(array $config): string
     {
-        return 'The migrations are up to date';
+        return trans('self-diagnosis::checks.migrations_are_up_to_date.name');
     }
 
     /**
@@ -43,8 +43,10 @@ public function check(array $config): bool
     public function message(array $config): string
     {
         if ($this->databaseError !== null) {
-            return 'Unable to check for migrations: ' . $this->databaseError;
+            return trans('self-diagnosis::checks.migrations_are_up_to_date.message.unable_to_check', [
+                'reason' => $this->databaseError,
+            ]);
         }
-        return 'You need to update your migrations. Call "php artisan migrate".';
+        return trans('self-diagnosis::checks.migrations_are_up_to_date.message.need_to_migrate');
     }
 }
diff --git a/src/Checks/PhpExtensionsAreInstalled.php b/src/Checks/PhpExtensionsAreInstalled.php
@@ -28,7 +28,7 @@ public function __construct(Filesystem $filesystem)
      */
     public function name(array $config): string
     {
-        return 'The required PHP extensions are installed';
+        return trans('self-dianosis::checks.php_extensions_are_installed.name');
     }
 
     /**
@@ -38,7 +38,9 @@ public function name(array $config): string
      */
     public function message(array $config): string
     {
-        return 'The following extensions are missing: ' . PHP_EOL . $this->extensions->implode(PHP_EOL);
+        return trans('self-dianosis::checks.php_extensions_are_installed.message', [
+            'extensions' => $this->extensions->implode(PHP_EOL),
+        ]);
     }
 
     /**
diff --git a/src/Checks/RoutesAreCached.php b/src/Checks/RoutesAreCached.php
@@ -14,7 +14,7 @@ class RoutesAreCached implements Check
      */
     public function name(array $config): string
     {
-        return 'Routes are cached';
+        return trans('self-diagnosis::checks.routes_are_cached.name');
     }
 
     /**
@@ -34,6 +34,6 @@ public function check(array $config): bool
      */
     public function message(array $config): string
     {
-        return 'Your routes should be cached in production. Call "php artisan route:cache" to create the route cache.';
+        return trans('self-diagnosis::checks.routes_are_cached.message');
     }
 }
diff --git a/src/Checks/RoutesAreNotCached.php b/src/Checks/RoutesAreNotCached.php
@@ -14,7 +14,7 @@ class RoutesAreNotCached implements Check
      */
     public function name(array $config): string
     {
-        return 'Routes are not cached';
+        return trans('self-diagnosis::checks.routes_are_not_cached.name');
     }
 
     /**
@@ -34,6 +34,6 @@ public function check(array $config): bool
      */
     public function message(array $config): string
     {
-        return 'Your routes should not be cached during development. Call "php artisan route:clear" to clear the route cache.';
+        return trans('self-diagnosis::checks.routes_are_not_cached.message');
     }
 }
diff --git a/src/Checks/StorageDirectoryIsLinked.php b/src/Checks/StorageDirectoryIsLinked.php
@@ -21,7 +21,7 @@ public function __construct(Filesystem $filesystem)
      */
     public function name(array $config): string
     {
-        return 'The storage directory is linked.';
+        return trans('self-diagnosis::checks.storage_directory_is_linked.name');
     }
 
     /**
@@ -31,7 +31,7 @@ public function name(array $config): string
      */
     public function message(array $config): string
     {
-        return 'The storage directory is not linked. Use "php artisan storage:link"';
+        return trans('self-diagnosis::checks.storage_directory_is_linked.message');
     }
 
     /**
diff --git a/src/Checks/XDebugIsNotEnabled.php b/src/Checks/XDebugIsNotEnabled.php
@@ -13,7 +13,7 @@ class XDebugIsNotEnabled implements Check
      */
     public function name(array $config): string
     {
-        return 'The xdebug extension is not active.';
+        return trans('self-diagnosis::checks.xdebug_is_not_enabled.name');
     }
 
     /**
@@ -33,6 +33,6 @@ public function check(array $config): bool
      */
     public function message(array $config): string
     {
-        return 'You should not have the "xdebug" PHP extension activated in production.';
+        return trans('self-diagnosis::checks.xdebug_is_not_enabled.message');
     }
 }
diff --git a/src/SelfDiagnosisCommand.php b/src/SelfDiagnosisCommand.php
@@ -25,25 +25,25 @@ class SelfDiagnosisCommand extends Command
 
     public function handle()
     {
-        $this->runChecks(config('self-diagnosis.checks', []), 'Running Common Checks');
+        $this->runChecks(config('self-diagnosis.checks', []), trans('self-diagnosis::commands.self_diagnosis.common_checks'));
 
         $environmentChecks = config('self-diagnosis.environment_checks.' . app()->environment(), []);
         if (empty($environmentChecks) && array_key_exists(app()->environment(), config('self-diagnosis.environment_aliases'))) {
             $environment = config('self-diagnosis.environment_aliases.' . app()->environment());
             $environmentChecks = config('self-diagnosis.environment_checks.' . $environment, []);
         }
 
-        $this->runChecks($environmentChecks, 'Environment Specific Checks ('.app()->environment().')');
+        $this->runChecks($environmentChecks, trans('self-diagnosis::commands.self_diagnosis.environment_specific_checks', ['environment' => app()->environment()]));
 
         if (count($this->messages)) {
-            $this->output->writeln('The following checks failed:');
+            $this->output->writeln(trans('self-diagnosis::commands.self_diagnosis.failed_checks'));
 
             foreach ($this->messages as $message) {
                 $this->output->writeln('<fg=red>'.$message.'</fg=red>');
                 $this->output->writeln('');
             }
         } else {
-            $this->info('Good job, looks like you are all set up.');
+            $this->info(trans('self-diagnosis::commands.self_diagnosis.success'));
         }
     }
 
@@ -64,7 +64,11 @@ protected function runChecks(array $checks, string $title)
 
             $checkClass = app($check);
 
-            $this->output->write("<fg=yellow>Running check {$current}/{$max}:</fg=yellow> {$checkClass->name($config)}...  ");
+            $this->output->write(trans('self-diagnosis::commands.self_diagnosis.running_check', [
+                'current' => $current,
+                'max' => $max,
+                'name' => $checkClass->name($config),
+            ]));
 
             $this->runCheck($checkClass, $config);
 
diff --git a/src/SelfDiagnosisServiceProvider.php b/src/SelfDiagnosisServiceProvider.php
@@ -13,6 +13,12 @@ public function boot()
     {
         if ($this->app->runningInConsole()) {
 
+            $this->loadTranslationsFrom(__DIR__.'/../translations', 'self-diagnosis');
+
+            $this->publishes([
+                __DIR__.'/../translations' => resource_path('lang/vendor/self-diagnosis'),
+            ], 'translations');
+
             $this->publishes([
                 __DIR__.'/../config/config.php' => config_path('self-diagnosis.php'),
             ], 'config');
diff --git a/tests/ExampleEnvironmentVariablesAreSetTest.php b/tests/ExampleEnvironmentVariablesAreSetTest.php
@@ -3,10 +3,18 @@
 namespace BeyondCode\SelfDiagnosis\Tests;
 
 use Orchestra\Testbench\TestCase;
+use BeyondCode\SelfDiagnosis\SelfDiagnosisServiceProvider;
 use BeyondCode\SelfDiagnosis\Checks\ExampleEnvironmentVariablesAreSet;
 
 class ExampleEnvironmentVariablesAreSetTest extends TestCase
 {
+    public function getPackageProviders()
+    {
+        return [
+            SelfDiagnosisServiceProvider::class,
+        ];
+    }
+
     /** @test */
     public function it_checks_if_example_env_variables_are_set_in_env_file()
     {
@@ -15,6 +23,6 @@ public function it_checks_if_example_env_variables_are_set_in_env_file()
         $check = new ExampleEnvironmentVariablesAreSet();
 
         $this->assertFalse($check->check([]));
-        $this->assertSame('These example environment variables are missing in your .env file, but are defined in your .env.example: '.PHP_EOL.'KEY_TWO', $check->message([]));
+        $this->assertSame('These environment variables are missing in your .env file, but are defined in your .env.example:'.PHP_EOL.'KEY_TWO', $check->message([]));
     }
 }
diff --git a/translations/de/checks.php b/translations/de/checks.php
diff --git a/translations/de/commands.php b/translations/de/commands.php
diff --git a/translations/en/checks.php b/translations/en/checks.php
diff --git a/translations/en/commands.php b/translations/en/commands.php

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class AppKeyIsSet implements Check`
`11`	`11`	`*/`
`12`	`12`	`public function name(array $config): string`
`13`	`13`	`{`
`14`		`- return 'App key is set';`
	`14`	`+ return trans('self-diagnosis::checks.app_key_is_set.name');`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`/**`
`@@ -31,6 +31,6 @@ public function check(array $config): bool`
`31`	`31`	`*/`
`32`	`32`	`public function message(array $config): string`
`33`	`33`	`{`
`34`		`- return 'The application key is not set. Call "php artisan key:generate" to create it.';`
	`34`	`+ return trans('self-diagnosis::checks.app_key_is_set.message');`
`35`	`35`	`}`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public function __construct(Composer $composer)`
`26`	`26`	`*/`
`27`	`27`	`public function name(array $config): string`
`28`	`28`	`{`
`29`		`- return 'Composer dependencies are up to date with the composer.lock file.';`
	`29`	`+ return trans('self-diagnosis::checks.composer_with_dev_dependencies_is_up_to_date.name');`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/**`
`@@ -48,6 +48,8 @@ public function check(array $config): bool`
`48`	`48`	`*/`
`49`	`49`	`public function message(array $config): string`
`50`	`50`	`{`
`51`		`- return 'Your composer dependencies are not up to date. Call "composer install".' . $this->output;`
	`51`	`+ return trans('self-diagnosis::checks.composer_with_dev_dependencies_is_up_to_date.message', [`
	`52`	`+ 'more' => $this->output,`
	`53`	`+ ]);`
`52`	`54`	`}`
`53`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class ConfigurationIsCached implements Check`
`14`	`14`	`*/`
`15`	`15`	`public function name(array $config): string`
`16`	`16`	`{`
`17`		`- return 'Configuration is cached';`
	`17`	`+ return trans('self-diagnosis::checks.configuration_is_cached.name');`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`/**`
`@@ -34,6 +34,6 @@ public function check(array $config): bool`
`34`	`34`	`*/`
`35`	`35`	`public function message(array $config): string`
`36`	`36`	`{`
`37`		`- return 'Your configuration files should be cached in production. Call "php artisan config:cache" to cache the configuration.';`
	`37`	`+ return trans('self-diagnosis::checks.configuration_is_cached.message');`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public function __construct(Filesystem $filesystem)`
`21`	`21`	`*/`
`22`	`22`	`public function name(array $config): string`
`23`	`23`	`{`
`24`		`- return 'The correct PHP version is installed';`
	`24`	`+ return trans('self-diagnosis::checks.correct_php_version_is_installed.name');`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`/**`
`@@ -43,7 +43,10 @@ public function check(array $config): bool`
`43`	`43`	`*/`
`44`	`44`	`public function message(array $config): string`
`45`	`45`	`{`
`46`		`- return 'You do not have the required PHP version installed.'.PHP_EOL.'Required: '.$this->getRequiredPhpVersion().PHP_EOL.'Used: '.phpversion();`
	`46`	`+ return trans('self-diagnosis::checks.correct_php_version_is_installed.message', [`
	`47`	`+ 'required' => $this->getRequiredPhpVersion(),`
	`48`	`+ 'used' => phpversion(),`
	`49`	`+ ]);`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class DatabaseCanBeAccessed implements Check`
`15`	`15`	`*/`
`16`	`16`	`public function name(array $config): string`
`17`	`17`	`{`
`18`		`- return 'The database can be accessed';`
	`18`	`+ return trans('self-diagnosis::checks.database_can_be_accessed.name');`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`/**`
`@@ -42,6 +42,8 @@ public function check(array $config): bool`
`42`	`42`	`*/`
`43`	`43`	`public function message(array $config): string`
`44`	`44`	`{`
`45`		`- return 'The database can not be accessed: '.$this->message;`
	`45`	`+ return trans('self-diagnosis::checks.database_can_be_accessed.message', [`
	`46`	`+ 'error' => $this->message,`
	`47`	`+ ]);`
`46`	`48`	`}`
`47`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ class DebugModeIsNotEnabled implements Check`
`14`	`14`	`*/`
`15`	`15`	`public function name(array $config): string`
`16`	`16`	`{`
`17`		`- return 'Debug mode is not enabled';`
	`17`	`+ return trans('self-diagnosis::checks.debug_mode_is_not_enabled.name');`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`/**`
`@@ -34,6 +34,6 @@ public function check(array $config): bool`
`34`	`34`	`*/`
`35`	`35`	`public function message(array $config): string`
`36`	`36`	`{`
`37`		`- return 'You should not use debug mode in production. Set APP_DEBUG to false.';`
	`37`	`+ return trans('self-diagnosis::checks.debug_mode_is_not_enabled.message');`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public function __construct(Filesystem $filesystem)`
`29`	`29`	`*/`
`30`	`30`	`public function name(array $config): string`
`31`	`31`	`{`
`32`		`- return 'The directories have the correct permissions.';`
	`32`	`+ return trans('self-diagnosis::checks.directories_have_correct_permissions.name');`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`/**`
`@@ -39,7 +39,9 @@ public function name(array $config): string`
`39`	`39`	`*/`
`40`	`40`	`public function message(array $config): string`
`41`	`41`	`{`
`42`		`- return 'The following directories are not writable: '.PHP_EOL.$this->paths->implode(PHP_EOL);`
	`42`	`+ return trans('self-diagnosis::checks.directories_have_correct_permissions.message', [`
	`43`	`+ 'directories' => $this->paths->implode(PHP_EOL),`
	`44`	`+ ]);`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function __construct(Filesystem $filesystem)`
`22`	`22`	`*/`
`23`	`23`	`public function name(array $config): string`
`24`	`24`	`{`
`25`		`- return 'The environment file exists';`
	`25`	`+ return trans('self-diagnosis::checks.env_file_exists.name');`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`/**`
`@@ -42,6 +42,6 @@ public function check(array $config): bool`
`42`	`42`	`*/`
`43`	`43`	`public function message(array $config): string`
`44`	`44`	`{`
`45`		`- return 'These .env file does not exist. Please copy your .env.example file as .env';`
	`45`	`+ return trans('self-diagnosis::checks.env_file_exists.message');`
`46`	`46`	`}`
`47`	`47`	`}`