Auto pint

.github/workflows/lint.yaml → .github/workflows/pint.yaml

@@ -1,14 +1,16 @@
-name: Lint
+name: Pint
 
 on:
-  pull_request:
+  push:
     branches:
-      - '**'
+      - main
 
 jobs:
-  lint:
-    name: Lint
+  pint:
+    name: Pint
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
     steps:
       - name: Code Checkout
         uses: actions/checkout@v4
@@ -28,4 +30,10 @@ jobs:
         run: composer install --no-interaction --no-progress --prefer-dist
 
       - name: Pint
-        run: vendor/bin/pint --test
+        run: vendor/bin/pint 
+
+      - name: Commit
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: Pint Fixes
+          commit_user_name: Pint

app/Console/Commands/Environment/AppSettingsCommand.php

@@ -9,7 +9,6 @@
 class AppSettingsCommand extends Command
 {
     use EnvironmentWriterTrait;
-
     public const CACHE_DRIVERS = [
         'redis' => 'Redis',
         'memcached' => 'Memcached',
@@ -62,11 +61,12 @@ public function __construct(private Kernel $console)
      */
     public function handle(): int
     {
+
         if (empty(config('hashids.salt')) || $this->option('new-salt')) {
             $this->variables['HASHIDS_SALT'] = str_random(20);
         }
 
-        $this->output->comment('Provide the email address that eggs exported by this Panel should be from. This should be a valid email address.');
+        $this->output->comment(__('commands.appsettings.comment.author'));
         $this->variables['APP_SERVICE_AUTHOR'] = $this->option('author') ?? $this->ask(
             'Egg Author Email',
             config('panel.service.author', '[email protected]')
@@ -78,13 +78,13 @@ public function handle(): int
             return 1;
         }
 
-        $this->output->comment('The application URL MUST begin with https:// or http:// depending on if you are using SSL or not. If you do not include the scheme your emails and other content will link to the wrong location.');
+        $this->output->comment(__('commands.appsettings.comment.url'));
         $this->variables['APP_URL'] = $this->option('url') ?? $this->ask(
             'Application URL',
             config('app.url', 'https://example.com')
         );
 
-        $this->output->comment('The timezone should match one of PHP\'s supported timezones. If you are unsure, please reference https://php.net/manual/en/timezones.php.');
+        $this->output->comment(__('commands.appsettings.comment.timezone'));
         $this->variables['APP_TIMEZONE'] = $this->option('timezone') ?? $this->anticipate(
             'Application Timezone',
             \DateTimeZone::listIdentifiers(),
@@ -115,7 +115,7 @@ public function handle(): int
         if (!is_null($this->option('settings-ui'))) {
             $this->variables['APP_ENVIRONMENT_ONLY'] = $this->option('settings-ui') == 'true' ? 'false' : 'true';
         } else {
-            $this->variables['APP_ENVIRONMENT_ONLY'] = $this->confirm('Enable UI based settings editor?', true) ? 'false' : 'true';
+            $this->variables['APP_ENVIRONMENT_ONLY'] = $this->confirm(__('commands.appsettings.comment.settings_ui'), true) ? 'false' : 'true';
         }
 
         // Make sure session cookies are set as "secure" when using HTTPS
@@ -145,7 +145,7 @@ private function checkForRedis()
             return;
         }
 
-        $this->output->note('You\'ve selected the Redis driver for one or more options, please provide valid connection information below. In most cases you can use the defaults provided unless you have modified your setup.');
+        $this->output->note(__('commands.appsettings.redis.note'));
         $this->variables['REDIS_HOST'] = $this->option('redis-host') ?? $this->ask(
             'Redis Host',
             config('database.redis.default.host')
@@ -158,7 +158,7 @@ private function checkForRedis()
         }
 
         if ($askForRedisPassword) {
-            $this->output->comment('By default a Redis server instance has no password as it is running locally and inaccessible to the outside world. If this is the case, simply hit enter without entering a value.');
+            $this->output->comment(__('commands.appsettings.redis.comment'));
             $this->variables['REDIS_PASSWORD'] = $this->option('redis-pass') ?? $this->output->askHidden(
                 'Redis Password'
             );

app/Console/Commands/Environment/DatabaseSettingsCommand.php

@@ -49,7 +49,7 @@ public function handle(): int
         );
 
         if ($this->variables['DB_CONNECTION'] === 'mysql') {
-            $this->output->note('It is highly recommended to not use "localhost" as your database host as we have seen frequent socket connection issues. If you want to use a local connection you should be using "127.0.0.1".');
+            $this->output->note(__('commands.database_settings.DB_HOST_note'));
             $this->variables['DB_HOST'] = $this->option('host') ?? $this->ask(
                 'Database Host',
                 config('database.connections.mysql.host', '127.0.0.1')
@@ -65,7 +65,7 @@ public function handle(): int
                 config('database.connections.mysql.database', 'panel')
             );
 
-            $this->output->note('Using the "root" account for MySQL connections is not only highly frowned upon, it is also not allowed by this application. You\'ll need to have created a MySQL user for this software.');
+            $this->output->note(__('commands.database_settings.DB_USERNAME_note'));
             $this->variables['DB_USERNAME'] = $this->option('username') ?? $this->ask(
                 'Database Username',
                 config('database.connections.mysql.username', 'pelican')
@@ -74,7 +74,7 @@ public function handle(): int
             $askForMySQLPassword = true;
             if (!empty(config('database.connections.mysql.password')) && $this->input->isInteractive()) {
                 $this->variables['DB_PASSWORD'] = config('database.connections.mysql.password');
-                $askForMySQLPassword = $this->confirm('It appears you already have a MySQL connection password defined, would you like to change it?');
+                $askForMySQLPassword = $this->confirm(__('commands.database_settings.DB_PASSWORD_note'));
             }
 
             if ($askForMySQLPassword) {
@@ -85,9 +85,9 @@ public function handle(): int
                 $this->testMySQLConnection();
             } catch (\PDOException $exception) {
                 $this->output->error(sprintf('Unable to connect to the MySQL server using the provided credentials. The error returned was "%s".', $exception->getMessage()));
-                $this->output->error('Your connection credentials have NOT been saved. You will need to provide valid connection information before proceeding.');
+                $this->output->error(__('commands.database_settings.DB_error_2'));
 
-                if ($this->confirm('Go back and try again?')) {
+                if ($this->confirm(__('commands.database_settings.go_back'))) {
                     $this->database->disconnect('_panel_command_test');
 
                     return $this->handle();

app/Console/Commands/Node/MakeNodeCommand.php

@@ -42,27 +42,28 @@ public function __construct(private NodeCreationService $creationService)
      */
     public function handle(): void
     {
-        $data['name'] = $this->option('name') ?? $this->ask('Enter a short identifier used to distinguish this node from others');
-        $data['description'] = $this->option('description') ?? $this->ask('Enter a description to identify the node');
+        $data['name'] = $this->option('name') ?? $this->ask(__('commands.make_node.name'));
+        $data['description'] = $this->option('description') ?? $this->ask(__('commands.make_node.description'));
         $data['scheme'] = $this->option('scheme') ?? $this->anticipate(
-            'Please either enter https for SSL or http for a non-ssl connection',
+            __('commands.make_node.scheme'),
             ['https', 'http'],
             'https'
         );
-        $data['fqdn'] = $this->option('fqdn') ?? $this->ask('Enter a domain name (e.g node.example.com) to be used for connecting to the daemon. An IP address may only be used if you are not using SSL for this node');
-        $data['public'] = $this->option('public') ?? $this->confirm('Should this node be public? As a note, setting a node to private you will be denying the ability to auto-deploy to this node.', true);
-        $data['behind_proxy'] = $this->option('proxy') ?? $this->confirm('Is your FQDN behind a proxy?');
-        $data['maintenance_mode'] = $this->option('maintenance') ?? $this->confirm('Should maintenance mode be enabled?');
-        $data['memory'] = $this->option('maxMemory') ?? $this->ask('Enter the maximum amount of memory');
-        $data['memory_overallocate'] = $this->option('overallocateMemory') ?? $this->ask('Enter the amount of memory to over allocate by, -1 will disable checking and 0 will prevent creating new servers');
-        $data['disk'] = $this->option('maxDisk') ?? $this->ask('Enter the maximum amount of disk space');
-        $data['disk_overallocate'] = $this->option('overallocateDisk') ?? $this->ask('Enter the amount of memory to over allocate by, -1 will disable checking and 0 will prevent creating new server');
-        $data['upload_size'] = $this->option('uploadSize') ?? $this->ask('Enter the maximum filesize upload', '100');
-        $data['daemon_listen'] = $this->option('daemonListeningPort') ?? $this->ask('Enter the daemon listening port', '8080');
-        $data['daemon_sftp'] = $this->option('daemonSFTPPort') ?? $this->ask('Enter the daemon SFTP listening port', '2022');
-        $data['daemon_base'] = $this->option('daemonBase') ?? $this->ask('Enter the base folder', '/var/lib/pelican/volumes');
+
+        $data['fqdn'] = $this->option('fqdn') ?? $this->ask(__('commands.make_node.fqdn'));
+        $data['public'] = $this->option('public') ?? $this->confirm(__('commands.make_node.public'), true);
+        $data['behind_proxy'] = $this->option('proxy') ?? $this->confirm(__('commands.make_node.behind_proxy'));
+        $data['maintenance_mode'] = $this->option('maintenance') ?? $this->confirm(__('commands.make_node.maintenance_mode'));
+        $data['memory'] = $this->option('maxMemory') ?? $this->ask(__('commands.make_node.memory'));
+        $data['memory_overallocate'] = $this->option('overallocateMemory') ?? $this->ask(__('commands.make_node.memory_overallocate'));
+        $data['disk'] = $this->option('maxDisk') ?? $this->ask(__('commands.make_node.disk'));
+        $data['disk_overallocate'] = $this->option('overallocateDisk') ?? $this->ask(__('commands.make_node.disk_overallocate'));
+        $data['upload_size'] = $this->option('uploadSize') ?? $this->ask(__('commands.make_node.upload_size'), '100');
+        $data['daemon_listen'] = $this->option('daemonListeningPort') ?? $this->ask(__('commands.make_node.daemonListen'), '8080');
+        $data['daemon_sftp'] = $this->option('daemonSFTPPort') ?? $this->ask(__('commands.make_node.daemonSFTP'), '2022');
+        $data['daemon_base'] = $this->option('daemonBase') ?? $this->ask(__('commands.make_node.daemonBase'), '/var/lib/pelican/volumes');
 
         $node = $this->creationService->handle($data);
-        $this->line('Successfully created a new node with the name ' . $data['name'] . ' and has an id of ' . $node->id . '.');
+        $this->line(__('commands.make_node.succes1') . $data['name'] . __('commands.make_node.succes2')  . $node->id . '.');
     }
 }

app/Console/Commands/Node/NodeConfigurationCommand.php

@@ -19,14 +19,14 @@ public function handle(): int
 
         /** @var \App\Models\Node $node */
         $node = Node::query()->where($column, $this->argument('node'))->firstOr(function () {
-            $this->error('The selected node does not exist.');
+            $this->error(__('commands.node_config.error_not_exist'));
 
             exit(1);
         });
 
         $format = $this->option('format');
         if (!in_array($format, ['yaml', 'yml', 'json'])) {
-            $this->error('Invalid format specified. Valid options are "yaml" and "json".');
+            $this->error(__('commands.node_config.error_invalid_format'));
 
             return 1;
         }

app/Console/Commands/Overrides/KeyGenerateCommand.php

@@ -13,12 +13,12 @@ class KeyGenerateCommand extends BaseKeyGenerateCommand
     public function handle(): void
     {
         if (!empty(config('app.key')) && $this->input->isInteractive()) {
-            $this->output->warning('It appears you have already configured an application encryption key. Continuing with this process with overwrite that key and cause data corruption for any existing encrypted data. DO NOT CONTINUE UNLESS YOU KNOW WHAT YOU ARE DOING.');
-            if (!$this->confirm('I understand the consequences of performing this command and accept all responsibility for the loss of encrypted data.')) {
+            $this->output->warning(__('commands.key_generate.error_already_exist'));
+            if (!$this->confirm(__('commands.key_generate.understand'))) {
                 return;
             }
 
-            if (!$this->confirm('Are you sure you wish to continue? Changing the application encryption key WILL CAUSE DATA LOSS.')) {
+            if (!$this->confirm(__('commands.key_generate.continue'))) {
                 return;
             }
         }

app/Console/Commands/Schedule/ProcessRunnableCommand.php

@@ -27,7 +27,7 @@ public function handle(): int
             ->get();
 
         if ($schedules->count() < 1) {
-            $this->line('There are no scheduled tasks for servers that need to be run.');
+            $this->line(__('commands.schedule.process.no_tasks'));
 
             return 0;
         }
@@ -66,7 +66,7 @@ protected function processSchedule(Schedule $schedule)
         } catch (\Throwable|\Exception $exception) {
             logger()->error($exception, ['schedule_id' => $schedule->id]);
 
-            $this->error("An error was encountered while processing Schedule #$schedule->id: " . $exception->getMessage());
+            $this->error(__('commands.schedule.process.no_tasks') . " #$schedule->id: " . $exception->getMessage());
         }
     }
 }

app/Console/Commands/UpgradeCommand.php

@@ -34,29 +34,30 @@ public function handle(): void
     {
         $skipDownload = $this->option('skip-download');
         if (!$skipDownload) {
-            $this->output->warning('This command does not verify the integrity of downloaded assets. Please ensure that you trust the download source before continuing. If you do not wish to download an archive, please indicate that using the --skip-download flag, or answering "no" to the question below.');
-            $this->output->comment('Download Source (set with --url=):');
+            $this->output->warning(__('commands.upgrade.integrity'));
+            $this->output->comment(__('commands.upgrade.source_url'));
             $this->line($this->getUrl());
         }
 
         if (version_compare(PHP_VERSION, '7.4.0') < 0) {
-            $this->error('Cannot execute self-upgrade process. The minimum required PHP version required is 7.4.0, you have [' . PHP_VERSION . '].');
+            $this->error(__('commands.upgrade.php_version') . ' [' . PHP_VERSION . '].');
         }
 
         $user = 'www-data';
         $group = 'www-data';
         if ($this->input->isInteractive()) {
             if (!$skipDownload) {
-                $skipDownload = !$this->confirm('Would you like to download and unpack the archive files for the latest version?', true);
+                $skipDownload = !$this->confirm(__('commands.upgrade.skipDownload'), true);
             }
 
             if (is_null($this->option('user'))) {
                 $userDetails = function_exists('posix_getpwuid') ? posix_getpwuid(fileowner('public')) : [];
                 $user = $userDetails['name'] ?? 'www-data';
 
-                if (!$this->confirm("Your webserver user has been detected as <fg=blue>[{$user}]:</> is this correct?", true)) {
+                $message = __('commands.upgrade.webserver_user', ['user' => $user]);
+                if (!$this->confirm($message, true)) {
                     $user = $this->anticipate(
-                        'Please enter the name of the user running your webserver process. This varies from system to system, but is generally "www-data", "nginx", or "apache".',
+                        __('commands.upgrade.name_webserver'),
                         [
                             'www-data',
                             'nginx',
@@ -70,9 +71,10 @@ public function handle(): void
                 $groupDetails = function_exists('posix_getgrgid') ? posix_getgrgid(filegroup('public')) : [];
                 $group = $groupDetails['name'] ?? 'www-data';
 
-                if (!$this->confirm("Your webserver group has been detected as <fg=blue>[{$group}]:</> is this correct?", true)) {
+                $message = __('commands.upgrade.group_webserver', ['group' => $user]);
+                if (!$this->confirm($message, true)) {
                     $group = $this->anticipate(
-                        'Please enter the name of the group running your webserver process. Normally this is the same as your user.',
+                        __('commands.upgrade.group_webserver_question'),
                         [
                             'www-data',
                             'nginx',
@@ -82,8 +84,8 @@ public function handle(): void
                 }
             }
 
-            if (!$this->confirm('Are you sure you want to run the upgrade process for your Panel?')) {
-                $this->warn('Upgrade process terminated by user.');
+            if (!$this->confirm(__('commands.upgrade.are_your_sure'))) {
+                $this->warn(__('commands.upgrade.terminated'));
 
                 return;
             }
@@ -173,7 +175,7 @@ public function handle(): void
         });
 
         $this->newLine(2);
-        $this->info('Panel has been successfully upgraded. Please ensure you also update any Daemon instances');
+        $this->info(__('commands.upgrade.success'));
     }
 
     protected function withProgress(ProgressBar $bar, \Closure $callback)

lang/da/dashboard/account.php

@@ -3,14 +3,14 @@
 return [
     'title' => 'Konto Oversigt',
     'email' => [
-        'title' => 'Opdater Email Adresse',
+        'title' => 'Opdater din e-mail',
         'button' => 'Opdater Email',
-        'updated' => 'Din primære email er blevet opdateret',
+        'updated' => 'Din e-mailadresse er blevet opdateret.',
     ],
     'password' => [
-        'title' => 'Opdater Adgangskode',
+        'title' => 'Skift din adgangskode',
         'button' => 'Opdater Adgangskode',
-        'requirements' => 'Din nye adgangskode skal være mindst 8 tegn langt og unikt for dette websted.',
+        'requirements' => 'Din nye adgangskode skal være mindst 8 tegn lang.',
         'validation' => [
             'account_password' => 'Du skal angive adgangskoden til din konto.',
             'current_password' => 'Du skal angive din nuværende adgangskode.',
@@ -35,9 +35,9 @@
             'button' => 'Disable Two-Step',
         ],
         'setup' => [
-            'title' => 'Enable Two-Step Verification',
+            'title' => 'Opsætning af 2-faktor godkendelse',
             'subtitle' => "Help protect your account from unauthorized access. You'll be prompted for a verification code each time you sign in.",
-            'help' => 'Scan the QR code above using the two-step authentication app of your choice. Then, enter the 6-digit code generated into the field below.',
+            'help' => 'Kan ikke scanne koden? Indtast koden nedenfor i din applikation:',
         ],
 
         'required' => [

lang/de/admin/index.php

@@ -7,7 +7,7 @@
         'subtitle' => 'Ein kurzer Blick auf dein System.',
     ],
     'content' => [
-        'title' => 'System Informationen',
+        'title' => 'System-Informationen',
         'up-to-date' => 'Du verwendest die Pelican Version <code>:version</code>. Dein Panel ist aktuell!',
         'not-up-to-date1' => 'Dein Panel ist <strong>nicht auf dem neuesten Stand!</strong> Die neueste Version ist',
         'not-up-to-date2' => 'und du verwendest zur Zeit die Version <code>:version</code>.',