diff --git a/app/Bus/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php b/app/Bus/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php index f92e49c0..3558ff7c 100644 --- a/app/Bus/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php +++ b/app/Bus/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php @@ -106,8 +106,8 @@ class SendIncidentEmailNotificationHandler $component = AutoPresenter::decorate($event->incident->component); $mail = [ - 'email' => $subscriber->email, - 'subject' => trans('cachet.subscriber.email.incident.subject', [ + 'email' => $subscriber->email, + 'subject' => trans('cachet.subscriber.email.incident.subject', [ 'status' => $incident->human_status, 'name' => $incident->name, ]), diff --git a/app/Bus/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php b/app/Bus/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php index faa4fd38..d87abf6a 100644 --- a/app/Bus/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php +++ b/app/Bus/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php @@ -106,9 +106,9 @@ class SendMaintenanceEmailNotificationHandler $component = AutoPresenter::decorate($event->incident->component); $mail = [ - 'email' => $subscriber->email, - 'subject' => trans('cachet.subscriber.email.maintenance.subject', [ - 'name' => $incident->name, + 'email' => $subscriber->email, + 'subject' => trans('cachet.subscriber.email.maintenance.subject', [ + 'name' => $incident->name, ]), 'has_component' => ($event->incident->component) ? true : false, 'component_name' => $component ? $component->name : null, diff --git a/app/Bus/Handlers/Events/User/SendInviteUserEmailHandler.php b/app/Bus/Handlers/Events/User/SendInviteUserEmailHandler.php index 83e8f356..419baa3a 100644 --- a/app/Bus/Handlers/Events/User/SendInviteUserEmailHandler.php +++ b/app/Bus/Handlers/Events/User/SendInviteUserEmailHandler.php @@ -46,9 +46,9 @@ class SendInviteUserEmailHandler public function handle(UserWasInvitedEvent $event) { $mail = [ - 'email' => $event->invite->email, - 'subject' => 'You have been invited.', - 'link' => route('signup.invite', ['code' => $event->invite->code]), + 'email' => $event->invite->email, + 'subject' => 'You have been invited.', + 'link' => route('signup.invite', ['code' => $event->invite->code]), ]; $this->mailer->queue([ diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php index ed289ec9..2676d57a 100644 --- a/app/Http/Controllers/SetupController.php +++ b/app/Http/Controllers/SetupController.php @@ -48,11 +48,11 @@ class SetupController extends Controller * @var string[] */ protected $mailDrivers = [ - 'smtp' => 'SMTP', - 'mail' => 'Mail', - 'sendmail' => 'Sendmail', - 'mailgun' => 'Mailgun', - 'mandrill' => 'Mandrill', + 'smtp' => 'SMTP', + 'mail' => 'Mail', + 'sendmail' => 'Sendmail', + 'mailgun' => 'Mailgun', + 'mandrill' => 'Mandrill', // 'ses' => 'Amazon SES', this will be available only if aws/aws-sdk-php is installed 'sparkpost' => 'SparkPost', 'log' => 'Log (Testing)', diff --git a/app/Http/Routes/DashboardRoutes.php b/app/Http/Routes/DashboardRoutes.php index b723baf6..fcc3c4a9 100644 --- a/app/Http/Routes/DashboardRoutes.php +++ b/app/Http/Routes/DashboardRoutes.php @@ -131,7 +131,7 @@ class DashboardRoutes $router->delete('{incident_template}/delete', 'IncidentController@deleteTemplateAction'); }); - $router->group(['as' => 'subscribers.', 'prefix' => 'subscribers'], function (Registrar $router) { + $router->group(['as' => 'subscribers.', 'prefix' => 'subscribers'], function (Registrar $router) { $router->get('/', [ 'as' => 'index', 'uses' => 'SubscriberController@showSubscribers', @@ -144,7 +144,7 @@ class DashboardRoutes $router->delete('{subscriber}/delete', 'SubscriberController@deleteSubscriberAction'); }); - $router->group(['as' => 'metrics.', 'prefix' => 'metrics'], function (Registrar $router) { + $router->group(['as' => 'metrics.', 'prefix' => 'metrics'], function (Registrar $router) { $router->get('/', [ 'as' => 'index', 'uses' => 'MetricController@showMetrics', diff --git a/app/Subscribers/CommandSubscriber.php b/app/Subscribers/CommandSubscriber.php index 2aaa320d..b648aed8 100644 --- a/app/Subscribers/CommandSubscriber.php +++ b/app/Subscribers/CommandSubscriber.php @@ -134,6 +134,13 @@ class CommandSubscriber $command->line('Settings cache cleared!'); + // SQLite does not backup. + if ($this->config->get('database.default') === 'sqlite') { + $command->line('Backup skipped: SQLite is not supported.'); + + return; + } + $command->line('Backing up database...'); try { diff --git a/app/helpers.php b/app/helpers.php index 6338fb4f..cabc6a3f 100644 --- a/app/helpers.php +++ b/app/helpers.php @@ -14,7 +14,6 @@ use Illuminate\Support\Facades\Request; use Jenssegers\Date\Date; if (!function_exists('set_active')) { - /** * Set active class if request is in path. * diff --git a/composer.json b/composer.json index 42fcafea..f00fbdbe 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ ], "require": { "php": ">=5.5.9", + "ext-xml": "*", "laravel/framework": "5.2.39", "alt-three/badger": "^3.1", "alt-three/bus": "^1.1", diff --git a/composer.lock b/composer.lock index 8ebcbd84..c30aafaf 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "efee15cdcec498c266017d8b6b9dc40b", - "content-hash": "5e0dba0b123506042e11f77f15280b6e", + "hash": "620cb80f29b93d4e6cf74e34ad35e39c", + "content-hash": "1669c288238ee037a297e8ed1f2a536e", "packages": [ { "name": "alt-three/badger", @@ -325,16 +325,16 @@ }, { "name": "aws/aws-sdk-php", - "version": "3.18.35", + "version": "3.18.37", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "8133c4ce336c8cac97218546f896f491bb6ffd7e" + "reference": "0d4abd38caf09fbda9177e8c1fd2a9ec73d71d66" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/8133c4ce336c8cac97218546f896f491bb6ffd7e", - "reference": "8133c4ce336c8cac97218546f896f491bb6ffd7e", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/0d4abd38caf09fbda9177e8c1fd2a9ec73d71d66", + "reference": "0d4abd38caf09fbda9177e8c1fd2a9ec73d71d66", "shasum": "" }, "require": { @@ -401,7 +401,7 @@ "s3", "sdk" ], - "time": "2016-07-29 01:07:59" + "time": "2016-08-04 21:27:47" }, { "name": "backup-manager/backup-manager", @@ -1458,16 +1458,16 @@ }, { "name": "graham-campbell/exceptions", - "version": "v8.7.0", + "version": "v8.8.0", "source": { "type": "git", "url": "https://github.com/GrahamCampbell/Laravel-Exceptions.git", - "reference": "6610dfaeda39f9103d53eac4dc487ee59eb80894" + "reference": "e93f725d3637625897fe6ec30dc454cb23adb331" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Exceptions/zipball/6610dfaeda39f9103d53eac4dc487ee59eb80894", - "reference": "6610dfaeda39f9103d53eac4dc487ee59eb80894", + "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Exceptions/zipball/e93f725d3637625897fe6ec30dc454cb23adb331", + "reference": "e93f725d3637625897fe6ec30dc454cb23adb331", "shasum": "" }, "require": { @@ -1523,7 +1523,7 @@ "laravel", "whoops" ], - "time": "2016-07-21 13:26:49" + "time": "2016-07-31 14:54:35" }, { "name": "graham-campbell/markdown", @@ -2217,16 +2217,16 @@ }, { "name": "league/flysystem", - "version": "1.0.25", + "version": "1.0.26", "source": { "type": "git", "url": "https://github.com/thephpleague/flysystem.git", - "reference": "a76afa4035931be0c78ca8efc6abf3902362f437" + "reference": "fb3b30dca320b36931ea878fea17ebe136fba1b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/a76afa4035931be0c78ca8efc6abf3902362f437", - "reference": "a76afa4035931be0c78ca8efc6abf3902362f437", + "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/fb3b30dca320b36931ea878fea17ebe136fba1b0", + "reference": "fb3b30dca320b36931ea878fea17ebe136fba1b0", "shasum": "" }, "require": { @@ -2296,7 +2296,7 @@ "sftp", "storage" ], - "time": "2016-07-18 12:22:57" + "time": "2016-08-03 09:49:11" }, { "name": "mccool/laravel-auto-presenter", @@ -2362,16 +2362,16 @@ }, { "name": "monolog/monolog", - "version": "1.20.0", + "version": "1.21.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "55841909e2bcde01b5318c35f2b74f8ecc86e037" + "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/55841909e2bcde01b5318c35f2b74f8ecc86e037", - "reference": "55841909e2bcde01b5318c35f2b74f8ecc86e037", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f42fbdfd53e306bda545845e4dbfd3e72edb4952", + "reference": "f42fbdfd53e306bda545845e4dbfd3e72edb4952", "shasum": "" }, "require": { @@ -2436,7 +2436,7 @@ "logging", "psr-3" ], - "time": "2016-07-02 14:02:10" + "time": "2016-07-29 03:23:52" }, { "name": "mtdowling/cron-expression", @@ -2739,16 +2739,16 @@ }, { "name": "psr/http-message", - "version": "1.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/http-message.git", - "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298" + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", - "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363", + "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363", "shasum": "" }, "require": { @@ -2776,6 +2776,7 @@ } ], "description": "Common interface for HTTP messages", + "homepage": "https://github.com/php-fig/http-message", "keywords": [ "http", "http-message", @@ -2784,7 +2785,7 @@ "request", "response" ], - "time": "2015-05-04 20:22:00" + "time": "2016-08-06 14:39:51" }, { "name": "psr/log", @@ -3117,16 +3118,16 @@ }, { "name": "symfony/console", - "version": "v3.0.8", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "a7abb7153f6d1da47f87ec50274844e246b09d9f" + "reference": "926061e74229e935d3c5b4e9ba87237316c6693f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/a7abb7153f6d1da47f87ec50274844e246b09d9f", - "reference": "a7abb7153f6d1da47f87ec50274844e246b09d9f", + "url": "https://api.github.com/repos/symfony/console/zipball/926061e74229e935d3c5b4e9ba87237316c6693f", + "reference": "926061e74229e935d3c5b4e9ba87237316c6693f", "shasum": "" }, "require": { @@ -3173,11 +3174,11 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2016-06-29 07:02:21" + "time": "2016-07-30 07:22:48" }, { "name": "symfony/css-selector", - "version": "v3.1.2", + "version": "v3.1.3", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", @@ -3230,16 +3231,16 @@ }, { "name": "symfony/debug", - "version": "v3.0.8", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "c54bc3539c3b87e86799533801e8ae0e971d78c2" + "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/c54bc3539c3b87e86799533801e8ae0e971d78c2", - "reference": "c54bc3539c3b87e86799533801e8ae0e971d78c2", + "url": "https://api.github.com/repos/symfony/debug/zipball/697c527acd9ea1b2d3efac34d9806bf255278b0a", + "reference": "697c527acd9ea1b2d3efac34d9806bf255278b0a", "shasum": "" }, "require": { @@ -3283,20 +3284,20 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2016-06-29 05:40:00" + "time": "2016-07-30 07:22:48" }, { "name": "symfony/event-dispatcher", - "version": "v3.1.2", + "version": "v3.1.3", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "7f9839ede2070f53e7e2f0849b9bd14748c434c5" + "reference": "c0c00c80b3a69132c4e55c3e7db32b4a387615e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/7f9839ede2070f53e7e2f0849b9bd14748c434c5", - "reference": "7f9839ede2070f53e7e2f0849b9bd14748c434c5", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/c0c00c80b3a69132c4e55c3e7db32b4a387615e5", + "reference": "c0c00c80b3a69132c4e55c3e7db32b4a387615e5", "shasum": "" }, "require": { @@ -3343,11 +3344,11 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2016-06-29 05:41:56" + "time": "2016-07-19 10:45:57" }, { "name": "symfony/finder", - "version": "v3.0.8", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", @@ -3396,16 +3397,16 @@ }, { "name": "symfony/http-foundation", - "version": "v3.0.8", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "1341139f906d295baa4f4abd55293d07e25a065a" + "reference": "49ba00f8ede742169cb6b70abe33243f4d673f82" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/1341139f906d295baa4f4abd55293d07e25a065a", - "reference": "1341139f906d295baa4f4abd55293d07e25a065a", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/49ba00f8ede742169cb6b70abe33243f4d673f82", + "reference": "49ba00f8ede742169cb6b70abe33243f4d673f82", "shasum": "" }, "require": { @@ -3445,20 +3446,20 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "https://symfony.com", - "time": "2016-06-29 07:02:21" + "time": "2016-07-17 13:54:30" }, { "name": "symfony/http-kernel", - "version": "v3.0.8", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "177b63b2d50b63fa6d82ea41359ed9928cc7a1fb" + "reference": "d97ba4425e36e79c794e7d14ff36f00f081b37b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/177b63b2d50b63fa6d82ea41359ed9928cc7a1fb", - "reference": "177b63b2d50b63fa6d82ea41359ed9928cc7a1fb", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/d97ba4425e36e79c794e7d14ff36f00f081b37b3", + "reference": "d97ba4425e36e79c794e7d14ff36f00f081b37b3", "shasum": "" }, "require": { @@ -3527,7 +3528,7 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2016-06-30 16:30:17" + "time": "2016-07-30 09:10:37" }, { "name": "symfony/polyfill-mbstring", @@ -3698,16 +3699,16 @@ }, { "name": "symfony/process", - "version": "v3.0.8", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/process.git", - "reference": "d7cde1f9d94d87060204f863779389b61c382eeb" + "reference": "768debc5996f599c4372b322d9061dba2a4bf505" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/process/zipball/d7cde1f9d94d87060204f863779389b61c382eeb", - "reference": "d7cde1f9d94d87060204f863779389b61c382eeb", + "url": "https://api.github.com/repos/symfony/process/zipball/768debc5996f599c4372b322d9061dba2a4bf505", + "reference": "768debc5996f599c4372b322d9061dba2a4bf505", "shasum": "" }, "require": { @@ -3743,11 +3744,11 @@ ], "description": "Symfony Process Component", "homepage": "https://symfony.com", - "time": "2016-06-29 05:40:00" + "time": "2016-07-28 11:13:34" }, { "name": "symfony/routing", - "version": "v3.0.8", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", @@ -3822,16 +3823,16 @@ }, { "name": "symfony/translation", - "version": "v3.0.8", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "6bf844e1ee3c820c012386c10427a5c67bbefec8" + "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/6bf844e1ee3c820c012386c10427a5c67bbefec8", - "reference": "6bf844e1ee3c820c012386c10427a5c67bbefec8", + "url": "https://api.github.com/repos/symfony/translation/zipball/eee6c664853fd0576f21ae25725cfffeafe83f26", + "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26", "shasum": "" }, "require": { @@ -3882,20 +3883,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2016-06-29 05:40:00" + "time": "2016-07-30 07:22:48" }, { "name": "symfony/var-dumper", - "version": "v3.0.8", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "2f046e9a9d571f22cc8b26783564876713b06579" + "reference": "1f7e071aafc6676fcb6e3f0497f87c2397247377" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2f046e9a9d571f22cc8b26783564876713b06579", - "reference": "2f046e9a9d571f22cc8b26783564876713b06579", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/1f7e071aafc6676fcb6e3f0497f87c2397247377", + "reference": "1f7e071aafc6676fcb6e3f0497f87c2397247377", "shasum": "" }, "require": { @@ -3945,7 +3946,7 @@ "debug", "dump" ], - "time": "2016-06-29 05:40:00" + "time": "2016-07-26 08:03:56" }, { "name": "tijsverkoyen/css-to-inline-styles", @@ -5455,16 +5456,16 @@ }, { "name": "symfony/dom-crawler", - "version": "v3.1.2", + "version": "v3.1.3", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0" + "reference": "c7b9b8db3a6f2bac76dcd9a9db5446f2591897f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0", - "reference": "99ec4a23330fcd0c8667095f3ef7aa204ffd9dc0", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/c7b9b8db3a6f2bac76dcd9a9db5446f2591897f9", + "reference": "c7b9b8db3a6f2bac76dcd9a9db5446f2591897f9", "shasum": "" }, "require": { @@ -5507,20 +5508,20 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2016-06-29 05:41:56" + "time": "2016-07-26 08:04:17" }, { "name": "symfony/yaml", - "version": "v3.1.2", + "version": "v3.1.3", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de" + "reference": "1819adf2066880c7967df7180f4f662b6f0567ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/2884c26ce4c1d61aebf423a8b912950fe7c764de", - "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de", + "url": "https://api.github.com/repos/symfony/yaml/zipball/1819adf2066880c7967df7180f4f662b6f0567ac", + "reference": "1819adf2066880c7967df7180f4f662b6f0567ac", "shasum": "" }, "require": { @@ -5556,7 +5557,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2016-06-29 05:41:56" + "time": "2016-07-17 14:02:08" }, { "name": "webmozart/assert", @@ -5614,7 +5615,8 @@ "prefer-stable": true, "prefer-lowest": false, "platform": { - "php": ">=5.5.9" + "php": ">=5.5.9", + "ext-xml": "*" }, "platform-dev": [], "platform-overrides": { diff --git a/config/app.php b/config/app.php index 7a8182ce..abf14dfa 100644 --- a/config/app.php +++ b/config/app.php @@ -234,8 +234,8 @@ return [ 'Validator' => 'Illuminate\Support\Facades\Validator', 'View' => 'Illuminate\Support\Facades\View', - 'Binput' => 'GrahamCampbell\Binput\Facades\Binput', - 'Str' => 'Illuminate\Support\Str', + 'Binput' => 'GrahamCampbell\Binput\Facades\Binput', + 'Str' => 'Illuminate\Support\Str', ], diff --git a/config/database.php b/config/database.php index 5d47720b..aeb167eb 100644 --- a/config/database.php +++ b/config/database.php @@ -76,25 +76,25 @@ return [ ], 'pgsql' => [ - 'driver' => 'pgsql', - 'host' => env('DB_HOST', null), - 'database' => env('DB_DATABASE', null), - 'username' => env('DB_USERNAME', null), - 'password' => env('DB_PASSWORD', null), - 'port' => env('DB_PORT', '5432'), - 'charset' => 'utf8', - 'prefix' => env('DB_PREFIX', null), - 'schema' => env('DB_SCHEMA', 'public'), + 'driver' => 'pgsql', + 'host' => env('DB_HOST', null), + 'database' => env('DB_DATABASE', null), + 'username' => env('DB_USERNAME', null), + 'password' => env('DB_PASSWORD', null), + 'port' => env('DB_PORT', '5432'), + 'charset' => 'utf8', + 'prefix' => env('DB_PREFIX', null), + 'schema' => env('DB_SCHEMA', 'public'), ], 'sqlsrv' => [ - 'driver' => 'sqlsrv', - 'host' => env('DB_HOST', null), - 'database' => env('DB_DATABASE', null), - 'username' => env('DB_USERNAME', null), - 'password' => env('DB_PASSWORD', null), - 'port' => env('DB_PORT', null), - 'prefix' => env('DB_PREFIX', null), + 'driver' => 'sqlsrv', + 'host' => env('DB_HOST', null), + 'database' => env('DB_DATABASE', null), + 'username' => env('DB_USERNAME', null), + 'password' => env('DB_PASSWORD', null), + 'port' => env('DB_PORT', null), + 'prefix' => env('DB_PREFIX', null), ], ], diff --git a/config/langs.php b/config/langs.php index 68e8d358..0a45741b 100644 --- a/config/langs.php +++ b/config/langs.php @@ -11,35 +11,35 @@ return [ // Enabled langs - 'af' => [ + 'af' => [ 'name' => 'Afrikaans', 'subset' => 'latin', ], - 'ar' => [ + 'ar' => [ 'name' => 'Arabic', 'subset' => 'latin', ], - 'ca' => [ + 'ca' => [ 'name' => 'Catalan', 'subset' => 'latin', ], - 'cs' => [ + 'cs' => [ 'name' => 'Czech', 'subset' => 'latin,latin-ext', ], - 'da' => [ + 'da' => [ 'name' => 'Danish', 'subset' => 'latin,latin-ext', ], - 'de' => [ + 'de' => [ 'name' => 'Deutsch', 'subset' => 'latin,latin-ext', ], - 'el' => [ + 'el' => [ 'name' => 'Greek', 'subset' => 'greek,greek-ext', ], - 'en' => [ + 'en' => [ 'name' => 'English', 'subset' => 'latin', ], @@ -47,55 +47,55 @@ return [ 'name' => 'CrowdIn - InContext Localization', 'subset' => 'latin', ], - 'es' => [ + 'es' => [ 'name' => 'Español', 'subset' => 'latin,latin-ext', ], - 'fa' => [ + 'fa' => [ 'name' => 'Persian', 'subset' => 'latin', ], - 'fi' => [ + 'fi' => [ 'name' => 'Finnish', 'subset' => 'latin,latin-ext', ], - 'fr' => [ + 'fr' => [ 'name' => 'Français', 'subset' => 'latin,latin-ext', ], - 'he' => [ + 'he' => [ 'name' => 'Hebrew', 'subset' => 'latin', ], - 'hu' => [ + 'hu' => [ 'name' => 'Hungarian', 'subset' => 'latin,latin-ext', ], - 'id' => [ + 'id' => [ 'name' => 'Indonesian', 'subset' => 'latin', ], - 'it' => [ + 'it' => [ 'name' => 'Italiano', 'subset' => 'latin,latin-ext', ], - 'ja' => [ + 'ja' => [ 'name' => 'Japanese', 'subset' => 'latin', ], - 'ko' => [ + 'ko' => [ 'name' => '한글', 'subset' => 'latin', ], - 'nl' => [ + 'nl' => [ 'name' => 'Nederlands', 'subset' => 'latin,latin-ext', ], - 'no' => [ + 'no' => [ 'name' => 'Norwegian', 'subset' => 'latin,latin-ext', ], - 'pl' => [ + 'pl' => [ 'name' => 'Polski', 'subset' => 'latin,latin-ext', ], @@ -107,19 +107,19 @@ return [ 'name' => 'Portuguese, Portugal', 'subset' => 'latin,latin-ext', ], - 'ro' => [ + 'ro' => [ 'name' => 'Romanian', 'subset' => 'latin,latin-ext', ], - 'ru' => [ + 'ru' => [ 'name' => 'Русский', 'subset' => 'latin,cyrillic', ], - 'sq' => [ + 'sq' => [ 'name' => 'Albanian', 'subset' => 'latin,latin-ext', ], - 'sr' => [ + 'sr' => [ 'name' => 'Sebrian (Cyrillic)', 'subset' => 'latin,cyrillic,cyrillic-ext', ], @@ -127,15 +127,15 @@ return [ 'name' => 'Swedish', 'subset' => 'latin,latin-ext', ], - 'tr' => [ + 'tr' => [ 'name' => 'Turkish', 'subset' => 'latin,latin-ext', ], - 'uk' => [ + 'uk' => [ 'name' => 'Ukranian', 'subset' => 'latin,cyrillic-ext', ], - 'vi' => [ + 'vi' => [ 'name' => 'Vietnamese', 'subset' => 'latin,vietnamese', ], diff --git a/resources/lang/af/cachet.php b/resources/lang/af/cachet.php index dbec2f73..5e4b811a 100644 --- a/resources/lang/af/cachet.php +++ b/resources/lang/af/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", - 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', + 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", + 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], ], diff --git a/resources/lang/af/forms.php b/resources/lang/af/forms.php index e706de8a..e37dce2d 100644 --- a/resources/lang/af/forms.php +++ b/resources/lang/af/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s site id', ], 'localization' => [ - 'site-timezone' => 'Site timezone', - 'site-locale' => 'Site language', - 'date-format' => 'Date format', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Site timezone', + 'site-locale' => 'Site language', + 'date-format' => 'Date format', + 'incident-date-format' => 'Incident timestamp format', ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/ar/cachet.php b/resources/lang/ar/cachet.php index f8a1cd83..321ffaba 100644 --- a/resources/lang/ar/cachet.php +++ b/resources/lang/ar/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", - 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', + 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", + 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], ], diff --git a/resources/lang/ar/forms.php b/resources/lang/ar/forms.php index e706de8a..e37dce2d 100644 --- a/resources/lang/ar/forms.php +++ b/resources/lang/ar/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s site id', ], 'localization' => [ - 'site-timezone' => 'Site timezone', - 'site-locale' => 'Site language', - 'date-format' => 'Date format', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Site timezone', + 'site-locale' => 'Site language', + 'date-format' => 'Date format', + 'incident-date-format' => 'Incident timestamp format', ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/ca/cachet.php b/resources/lang/ca/cachet.php index 8546c0ef..c113ee71 100644 --- a/resources/lang/ca/cachet.php +++ b/resources/lang/ca/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", - 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', + 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", + 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], ], diff --git a/resources/lang/ca/forms.php b/resources/lang/ca/forms.php index ed4941dc..df729dab 100644 --- a/resources/lang/ca/forms.php +++ b/resources/lang/ca/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Identificador de lloc del Piwik', ], 'localization' => [ - 'site-timezone' => 'Seleccioneu el fus horari', - 'site-locale' => 'Idioma del lloc', - 'date-format' => 'Format de la data', - 'incident-date-format' => 'Format del fus horari dels incidents', + 'site-timezone' => 'Seleccioneu el fus horari', + 'site-locale' => 'Idioma del lloc', + 'date-format' => 'Format de la data', + 'incident-date-format' => 'Format del fus horari dels incidents', ], 'security' => [ 'allowed-domains' => 'Dominis permesos', diff --git a/resources/lang/cs/cachet.php b/resources/lang/cs/cachet.php index b1654ab3..10979af6 100644 --- a/resources/lang/cs/cachet.php +++ b/resources/lang/cs/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", - 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', + 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", + 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], ], diff --git a/resources/lang/cs/forms.php b/resources/lang/cs/forms.php index e3e5a103..fd39862d 100644 --- a/resources/lang/cs/forms.php +++ b/resources/lang/cs/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s site id', ], 'localization' => [ - 'site-timezone' => 'Site timezone', - 'site-locale' => 'Site language', - 'date-format' => 'Date format', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Site timezone', + 'site-locale' => 'Site language', + 'date-format' => 'Date format', + 'incident-date-format' => 'Incident timestamp format', ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/da/cachet.php b/resources/lang/da/cachet.php index 4811ed85..cb3deda2 100644 --- a/resources/lang/da/cachet.php +++ b/resources/lang/da/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "Du er blevet inviteret til :app_name status status side, Klik på linket for at oprette dig.\n:link\nTak, :app_name", - 'html' => '

Du er blevet inviteret til :app_name status side, Klik på linket for at oprette dig.

:link

Tak, :app_name

', + 'text' => "Du er blevet inviteret til :app_name status status side, Klik på linket for at oprette dig.\n:link\nTak, :app_name", + 'html' => '

Du er blevet inviteret til :app_name status side, Klik på linket for at oprette dig.

:link

Tak, :app_name

', ], ], ], diff --git a/resources/lang/da/forms.php b/resources/lang/da/forms.php index 4875cd0e..f9f2e602 100644 --- a/resources/lang/da/forms.php +++ b/resources/lang/da/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s site id', ], 'localization' => [ - 'site-timezone' => 'Tidszone', - 'site-locale' => 'Sprog på siden', - 'date-format' => 'Datoformat', - 'incident-date-format' => 'Datoformat for hændelser', + 'site-timezone' => 'Tidszone', + 'site-locale' => 'Sprog på siden', + 'date-format' => 'Datoformat', + 'incident-date-format' => 'Datoformat for hændelser', ], 'security' => [ 'allowed-domains' => 'Tilladte domæner', diff --git a/resources/lang/de/cachet.php b/resources/lang/de/cachet.php index 6791a930..152f8842 100644 --- a/resources/lang/de/cachet.php +++ b/resources/lang/de/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "Du wurdest in das Team :app_name Status Seite eingeladen. Um dich zu registrieren klicke den Link.\n:link\nDanke, :app_name", - 'html' => '

Du wurdest in das Team :app_name Status Seite eingeladen. Um dich zu registrieren klicke den Link.

:link

Danke, :app_name

', + 'text' => "Du wurdest in das Team :app_name Status Seite eingeladen. Um dich zu registrieren klicke den Link.\n:link\nDanke, :app_name", + 'html' => '

Du wurdest in das Team :app_name Status Seite eingeladen. Um dich zu registrieren klicke den Link.

:link

Danke, :app_name

', ], ], ], diff --git a/resources/lang/de/forms.php b/resources/lang/de/forms.php index 3eca40e1..26e51de8 100644 --- a/resources/lang/de/forms.php +++ b/resources/lang/de/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s Seiten-ID', ], 'localization' => [ - 'site-timezone' => 'Zeitzone ihrer Seite', - 'site-locale' => 'Sprache ihrer Seite', - 'date-format' => 'Datumsformat', - 'incident-date-format' => 'Vorfall Zeitstempel-Format', + 'site-timezone' => 'Zeitzone ihrer Seite', + 'site-locale' => 'Sprache ihrer Seite', + 'date-format' => 'Datumsformat', + 'incident-date-format' => 'Vorfall Zeitstempel-Format', ], 'security' => [ 'allowed-domains' => 'Erlaubte Domains', diff --git a/resources/lang/el/cachet.php b/resources/lang/el/cachet.php index 3957dec7..a1fef4d0 100644 --- a/resources/lang/el/cachet.php +++ b/resources/lang/el/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "Έχετε προσκληθεί στη σελίδα ενημερώσεων της ομάδας :app_name, εγγραφείτε στον παρακάτω σύνδεσμο.\n:link\nΕυχαριστούμε, :app_name", - 'html' => '

Έχετε προσκληθεί στη σελίδα ενημερώσεων της ομάδας :app_name, εγγραφείτε στον παρακάτω σύνδεσμο.

:link

Ευχαριστούμε, :app_name

', + 'text' => "Έχετε προσκληθεί στη σελίδα ενημερώσεων της ομάδας :app_name, εγγραφείτε στον παρακάτω σύνδεσμο.\n:link\nΕυχαριστούμε, :app_name", + 'html' => '

Έχετε προσκληθεί στη σελίδα ενημερώσεων της ομάδας :app_name, εγγραφείτε στον παρακάτω σύνδεσμο.

:link

Ευχαριστούμε, :app_name

', ], ], ], diff --git a/resources/lang/el/forms.php b/resources/lang/el/forms.php index 74b55721..3eade087 100644 --- a/resources/lang/el/forms.php +++ b/resources/lang/el/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s site id', ], 'localization' => [ - 'site-timezone' => 'Site timezone', - 'site-locale' => 'Site language', - 'date-format' => 'Date format', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Site timezone', + 'site-locale' => 'Site language', + 'date-format' => 'Date format', + 'incident-date-format' => 'Incident timestamp format', ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/en-UD/cachet.php b/resources/lang/en-UD/cachet.php index 64dfda79..974b32d8 100644 --- a/resources/lang/en-UD/cachet.php +++ b/resources/lang/en-UD/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => 'crwdns553:0crwdne553:0', - 'html' => 'crwdns555:0crwdne555:0', + 'text' => 'crwdns553:0crwdne553:0', + 'html' => 'crwdns555:0crwdne555:0', ], ], ], diff --git a/resources/lang/en-UD/forms.php b/resources/lang/en-UD/forms.php index d5cc70fe..3fe82aea 100644 --- a/resources/lang/en-UD/forms.php +++ b/resources/lang/en-UD/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'crwdns594:0crwdne594:0', ], 'localization' => [ - 'site-timezone' => 'crwdns595:0crwdne595:0', - 'site-locale' => 'crwdns596:0crwdne596:0', - 'date-format' => 'crwdns597:0crwdne597:0', - 'incident-date-format' => 'crwdns598:0crwdne598:0', + 'site-timezone' => 'crwdns595:0crwdne595:0', + 'site-locale' => 'crwdns596:0crwdne596:0', + 'date-format' => 'crwdns597:0crwdne597:0', + 'incident-date-format' => 'crwdns598:0crwdne598:0', ], 'security' => [ 'allowed-domains' => 'crwdns599:0crwdne599:0', diff --git a/resources/lang/en/cachet.php b/resources/lang/en/cachet.php index 0eab0495..c3035a79 100644 --- a/resources/lang/en/cachet.php +++ b/resources/lang/en/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", - 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', + 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", + 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], ], diff --git a/resources/lang/en/forms.php b/resources/lang/en/forms.php index e95d8e56..7d002673 100644 --- a/resources/lang/en/forms.php +++ b/resources/lang/en/forms.php @@ -126,10 +126,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s site id', ], 'localization' => [ - 'site-timezone' => 'Site timezone', - 'site-locale' => 'Site language', - 'date-format' => 'Date format', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Site timezone', + 'site-locale' => 'Site language', + 'date-format' => 'Date format', + 'incident-date-format' => 'Incident timestamp format', ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/es/cachet.php b/resources/lang/es/cachet.php index 8ff5b59c..e7e4e9e0 100644 --- a/resources/lang/es/cachet.php +++ b/resources/lang/es/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "Te han invitado a la página de estado del equipo de :app_name, para registrarte sigue este enlace.\n:link\nGracias, :app_name", - 'html' => '

Has sido invitado a la página de estado del equipo :app_name, para inscribirte sigue el siguiente enlace.

:link

Gracias, :app_name

', + 'text' => "Te han invitado a la página de estado del equipo de :app_name, para registrarte sigue este enlace.\n:link\nGracias, :app_name", + 'html' => '

Has sido invitado a la página de estado del equipo :app_name, para inscribirte sigue el siguiente enlace.

:link

Gracias, :app_name

', ], ], ], diff --git a/resources/lang/es/forms.php b/resources/lang/es/forms.php index 450f21d8..8525a5dd 100644 --- a/resources/lang/es/forms.php +++ b/resources/lang/es/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Id de tu sitio Piwik', ], 'localization' => [ - 'site-timezone' => 'Zona horaria del sitio', - 'site-locale' => 'Idioma del sitio', - 'date-format' => 'Formato de la fecha', - 'incident-date-format' => 'Formato de fecha de incidente', + 'site-timezone' => 'Zona horaria del sitio', + 'site-locale' => 'Idioma del sitio', + 'date-format' => 'Formato de la fecha', + 'incident-date-format' => 'Formato de fecha de incidente', ], 'security' => [ 'allowed-domains' => 'Dominios permitidos', diff --git a/resources/lang/fa/cachet.php b/resources/lang/fa/cachet.php index 80ccbedf..cdb60374 100644 --- a/resources/lang/fa/cachet.php +++ b/resources/lang/fa/cachet.php @@ -92,8 +92,8 @@ return [ 'subject' => '[New Incident] :status: :name', ], 'component' => [ - 'subject' => 'به‌روزرسانی وضعیت کامپوننت', - 'text' => 'کامپوننت :component یک تغییر وضعیت دارد. این کامپوننت هم‌اکنون در حالت :component_human_status قرار دارد.\n + 'subject' => 'به‌روزرسانی وضعیت کامپوننت', + 'text' => 'کامپوننت :component یک تغییر وضعیت دارد. این کامپوننت هم‌اکنون در حالت :component_human_status قرار دارد.\n با تشکر، :app_name', 'html' => '

کامپوننت با نام :component_name یک تغییر وضعیت دارد. کامپوننت هم‌اکنون در حالت :component_human_status قرار دارد.

با تشکر :app_name

', 'tooltip-title' => 'Subscribe to notifications for :component_name.', @@ -104,8 +104,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", - 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', + 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", + 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], ], diff --git a/resources/lang/fa/forms.php b/resources/lang/fa/forms.php index e56f170b..b4d8f997 100644 --- a/resources/lang/fa/forms.php +++ b/resources/lang/fa/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s site id', ], 'localization' => [ - 'site-timezone' => 'Site timezone', - 'site-locale' => 'Site language', - 'date-format' => 'Date format', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Site timezone', + 'site-locale' => 'Site language', + 'date-format' => 'Date format', + 'incident-date-format' => 'Incident timestamp format', ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/fi/cachet.php b/resources/lang/fi/cachet.php index 17c8edd7..4a6f8207 100644 --- a/resources/lang/fi/cachet.php +++ b/resources/lang/fi/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "Sinut on kutsuttu ryhmään :app_name tila sivulle, rekisteröi tästä: \n:link\n. Kiitos, :app_name", - 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', + 'text' => "Sinut on kutsuttu ryhmään :app_name tila sivulle, rekisteröi tästä: \n:link\n. Kiitos, :app_name", + 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], ], diff --git a/resources/lang/fi/forms.php b/resources/lang/fi/forms.php index 5809c4e1..24953e27 100644 --- a/resources/lang/fi/forms.php +++ b/resources/lang/fi/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik sivun tunnus', ], 'localization' => [ - 'site-timezone' => 'Sivuston aikavyöhyke', - 'site-locale' => 'Sivuston kieli', - 'date-format' => 'Päivämäärän muoto', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Sivuston aikavyöhyke', + 'site-locale' => 'Sivuston kieli', + 'date-format' => 'Päivämäärän muoto', + 'incident-date-format' => 'Incident timestamp format', ], 'security' => [ 'allowed-domains' => 'Sallittu toimialueet', diff --git a/resources/lang/fr/cachet.php b/resources/lang/fr/cachet.php index 8582a3eb..ee6aa08f 100644 --- a/resources/lang/fr/cachet.php +++ b/resources/lang/fr/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "Vous avez été invité à la page de statut de l'équipe :app_name , veuillez suivre le lien suivant pour vous inscire \n:link\nMerci, :app_name", - 'html' => '

Vous avez été invité à la page de statut de l\'équipe :app_name, veuillez suivre le lien suivant pour vous inscrire.

:link

Merci, :app_name

', + 'text' => "Vous avez été invité à la page de statut de l'équipe :app_name , veuillez suivre le lien suivant pour vous inscire \n:link\nMerci, :app_name", + 'html' => '

Vous avez été invité à la page de statut de l\'équipe :app_name, veuillez suivre le lien suivant pour vous inscrire.

:link

Merci, :app_name

', ], ], ], diff --git a/resources/lang/fr/forms.php b/resources/lang/fr/forms.php index 46bea63c..a590a54d 100644 --- a/resources/lang/fr/forms.php +++ b/resources/lang/fr/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Id du site de Piwik', ], 'localization' => [ - 'site-timezone' => 'Fuseau horaire du site', - 'site-locale' => 'Langue du site', - 'date-format' => 'Format de la date', - 'incident-date-format' => 'Format de la date de l\'incident', + 'site-timezone' => 'Fuseau horaire du site', + 'site-locale' => 'Langue du site', + 'date-format' => 'Format de la date', + 'incident-date-format' => 'Format de la date de l\'incident', ], 'security' => [ 'allowed-domains' => 'Domaines autorisés', diff --git a/resources/lang/he/cachet.php b/resources/lang/he/cachet.php index ee3e4899..32cee307 100644 --- a/resources/lang/he/cachet.php +++ b/resources/lang/he/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", - 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', + 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", + 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], ], diff --git a/resources/lang/he/forms.php b/resources/lang/he/forms.php index 1c2805c1..abf82eb9 100644 --- a/resources/lang/he/forms.php +++ b/resources/lang/he/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s site id', ], 'localization' => [ - 'site-timezone' => 'Site timezone', - 'site-locale' => 'Site language', - 'date-format' => 'Date format', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Site timezone', + 'site-locale' => 'Site language', + 'date-format' => 'Date format', + 'incident-date-format' => 'Incident timestamp format', ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/hu/cachet.php b/resources/lang/hu/cachet.php index 4a9525d6..a0a1185c 100644 --- a/resources/lang/hu/cachet.php +++ b/resources/lang/hu/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", - 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', + 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", + 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], ], diff --git a/resources/lang/hu/forms.php b/resources/lang/hu/forms.php index 1586c826..9cf7d893 100644 --- a/resources/lang/hu/forms.php +++ b/resources/lang/hu/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s site id', ], 'localization' => [ - 'site-timezone' => 'Site timezone', - 'site-locale' => 'Site language', - 'date-format' => 'Date format', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Site timezone', + 'site-locale' => 'Site language', + 'date-format' => 'Date format', + 'incident-date-format' => 'Incident timestamp format', ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/id/cachet.php b/resources/lang/id/cachet.php index 36934e93..e4ef8ea7 100644 --- a/resources/lang/id/cachet.php +++ b/resources/lang/id/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "Anda diundang dalam tim Halaman Status :app_name, untuk mendaftar silakan klik tautan berikut \n:link\nTerima kasih, :app_name", - 'html' => '

Anda diundang dalam tim Halaman Status :app_name, untuk mendaftar silakan klik tautan berikut.

:link

Terima kasih, :app_name

', + 'text' => "Anda diundang dalam tim Halaman Status :app_name, untuk mendaftar silakan klik tautan berikut \n:link\nTerima kasih, :app_name", + 'html' => '

Anda diundang dalam tim Halaman Status :app_name, untuk mendaftar silakan klik tautan berikut.

:link

Terima kasih, :app_name

', ], ], ], diff --git a/resources/lang/id/forms.php b/resources/lang/id/forms.php index 1d6721a6..a6ebd428 100644 --- a/resources/lang/id/forms.php +++ b/resources/lang/id/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'ID situs Piwik', ], 'localization' => [ - 'site-timezone' => 'Zona Waktu', - 'site-locale' => 'Bahasa', - 'date-format' => 'Format Tanggal', - 'incident-date-format' => 'Format Waktu Insiden', + 'site-timezone' => 'Zona Waktu', + 'site-locale' => 'Bahasa', + 'date-format' => 'Format Tanggal', + 'incident-date-format' => 'Format Waktu Insiden', ], 'security' => [ 'allowed-domains' => 'Domain yang dibolehkan', diff --git a/resources/lang/it/cachet.php b/resources/lang/it/cachet.php index 394934bb..954fdf51 100644 --- a/resources/lang/it/cachet.php +++ b/resources/lang/it/cachet.php @@ -81,8 +81,8 @@ return [ 'failure' => 'Qualcosa è andato storto con l\'iscrizione.', 'already-subscribed' => 'Non è possibile iscrivere :email perchè risulta già iscritto.', 'verify' => [ - 'text' => "Please confirm your email subscription to :app_name status updates.\n:link", - 'html' => '

Please confirm your email subscription to :app_name status updates.

', + 'text' => "Conferma l'iscrizione a :app_name. \n:link", + 'html' => 'Per favore conferma la tua iscrizione tramite email su :app_name', 'button' => 'Conferma iscrizione', ], 'maintenance' => [ @@ -93,8 +93,8 @@ return [ ], 'component' => [ 'subject' => 'Aggiornamento di stato del componente', - 'text' => 'Lo stato del componente: nome_componente è cambiato. Il nuovo stato del componente è :component_human_status.\nGrazie,: app_name', - 'html' => '

Lo stato del componente: nome_componente è cambiato. Il nuovo stato del componente è :component_human_status.

Grazie, :app_name

', + 'text' => 'Lo stato del componente: :component_name è cambiato. Il nuovo stato del componente è :component_human_status.\nGrazie, :app_name', + 'html' => '

Lo stato del componente :component_name è cambiato. Il nuovo stato del componente è :component_human_status.

Grazie, :app_name

', 'tooltip-title' => 'Iscriviti alle notifiche di :component_name.', ], ], @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "Sei stato invitato nel team :app_name status page, per iscriverti segui il prossimo link.\n:link\nGrazie, :app_name", - 'html' => '

Sei stato invitato nel team :app_name status page, per iscriverti segui il prossimo link.

:link

Grazie, :app_name

', + 'text' => "Sei stato invitato nel team :app_name status page, per iscriverti segui il prossimo link.\n:link\nGrazie, :app_name", + 'html' => '

Sei stato invitato nel team :app_name status page, per iscriverti segui il prossimo link.

:link

Grazie, :app_name

', ], ], ], diff --git a/resources/lang/it/forms.php b/resources/lang/it/forms.php index 685a1e2f..9144d580 100644 --- a/resources/lang/it/forms.php +++ b/resources/lang/it/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Id del sito Piwik', ], 'localization' => [ - 'site-timezone' => 'Fuso orario del sito', - 'site-locale' => 'Lingua del sito', - 'date-format' => 'Formato della data', - 'incident-date-format' => 'Formato timestamp della segnalazione', + 'site-timezone' => 'Fuso orario del sito', + 'site-locale' => 'Lingua del sito', + 'date-format' => 'Formato della data', + 'incident-date-format' => 'Formato timestamp della segnalazione', ], 'security' => [ 'allowed-domains' => 'Domini consentiti', diff --git a/resources/lang/ja/cachet.php b/resources/lang/ja/cachet.php index 9a77e629..b67571f9 100644 --- a/resources/lang/ja/cachet.php +++ b/resources/lang/ja/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", - 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', + 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", + 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], ], diff --git a/resources/lang/ja/forms.php b/resources/lang/ja/forms.php index 2e509548..d7ab525b 100644 --- a/resources/lang/ja/forms.php +++ b/resources/lang/ja/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s site id', ], 'localization' => [ - 'site-timezone' => 'Site timezone', - 'site-locale' => 'Site language', - 'date-format' => 'Date format', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Site timezone', + 'site-locale' => 'Site language', + 'date-format' => 'Date format', + 'incident-date-format' => 'Incident timestamp format', ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/ko/cachet.php b/resources/lang/ko/cachet.php index 6e4b3869..f930cb28 100644 --- a/resources/lang/ko/cachet.php +++ b/resources/lang/ko/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => ":app_name 팀의 상태페이지에 초대되었습니다. 가입하시려면 다음 링크를 눌러주세요.\n:link\n감사합니다, :app_name", - 'html' => '

:app_name 팀의 상태페이지에 초대되었습니다. 가입하시려면 다음 링크를 눌러주세요.

+ 'text' => ":app_name 팀의 상태페이지에 초대되었습니다. 가입하시려면 다음 링크를 눌러주세요.\n:link\n감사합니다, :app_name", + 'html' => '

:app_name 팀의 상태페이지에 초대되었습니다. 가입하시려면 다음 링크를 눌러주세요.

:link

감사합니다, :app_name

', ], ], diff --git a/resources/lang/ko/forms.php b/resources/lang/ko/forms.php index 3f3de773..8f5f960e 100644 --- a/resources/lang/ko/forms.php +++ b/resources/lang/ko/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik 사이트 id', ], 'localization' => [ - 'site-timezone' => '사이트 시간대', - 'site-locale' => '사이트 언어', - 'date-format' => '날짜 형식', - 'incident-date-format' => '문제 Timestamp 형식', + 'site-timezone' => '사이트 시간대', + 'site-locale' => '사이트 언어', + 'date-format' => '날짜 형식', + 'incident-date-format' => '문제 Timestamp 형식', ], 'security' => [ 'allowed-domains' => '허용된 도메인', diff --git a/resources/lang/nl/cachet.php b/resources/lang/nl/cachet.php index f568cff0..75ec21b8 100644 --- a/resources/lang/nl/cachet.php +++ b/resources/lang/nl/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "U bent uitgenodigd voor team :app_name status pagina, om u in te schrijven klik op de volgende link.\n:link\nBedankt, :app_name", - 'html' => '

U bent uitgenodigd voor team :app_name status pagina, om u in te schrijven klik op de volgende link.

:link

Bedankt, :app_name

', + 'text' => "U bent uitgenodigd voor team :app_name status pagina, om u in te schrijven klik op de volgende link.\n:link\nBedankt, :app_name", + 'html' => '

U bent uitgenodigd voor team :app_name status pagina, om u in te schrijven klik op de volgende link.

:link

Bedankt, :app_name

', ], ], ], diff --git a/resources/lang/nl/forms.php b/resources/lang/nl/forms.php index cd1b47b0..6d8aa4a0 100644 --- a/resources/lang/nl/forms.php +++ b/resources/lang/nl/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Site-id van Piwik', ], 'localization' => [ - 'site-timezone' => 'Website tijdzone', - 'site-locale' => 'Taal van de site', - 'date-format' => 'Datum formaat', - 'incident-date-format' => 'Incident tijdsaanduiding', + 'site-timezone' => 'Website tijdzone', + 'site-locale' => 'Taal van de site', + 'date-format' => 'Datum formaat', + 'incident-date-format' => 'Incident tijdsaanduiding', ], 'security' => [ 'allowed-domains' => 'Toegestane domeinen', diff --git a/resources/lang/no/cachet.php b/resources/lang/no/cachet.php index 1d267b1f..82260a14 100644 --- a/resources/lang/no/cachet.php +++ b/resources/lang/no/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", - 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', + 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", + 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], ], diff --git a/resources/lang/no/forms.php b/resources/lang/no/forms.php index 76640cff..ccc6feb9 100644 --- a/resources/lang/no/forms.php +++ b/resources/lang/no/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s site id', ], 'localization' => [ - 'site-timezone' => 'Site timezone', - 'site-locale' => 'Site language', - 'date-format' => 'Date format', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Site timezone', + 'site-locale' => 'Site language', + 'date-format' => 'Date format', + 'incident-date-format' => 'Incident timestamp format', ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/pl/cachet.php b/resources/lang/pl/cachet.php index 5977c7e2..5c0879ba 100644 --- a/resources/lang/pl/cachet.php +++ b/resources/lang/pl/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "Zostałeś zaproszony do strony statusowej zespołu :app_name. Aby się zapisać, kliknij na link umieszczony dalej.\n:link\nDziękujemy, :app_name", - 'html' => '

Zostałeś zaproszony do strony statusowej zespołu :app_name. Aby się zapisać, kliknij na link umieszczony dalej.

:link

Dziękujemy, :app_name

', + 'text' => "Zostałeś zaproszony do strony statusowej zespołu :app_name. Aby się zapisać, kliknij na link umieszczony dalej.\n:link\nDziękujemy, :app_name", + 'html' => '

Zostałeś zaproszony do strony statusowej zespołu :app_name. Aby się zapisać, kliknij na link umieszczony dalej.

:link

Dziękujemy, :app_name

', ], ], ], diff --git a/resources/lang/pl/forms.php b/resources/lang/pl/forms.php index 5b8a8593..9c0c1f7f 100644 --- a/resources/lang/pl/forms.php +++ b/resources/lang/pl/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s Seiten-ID', ], 'localization' => [ - 'site-timezone' => 'Zeitzone ihrer Seite', - 'site-locale' => 'Sprache ihrer Seite', - 'date-format' => 'Datumsformat', - 'incident-date-format' => 'Vorfall Zeitstempel-Format', + 'site-timezone' => 'Zeitzone ihrer Seite', + 'site-locale' => 'Sprache ihrer Seite', + 'date-format' => 'Datumsformat', + 'incident-date-format' => 'Vorfall Zeitstempel-Format', ], 'security' => [ 'allowed-domains' => 'Erlaubte Domains', diff --git a/resources/lang/pt-BR/cachet.php b/resources/lang/pt-BR/cachet.php index e8ba2bd8..2f52ea1e 100644 --- a/resources/lang/pt-BR/cachet.php +++ b/resources/lang/pt-BR/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "Você foi convidado para a página de status da equipe :app_name, para se inscrever siga o próximo link.\n:link\nObrigado,: app_name", - 'html' => '

Você foi convidado para a página de status da equipe :app_name, para se inscrever siga o seguinte link.

:link

Obrigado, :app_name

', + 'text' => "Você foi convidado para a página de status da equipe :app_name, para se inscrever siga o próximo link.\n:link\nObrigado,: app_name", + 'html' => '

Você foi convidado para a página de status da equipe :app_name, para se inscrever siga o seguinte link.

:link

Obrigado, :app_name

', ], ], ], diff --git a/resources/lang/pt-BR/forms.php b/resources/lang/pt-BR/forms.php index 8a7f79a5..a633671a 100644 --- a/resources/lang/pt-BR/forms.php +++ b/resources/lang/pt-BR/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Id do site no Piwik', ], 'localization' => [ - 'site-timezone' => 'Fuso horário do site', - 'site-locale' => 'Idioma do site', - 'date-format' => 'Formato da data', - 'incident-date-format' => 'Formato de Hora do Incidente', + 'site-timezone' => 'Fuso horário do site', + 'site-locale' => 'Idioma do site', + 'date-format' => 'Formato da data', + 'incident-date-format' => 'Formato de Hora do Incidente', ], 'security' => [ 'allowed-domains' => 'Domínios permitidos', diff --git a/resources/lang/pt-PT/cachet.php b/resources/lang/pt-PT/cachet.php index d9f3c2bd..1b23057b 100644 --- a/resources/lang/pt-PT/cachet.php +++ b/resources/lang/pt-PT/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "Você foi convidado para a equipa :app_name página de status, para se inscrever siga o próximo link.\n:link\nObrigado, :app_name", - 'html' => '

Foi convidado para a equipa :app_name página de status, para se inscrever siga o seguinte link.

:link

Obrigado, :app_name

', + 'text' => "Você foi convidado para a equipa :app_name página de status, para se inscrever siga o próximo link.\n:link\nObrigado, :app_name", + 'html' => '

Foi convidado para a equipa :app_name página de status, para se inscrever siga o seguinte link.

:link

Obrigado, :app_name

', ], ], ], diff --git a/resources/lang/pt-PT/forms.php b/resources/lang/pt-PT/forms.php index ddecf9a3..cc77da2b 100644 --- a/resources/lang/pt-PT/forms.php +++ b/resources/lang/pt-PT/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'ID do site Piwik', ], 'localization' => [ - 'site-timezone' => 'Fuso horário do site', - 'site-locale' => 'Idioma do site', - 'date-format' => 'Formato da Data', - 'incident-date-format' => 'Formato da Hora do Incidente', + 'site-timezone' => 'Fuso horário do site', + 'site-locale' => 'Idioma do site', + 'date-format' => 'Formato da Data', + 'incident-date-format' => 'Formato da Hora do Incidente', ], 'security' => [ 'allowed-domains' => 'Domínios permitidos', diff --git a/resources/lang/ro/cachet.php b/resources/lang/ro/cachet.php index e0e01642..2a1bd08e 100644 --- a/resources/lang/ro/cachet.php +++ b/resources/lang/ro/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", - 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', + 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", + 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], ], diff --git a/resources/lang/ro/forms.php b/resources/lang/ro/forms.php index e706de8a..e37dce2d 100644 --- a/resources/lang/ro/forms.php +++ b/resources/lang/ro/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s site id', ], 'localization' => [ - 'site-timezone' => 'Site timezone', - 'site-locale' => 'Site language', - 'date-format' => 'Date format', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Site timezone', + 'site-locale' => 'Site language', + 'date-format' => 'Date format', + 'incident-date-format' => 'Incident timestamp format', ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/ru/cachet.php b/resources/lang/ru/cachet.php index d724a20a..870cbc95 100644 --- a/resources/lang/ru/cachet.php +++ b/resources/lang/ru/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "Вас пригласили в команду управления статусной страницей :app_name, перейдите по следующей ссылке, чтобы зарегистрироваться.\n:link\nБлагодарим за внимание, :app_name", - 'html' => '

Вас пригласили в команду управления статусной страницей :app_name, перейдите по следующей ссылке, чтобы зарегистрироваться.

:link

Благодарим за внимание, :app_name

', + 'text' => "Вас пригласили в команду управления статусной страницей :app_name, перейдите по следующей ссылке, чтобы зарегистрироваться.\n:link\nБлагодарим за внимание, :app_name", + 'html' => '

Вас пригласили в команду управления статусной страницей :app_name, перейдите по следующей ссылке, чтобы зарегистрироваться.

:link

Благодарим за внимание, :app_name

', ], ], ], diff --git a/resources/lang/ru/forms.php b/resources/lang/ru/forms.php index 4b49c2d6..f8db14d2 100644 --- a/resources/lang/ru/forms.php +++ b/resources/lang/ru/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Идентификатор сайта в Piwik', ], 'localization' => [ - 'site-timezone' => 'Часовой пояс сайта', - 'site-locale' => 'Язык сайта', - 'date-format' => 'Формат даты', - 'incident-date-format' => 'Формат даты и времени для инцидента', + 'site-timezone' => 'Часовой пояс сайта', + 'site-locale' => 'Язык сайта', + 'date-format' => 'Формат даты', + 'incident-date-format' => 'Формат даты и времени для инцидента', ], 'security' => [ 'allowed-domains' => 'Разрешённые домены', diff --git a/resources/lang/sq/cachet.php b/resources/lang/sq/cachet.php index 79080207..ea5f7fdf 100644 --- a/resources/lang/sq/cachet.php +++ b/resources/lang/sq/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", - 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', + 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", + 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], ], diff --git a/resources/lang/sq/forms.php b/resources/lang/sq/forms.php index 3149b3fc..6b01fff9 100644 --- a/resources/lang/sq/forms.php +++ b/resources/lang/sq/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s site id', ], 'localization' => [ - 'site-timezone' => 'Site timezone', - 'site-locale' => 'Site language', - 'date-format' => 'Date format', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Site timezone', + 'site-locale' => 'Site language', + 'date-format' => 'Date format', + 'incident-date-format' => 'Incident timestamp format', ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/sr/cachet.php b/resources/lang/sr/cachet.php index f8a1cd83..321ffaba 100644 --- a/resources/lang/sr/cachet.php +++ b/resources/lang/sr/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", - 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', + 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", + 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], ], diff --git a/resources/lang/sr/forms.php b/resources/lang/sr/forms.php index e706de8a..e37dce2d 100644 --- a/resources/lang/sr/forms.php +++ b/resources/lang/sr/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s site id', ], 'localization' => [ - 'site-timezone' => 'Site timezone', - 'site-locale' => 'Site language', - 'date-format' => 'Date format', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Site timezone', + 'site-locale' => 'Site language', + 'date-format' => 'Date format', + 'incident-date-format' => 'Incident timestamp format', ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/sv-SE/cachet.php b/resources/lang/sv-SE/cachet.php index dfa682c3..379b6a20 100644 --- a/resources/lang/sv-SE/cachet.php +++ b/resources/lang/sv-SE/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "Du har blivit inbjuden till teamet för :app_names statussida, registrera dig genom att trycka på länken.\n:link\nTack, :app_name", - 'html' => '

Du har blivit inbjuden till teamet :app_names statussida. Registrera dig genom att trycka på den här länken

Tack, :app_name

', + 'text' => "Du har blivit inbjuden till teamet för :app_names statussida, registrera dig genom att trycka på länken.\n:link\nTack, :app_name", + 'html' => '

Du har blivit inbjuden till teamet :app_names statussida. Registrera dig genom att trycka på den här länken

Tack, :app_name

', ], ], ], diff --git a/resources/lang/sv-SE/forms.php b/resources/lang/sv-SE/forms.php index 56dd1579..d361de4d 100644 --- a/resources/lang/sv-SE/forms.php +++ b/resources/lang/sv-SE/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s sajt-id', ], 'localization' => [ - 'site-timezone' => 'Webbplatsens tidszon', - 'site-locale' => 'Webbplatsspråk', - 'date-format' => 'Datumformat', - 'incident-date-format' => 'Händelsens tidsstämpelformat', + 'site-timezone' => 'Webbplatsens tidszon', + 'site-locale' => 'Webbplatsspråk', + 'date-format' => 'Datumformat', + 'incident-date-format' => 'Händelsens tidsstämpelformat', ], 'security' => [ 'allowed-domains' => 'Tillåtna domäner', diff --git a/resources/lang/tr/cachet.php b/resources/lang/tr/cachet.php index 9c89fd04..5caccfd8 100644 --- a/resources/lang/tr/cachet.php +++ b/resources/lang/tr/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", - 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', + 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", + 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], ], diff --git a/resources/lang/tr/forms.php b/resources/lang/tr/forms.php index 1fadf9f0..f4fde2e5 100644 --- a/resources/lang/tr/forms.php +++ b/resources/lang/tr/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s site id', ], 'localization' => [ - 'site-timezone' => 'Site timezone', - 'site-locale' => 'Site language', - 'date-format' => 'Date format', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Site timezone', + 'site-locale' => 'Site language', + 'date-format' => 'Date format', + 'incident-date-format' => 'Incident timestamp format', ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/uk/cachet.php b/resources/lang/uk/cachet.php index 5fed6c5f..146db2af 100644 --- a/resources/lang/uk/cachet.php +++ b/resources/lang/uk/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", - 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', + 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", + 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], ], diff --git a/resources/lang/uk/forms.php b/resources/lang/uk/forms.php index 7db00e87..84db8f65 100644 --- a/resources/lang/uk/forms.php +++ b/resources/lang/uk/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'id сайту Piwik', ], 'localization' => [ - 'site-timezone' => 'Часовий пояс сайту', - 'site-locale' => 'Мова сайту', - 'date-format' => 'формат дати', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Часовий пояс сайту', + 'site-locale' => 'Мова сайту', + 'date-format' => 'формат дати', + 'incident-date-format' => 'Incident timestamp format', ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/vi/cachet.php b/resources/lang/vi/cachet.php index cdd1216a..fcd74978 100644 --- a/resources/lang/vi/cachet.php +++ b/resources/lang/vi/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", - 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', + 'text' => "You have been invited to the team :app_name status page, to sign up follow the next link.\n:link\nThank you, :app_name", + 'html' => '

You have been invited to the team :app_name status page, to sign up follow the next link.

:link

Thank you, :app_name

', ], ], ], diff --git a/resources/lang/vi/forms.php b/resources/lang/vi/forms.php index 1df3dcab..60215709 100644 --- a/resources/lang/vi/forms.php +++ b/resources/lang/vi/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik\'s site id', ], 'localization' => [ - 'site-timezone' => 'Múi giờ', - 'site-locale' => 'Ngôn ngữ', - 'date-format' => 'Định dạng ngày', - 'incident-date-format' => 'Incident timestamp format', + 'site-timezone' => 'Múi giờ', + 'site-locale' => 'Ngôn ngữ', + 'date-format' => 'Định dạng ngày', + 'incident-date-format' => 'Incident timestamp format', ], 'security' => [ 'allowed-domains' => 'Allowed domains', diff --git a/resources/lang/zh-CN/cachet.php b/resources/lang/zh-CN/cachet.php index 1973dfa1..2f14285a 100644 --- a/resources/lang/zh-CN/cachet.php +++ b/resources/lang/zh-CN/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "您已被邀请加入 :app_name 团队的状态页, 请点击以下链接进行注册。\n:link\n谢谢, :app_name", - 'html' => '

您已被邀请加入 :app_name 团队的状态页, 请点击以下链接进行注册。

:link

谢谢, :app_name

', + 'text' => "您已被邀请加入 :app_name 团队的状态页, 请点击以下链接进行注册。\n:link\n谢谢, :app_name", + 'html' => '

您已被邀请加入 :app_name 团队的状态页, 请点击以下链接进行注册。

:link

谢谢, :app_name

', ], ], ], diff --git a/resources/lang/zh-CN/forms.php b/resources/lang/zh-CN/forms.php index 02484c25..34a24196 100644 --- a/resources/lang/zh-CN/forms.php +++ b/resources/lang/zh-CN/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik 的站点 id', ], 'localization' => [ - 'site-timezone' => '系统时区', - 'site-locale' => '系统语言', - 'date-format' => '日期格式', - 'incident-date-format' => '故障的时间显示格式', + 'site-timezone' => '系统时区', + 'site-locale' => '系统语言', + 'date-format' => '日期格式', + 'incident-date-format' => '故障的时间显示格式', ], 'security' => [ 'allowed-domains' => '允许的域', diff --git a/resources/lang/zh-TW/cachet.php b/resources/lang/zh-TW/cachet.php index 5fe15448..d9a31dcf 100644 --- a/resources/lang/zh-TW/cachet.php +++ b/resources/lang/zh-TW/cachet.php @@ -103,8 +103,8 @@ return [ 'users' => [ 'email' => [ 'invite' => [ - 'text' => "您已被邀請加入 :app_name 團隊的狀態頁, 請點擊以下鏈接進行註冊。\n:link\n謝謝, :app_name", - 'html' => '

您已被邀請加入 :app_name 團隊的狀態頁, 請點擊以下鏈接進行註冊。

:link

謝謝, :app_name

', + 'text' => "您已被邀請加入 :app_name 團隊的狀態頁, 請點擊以下鏈接進行註冊。\n:link\n謝謝, :app_name", + 'html' => '

您已被邀請加入 :app_name 團隊的狀態頁, 請點擊以下鏈接進行註冊。

:link

謝謝, :app_name

', ], ], ], diff --git a/resources/lang/zh-TW/forms.php b/resources/lang/zh-TW/forms.php index 7d4bb127..420ea135 100644 --- a/resources/lang/zh-TW/forms.php +++ b/resources/lang/zh-TW/forms.php @@ -118,10 +118,10 @@ return [ 'analytics_piwik_siteid' => 'Piwik 的站點 id', ], 'localization' => [ - 'site-timezone' => '站點時區', - 'site-locale' => '站點語言', - 'date-format' => '日期格式', - 'incident-date-format' => '事件的時間戳格式', + 'site-timezone' => '站點時區', + 'site-locale' => '站點語言', + 'date-format' => '日期格式', + 'incident-date-format' => '事件的時間戳格式', ], 'security' => [ 'allowed-domains' => '允許的域', diff --git a/resources/views/partials/metrics.blade.php b/resources/views/partials/metrics.blade.php index 3de77fd4..e8753243 100644 --- a/resources/views/partials/metrics.blade.php +++ b/resources/views/partials/metrics.blade.php @@ -81,7 +81,6 @@ data: { labels: _.keys(data), datasets: [{ - label: result.data.metric.name, data: _.values(data), backgroundColor: "{{ $theme_metrics }}", borderColor: "{{ color_darken($theme_metrics, -0.1) }}", @@ -97,7 +96,7 @@ ticks: { beginAtZero: true, suggestedMax: 0.1, - fixedStepSize: result.data.metric.places, + // fixedStepSize: result.data.metric.places, callback: function(tickValue, index, ticks) { var delta = ticks[1] - ticks[0]; @@ -126,8 +125,8 @@ }, tooltips: { callbacks: { - afterLabel: function(tooltipItem, data) { - return " " + result.data.metric.suffix; + label: function(tooltipItem, data) { + return tooltipItem.yLabel + ' ' + result.data.metric.suffix; } } }