mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-17 21:49:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/cachethq/master'

Browse Source
This commit is contained in:
Theo Bearman 2015-10-29 10:55:43 +00:00
commit 148268d294
10 changed files with 162 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/Handlers/Commands/Incident/ReportIncidentCommandHandler.php
View File

@ -29,24 +29,29 @@ class ReportIncidentCommandHandler
*/
public function handle(ReportIncidentCommand $command)
{
$incident = Incident::create([
'name' => $command->name,
'status' => $command->status,
'message' => $command->message,
'visible' => $command->visible,
'component_id' => $command->component_id,
]);
$data = [
'name' => $command->name,
'status' => $command->status,
'message' => $command->message,
'visible' => $command->visible,
];
// Link with the component.
if ($command->component_id) {
$data['component_id'] = $command->component_id;
}
// The incident occurred at a different time.
if ($command->incident_date) {
$incidentDate = Date::createFromFormat('d/m/Y H:i', $command->incident_date, config('cachet.timezone'))->setTimezone(Config::get('app.timezone'));
$incident->update([
'created_at' => $incidentDate,
'updated_at' => $incidentDate,
]);
$data['created_at'] = $incidentDate;
$data['updated_at'] = $incidentDate;
}
// Create the incident
$incident = Incident::create($data);
// Update the component.
if ($command->component_id) {
Component::find($command->component_id)->update([

9
composer.json
View File

@ -1,7 +1,7 @@
{
"name": "cachethq/cachet",
"description": "An open source status page system written in PHP",
"keywords": ["status", "page", "updates", "cachet", "Cachet", "Cachet HQ", "CachetHQ"],
"description": "An open source status page system, for everyone.",
"keywords": ["laravel", "cachet", "alt-three", "status", "page"],
"type": "project",
"license": "BSD-3-Clause",
"authors": [
@ -20,7 +20,7 @@
],
"require": {
"php": ">=5.5.9",
"laravel/framework": "~5.1.21",
"laravel/framework": "~5.1.22",
"alt-three/emoji": "^2.0",
"alt-three/validator": "^1.3",
"barryvdh/laravel-cors": "^0.5",
@ -41,8 +41,7 @@
"fzaninotto/faker": "^1.5",
"graham-campbell/testbench-core": "^1.0",
"mockery/mockery": "^0.9.4",
"phpunit/phpunit": "^4.8",
"laravel/homestead": "dev-master"
"phpunit/phpunit": "^4.8"
},
"autoload": {
"classmap": [

232
composer.lock generated
View File

@ -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": "808889ff0578ec15dc29147f7a67dac3",
"content-hash": "b19341dfee79e35385a405adb5e36dc9",
"hash": "a4eef596c454efc5520a7dd952f979b4",
"content-hash": "19769a302d94a2ef4f3b5d42769eca2b",
"packages": [
{
"name": "alt-three/emoji",
@ -434,16 +434,16 @@
},
{
"name": "doctrine/cache",
"version": "v1.4.2",
"version": "v1.5.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
"reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca"
"reference": "eb8a73619af4f1c8711e2ce482f5de3643258a1f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/8c434000f420ade76a07c64cbe08ca47e5c101ca",
"reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca",
"url": "https://api.github.com/repos/doctrine/cache/zipball/eb8a73619af4f1c8711e2ce482f5de3643258a1f",
"reference": "eb8a73619af4f1c8711e2ce482f5de3643258a1f",
"shasum": ""
},
"require": {
@ -464,8 +464,8 @@
}
},
"autoload": {
"psr-0": {
"Doctrine\\Common\\Cache\\": "lib/"
"psr-4": {
"Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -500,7 +500,7 @@
"cache",
"caching"
],
"time": "2015-08-31 12:36:41"
"time": "2015-10-28 11:27:45"
},
{
"name": "doctrine/collections",
@ -1683,16 +1683,16 @@
},
{
"name": "laravel/framework",
"version": "5.1.x-dev",
"version": "v5.1.22",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "ea5f078bbbdf7e06bac8b107bdaae50940fef567"
"reference": "11d9627c7cd4d12b6e884b87daa7a2f898cf54cb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/ea5f078bbbdf7e06bac8b107bdaae50940fef567",
"reference": "ea5f078bbbdf7e06bac8b107bdaae50940fef567",
"url": "https://api.github.com/repos/laravel/framework/zipball/11d9627c7cd4d12b6e884b87daa7a2f898cf54cb",
"reference": "11d9627c7cd4d12b6e884b87daa7a2f898cf54cb",
"shasum": ""
},
"require": {
@ -1808,7 +1808,7 @@
"framework",
"laravel"
],
"time": "2015-10-23 16:07:56"
"time": "2015-10-28 21:58:18"
},
{
"name": "league/commonmark",
@ -2597,16 +2597,16 @@
},
{
"name": "symfony/console",
"version": "v2.7.5",
"version": "v2.7.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
"reference": "06cb17c013a82f94a3d840682b49425cd00a2161"
"reference": "5efd632294c8320ea52492db22292ff853a43766"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/console/zipball/06cb17c013a82f94a3d840682b49425cd00a2161",
"reference": "06cb17c013a82f94a3d840682b49425cd00a2161",
"url": "https://api.github.com/repos/symfony/console/zipball/5efd632294c8320ea52492db22292ff853a43766",
"reference": "5efd632294c8320ea52492db22292ff853a43766",
"shasum": ""
},
"require": {
@ -2615,7 +2615,6 @@
"require-dev": {
"psr/log": "~1.0",
"symfony/event-dispatcher": "~2.1",
"symfony/phpunit-bridge": "~2.7",
"symfony/process": "~2.1"
},
"suggest": {
@ -2650,28 +2649,25 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
"time": "2015-09-25 08:32:23"
"time": "2015-10-20 14:38:46"
},
{
"name": "symfony/css-selector",
"version": "v2.7.5",
"version": "v2.7.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/css-selector.git",
"reference": "abe19cc0429a06be0c133056d1f9859854860970"
"reference": "e1b865b26be4a56d22a8dee398375044a80c865b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/abe19cc0429a06be0c133056d1f9859854860970",
"reference": "abe19cc0429a06be0c133056d1f9859854860970",
"url": "https://api.github.com/repos/symfony/css-selector/zipball/e1b865b26be4a56d22a8dee398375044a80c865b",
"reference": "e1b865b26be4a56d22a8dee398375044a80c865b",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
},
"type": "library",
"extra": {
"branch-alias": {
@ -2703,20 +2699,20 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
"time": "2015-09-22 13:49:29"
"time": "2015-10-11 09:39:48"
},
{
"name": "symfony/debug",
"version": "v2.7.5",
"version": "v2.7.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/debug.git",
"reference": "c79c361bca8e5ada6a47603875a3c964d03b67b1"
"reference": "fb9e6887db716939f41af0ba8ef38a1582eb501b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/debug/zipball/c79c361bca8e5ada6a47603875a3c964d03b67b1",
"reference": "c79c361bca8e5ada6a47603875a3c964d03b67b1",
"url": "https://api.github.com/repos/symfony/debug/zipball/fb9e6887db716939f41af0ba8ef38a1582eb501b",
"reference": "fb9e6887db716939f41af0ba8ef38a1582eb501b",
"shasum": ""
},
"require": {
@ -2728,8 +2724,7 @@
},
"require-dev": {
"symfony/class-loader": "~2.2",
"symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2",
"symfony/phpunit-bridge": "~2.7"
"symfony/http-kernel": "~2.3.24|~2.5.9|~2.6,>=2.6.2"
},
"type": "library",
"extra": {
@ -2758,28 +2753,27 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
"time": "2015-09-14 08:41:38"
"time": "2015-10-11 09:39:48"
},
{
"name": "symfony/dom-crawler",
"version": "v2.7.5",
"version": "v2.7.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/dom-crawler.git",
"reference": "2e185ca136399f902b948694987e62c80099c052"
"reference": "5fef7d8b80d8f9992df99d8ee283f420484c9612"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/2e185ca136399f902b948694987e62c80099c052",
"reference": "2e185ca136399f902b948694987e62c80099c052",
"url": "https://api.github.com/repos/symfony/dom-crawler/zipball/5fef7d8b80d8f9992df99d8ee283f420484c9612",
"reference": "5fef7d8b80d8f9992df99d8ee283f420484c9612",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"require-dev": {
"symfony/css-selector": "~2.3",
"symfony/phpunit-bridge": "~2.7"
"symfony/css-selector": "~2.3"
},
"suggest": {
"symfony/css-selector": ""
@ -2811,20 +2805,20 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
"time": "2015-09-20 21:13:58"
"time": "2015-10-11 09:39:48"
},
{
"name": "symfony/event-dispatcher",
"version": "v2.7.5",
"version": "v2.7.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/event-dispatcher.git",
"reference": "ae4dcc2a8d3de98bd794167a3ccda1311597c5d9"
"reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/ae4dcc2a8d3de98bd794167a3ccda1311597c5d9",
"reference": "ae4dcc2a8d3de98bd794167a3ccda1311597c5d9",
"url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/87a5db5ea887763fa3a31a5471b512ff1596d9b8",
"reference": "87a5db5ea887763fa3a31a5471b512ff1596d9b8",
"shasum": ""
},
"require": {
@ -2835,7 +2829,6 @@
"symfony/config": "~2.0,>=2.0.5",
"symfony/dependency-injection": "~2.6",
"symfony/expression-language": "~2.6",
"symfony/phpunit-bridge": "~2.7",
"symfony/stopwatch": "~2.3"
},
"suggest": {
@ -2869,28 +2862,25 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
"time": "2015-09-22 13:49:29"
"time": "2015-10-11 09:39:48"
},
{
"name": "symfony/finder",
"version": "v2.7.5",
"version": "v2.7.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/finder.git",
"reference": "8262ab605973afbb3ef74b945daabf086f58366f"
"reference": "2ffb4e9598db3c48eb6d0ae73b04bbf09280c59d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/finder/zipball/8262ab605973afbb3ef74b945daabf086f58366f",
"reference": "8262ab605973afbb3ef74b945daabf086f58366f",
"url": "https://api.github.com/repos/symfony/finder/zipball/2ffb4e9598db3c48eb6d0ae73b04bbf09280c59d",
"reference": "2ffb4e9598db3c48eb6d0ae73b04bbf09280c59d",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
},
"type": "library",
"extra": {
"branch-alias": {
@ -2918,28 +2908,27 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
"time": "2015-09-19 19:59:23"
"time": "2015-10-11 09:39:48"
},
{
"name": "symfony/http-foundation",
"version": "v2.7.5",
"version": "v2.7.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
"reference": "e1509119f164a0d0a940d7d924d693a7a28a5470"
"reference": "7598eea151ae3d4134df1f9957364b17809eea75"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/e1509119f164a0d0a940d7d924d693a7a28a5470",
"reference": "e1509119f164a0d0a940d7d924d693a7a28a5470",
"url": "https://api.github.com/repos/symfony/http-foundation/zipball/7598eea151ae3d4134df1f9957364b17809eea75",
"reference": "7598eea151ae3d4134df1f9957364b17809eea75",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"require-dev": {
"symfony/expression-language": "~2.4",
"symfony/phpunit-bridge": "~2.7"
"symfony/expression-language": "~2.4"
},
"type": "library",
"extra": {
@ -2971,20 +2960,20 @@
],
"description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com",
"time": "2015-09-22 13:49:29"
"time": "2015-10-23 14:47:27"
},
{
"name": "symfony/http-kernel",
"version": "v2.7.5",
"version": "v2.7.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
"reference": "353aa457424262d7d4e4289ea483145921cffcb5"
"reference": "4260f2273a446a6715063dc9ca89fd0c475c2f77"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/353aa457424262d7d4e4289ea483145921cffcb5",
"reference": "353aa457424262d7d4e4289ea483145921cffcb5",
"url": "https://api.github.com/repos/symfony/http-kernel/zipball/4260f2273a446a6715063dc9ca89fd0c475c2f77",
"reference": "4260f2273a446a6715063dc9ca89fd0c475c2f77",
"shasum": ""
},
"require": {
@ -3007,7 +2996,6 @@
"symfony/dom-crawler": "~2.0,>=2.0.5",
"symfony/expression-language": "~2.4",
"symfony/finder": "~2.0,>=2.0.5",
"symfony/phpunit-bridge": "~2.7",
"symfony/process": "~2.0,>=2.0.5",
"symfony/routing": "~2.2",
"symfony/stopwatch": "~2.3",
@ -3051,28 +3039,25 @@
],
"description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com",
"time": "2015-09-25 11:16:52"
"time": "2015-10-27 19:07:21"
},
{
"name": "symfony/process",
"version": "v2.7.5",
"version": "v2.7.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/process.git",
"reference": "b27c8e317922cd3cdd3600850273cf6b82b2e8e9"
"reference": "4a959dd4e19c2c5d7512689413921e0a74386ec7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/process/zipball/b27c8e317922cd3cdd3600850273cf6b82b2e8e9",
"reference": "b27c8e317922cd3cdd3600850273cf6b82b2e8e9",
"url": "https://api.github.com/repos/symfony/process/zipball/4a959dd4e19c2c5d7512689413921e0a74386ec7",
"reference": "4a959dd4e19c2c5d7512689413921e0a74386ec7",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
},
"type": "library",
"extra": {
"branch-alias": {
@ -3100,20 +3085,20 @@
],
"description": "Symfony Process Component",
"homepage": "https://symfony.com",
"time": "2015-09-19 19:59:23"
"time": "2015-10-23 14:47:27"
},
{
"name": "symfony/routing",
"version": "v2.7.5",
"version": "v2.7.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/routing.git",
"reference": "6c5fae83efa20baf166fcf4582f57094e9f60f16"
"reference": "f353e1f588679c3ec987624e6c617646bd01ba38"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/routing/zipball/6c5fae83efa20baf166fcf4582f57094e9f60f16",
"reference": "6c5fae83efa20baf166fcf4582f57094e9f60f16",
"url": "https://api.github.com/repos/symfony/routing/zipball/f353e1f588679c3ec987624e6c617646bd01ba38",
"reference": "f353e1f588679c3ec987624e6c617646bd01ba38",
"shasum": ""
},
"require": {
@ -3129,7 +3114,6 @@
"symfony/config": "~2.7",
"symfony/expression-language": "~2.4",
"symfony/http-foundation": "~2.3",
"symfony/phpunit-bridge": "~2.7",
"symfony/yaml": "~2.0,>=2.0.5"
},
"suggest": {
@ -3171,20 +3155,20 @@
"uri",
"url"
],
"time": "2015-09-14 14:14:09"
"time": "2015-10-27 15:38:06"
},
{
"name": "symfony/translation",
"version": "v2.7.5",
"version": "v2.7.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/translation.git",
"reference": "485877661835e188cd78345c6d4eef1290d17571"
"reference": "6ccd9289ec1c71d01a49d83480de3b5293ce30c8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/translation/zipball/485877661835e188cd78345c6d4eef1290d17571",
"reference": "485877661835e188cd78345c6d4eef1290d17571",
"url": "https://api.github.com/repos/symfony/translation/zipball/6ccd9289ec1c71d01a49d83480de3b5293ce30c8",
"reference": "6ccd9289ec1c71d01a49d83480de3b5293ce30c8",
"shasum": ""
},
"require": {
@ -3197,7 +3181,6 @@
"psr/log": "~1.0",
"symfony/config": "~2.7",
"symfony/intl": "~2.4",
"symfony/phpunit-bridge": "~2.7",
"symfony/yaml": "~2.2"
},
"suggest": {
@ -3232,28 +3215,25 @@
],
"description": "Symfony Translation Component",
"homepage": "https://symfony.com",
"time": "2015-09-06 08:36:38"
"time": "2015-10-27 15:38:06"
},
{
"name": "symfony/var-dumper",
"version": "v2.7.5",
"version": "v2.7.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-dumper.git",
"reference": "ba8c9a0edf18f70a7efcb8d3eb35323a10263338"
"reference": "eb033050050916b6bfa51be71009ef67b16046c9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/ba8c9a0edf18f70a7efcb8d3eb35323a10263338",
"reference": "ba8c9a0edf18f70a7efcb8d3eb35323a10263338",
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/eb033050050916b6bfa51be71009ef67b16046c9",
"reference": "eb033050050916b6bfa51be71009ef67b16046c9",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
},
"suggest": {
"ext-symfony_debug": ""
},
@ -3291,7 +3271,7 @@
"debug",
"dump"
],
"time": "2015-09-22 14:41:01"
"time": "2015-10-25 17:17:38"
},
{
"name": "vlucas/phpdotenv",
@ -3552,47 +3532,6 @@
],
"time": "2015-05-11 14:41:42"
},
{
"name": "laravel/homestead",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/laravel/homestead.git",
"reference": "92308796309767bbde56669b334ef4b7dd4b31e0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/homestead/zipball/92308796309767bbde56669b334ef4b7dd4b31e0",
"reference": "92308796309767bbde56669b334ef4b7dd4b31e0",
"shasum": ""
},
"require": {
"php": ">=5.4",
"symfony/console": "~2.0",
"symfony/process": "~2.0"
},
"bin": [
"homestead"
],
"type": "library",
"autoload": {
"psr-4": {
"Laravel\\Homestead\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Taylor Otwell",
"email": "taylorotwell@gmail.com"
}
],
"description": "A virtual machine for web artisans.",
"time": "2015-10-19 21:21:09"
},
{
"name": "mockery/mockery",
"version": "0.9.4",
@ -4508,24 +4447,21 @@
},
{
"name": "symfony/yaml",
"version": "v2.7.5",
"version": "v2.7.6",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
"reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770"
"reference": "eca9019c88fbe250164affd107bc8057771f3f4d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/yaml/zipball/31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
"reference": "31cb2ad0155c95b88ee55fe12bc7ff92232c1770",
"url": "https://api.github.com/repos/symfony/yaml/zipball/eca9019c88fbe250164affd107bc8057771f3f4d",
"reference": "eca9019c88fbe250164affd107bc8057771f3f4d",
"shasum": ""
},
"require": {
"php": ">=5.3.9"
},
"require-dev": {
"symfony/phpunit-bridge": "~2.7"
},
"type": "library",
"extra": {
"branch-alias": {
@ -4553,14 +4489,12 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
"time": "2015-09-14 14:14:09"
"time": "2015-10-11 09:39:48"
}
],
"aliases": [],
"minimum-stability": "dev",
"stability-flags": {
"laravel/homestead": 20
},
"stability-flags": [],
"prefer-stable": true,
"prefer-lowest": false,
"platform": {

28
resources/lang/de/auth.php Normal file
View File

@ -0,0 +1,28 @@
<?php
/*
* This file is part of Cachet.
*
* (c) Alt Three Services Limited
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
return [
/*
|--------------------------------------------------------------------------
| Authentication Language Lines
|--------------------------------------------------------------------------
|
| The following language lines are used during authentication for various
| messages that we need to display to the user. You are free to modify
| these language lines according to your application's requirements.
|
*/
'failed' => 'Diese Zugangsdaten stimmen nicht mit unseren überein.',
'throttle' => 'Zu viele Login-Versuche. Bitte versuchen Sie es in :seconds Sekunden erneut.',
];

0
resources/lang/de/reminders.php → resources/lang/de/passwords.php
View File

16
resources/lang/en/cachet.php
View File

@ -22,11 +22,11 @@ return [
// Incidents
'incidents' => [
'none' => 'No incidents reported.',
'none' => 'No Incidents Reported.',
'past' => 'Past incidents',
'previous_week' => 'Previous week',
'next_week' => 'Next week',
'none' => 'Nothing to report',
'previous_week' => 'Previous Week',
'next_week' => 'Next Week',
'none' => 'Nothing to report.',
'scheduled' => 'Scheduled Maintenance',
'scheduled_at' => ', scheduled :timestamp',
'status' => [
@ -40,8 +40,8 @@ return [
// Service Status
'service' => [
'good' => 'All systems are functional.',
'bad' => 'Some systems are experiencing issues.',
'good' => 'All Systems Are Functional',
'bad' => 'Some Systems Are Experiencing Issues',
],
'api' => [
@ -60,7 +60,7 @@ return [
// Subscriber
'subscriber' => [
'subscribe' => 'Subscribe to get the most recent updates.',
'subscribe' => 'Subscribe to Get the Most Recent Updates',
'button' => 'Subscribe',
'email' => [
'subscribe' => 'Subscribe to email updates.',
@ -89,7 +89,7 @@ return [
// Other
'powered_by' => ':app Status Page is powered by <a href="https://cachethq.io" class="links">Cachet</a>.',
'about_this_site' => 'About this site',
'about_this_site' => 'About This Site',
'rss-feed' => 'RSS',
'atom-feed' => 'Atom',
'feed' => 'Status Feed',

19
resources/lang/ru/cachet.php
View File

@ -26,7 +26,6 @@ return [
'past' => 'Прошлые инциденты',
'previous_week' => 'Прошлая неделя',
'next_week' => 'Следующая неделя',
'none' => 'Инцидентов не происходило.',
'scheduled' => 'Запланированное обслуживание',
'scheduled_at' => ', запланировано :timestamp',
'status' => [
@ -46,15 +45,15 @@ return [
'api' => [
'regenerate' => 'Сгенерировать ключ API',
'revoke' => 'Отозвать API ключ',
'revoke' => 'Отозвать ключ API',
],
// Metrics
'metrics' => [
'filter' => [
'hourly' => 'Last 12 Hours',
'weekly' => 'Week',
'monthly' => 'Month',
'hourly' => 'Последние 12 часов',
'weekly' => 'Неделя',
'monthly' => 'Месяц',
],
],
@ -64,7 +63,7 @@ return [
'button' => 'Подписаться',
'email' => [
'subscribe' => 'Подписка на рассылку об изменениях.',
'subscribed' => 'Вы подписались на рассылку email уведомлений. Проверьте вашу почту, чтобы подтвердить подписку.',
'subscribed' => 'Вы подписались на рассылку уведомлений по эл. почте. Проверьте ваш почтовый ящик, чтобы подтвердить подписку.',
'verified' => 'Ваша подписка подтверждена. Спасибо!',
'unsubscribe' => 'Отписаться от рассылки.',
'unsubscribed' => 'Ваша подписка отменена.',
@ -88,10 +87,10 @@ return [
],
// Other
'powered_by' => ':app Статусная страница работает на <a href="https://cachethq.io">Cachet</a>.',
'powered_by' => ':app Статусная страница работает на <a href="https://cachethq.io">Cachet</a>.',
'about_this_site' => 'Об этом сайте',
'rss-feed' => 'RSS фид',
'atom-feed' => 'Atom фид',
'feed' => 'Статус фид',
'rss-feed' => 'RSS-лента',
'atom-feed' => 'Atom-лента',
'feed' => 'Лента статуса',
];

10
resources/lang/ru/dashboard.php
View File

@ -15,7 +15,7 @@ return [
// Incidents
'incidents' => [
'title' => 'Инциденты и Плановые работы',
'title' => 'Инциденты и плановые работы',
'incidents' => 'Инциденты',
'logged' => '{0} Нет инцидентов, отличная работа!|У вас записан один инцидент.|Записано инцидентов: <strong>:count</strong>',
'incident-create-template' => 'Создать шаблон',
@ -41,7 +41,7 @@ return [
],
'edit' => [
'title' => 'Редактировать шаблон',
'success' => 'Шаблон обновлен!',
'success' => 'Шаблон обновлен.',
'failure' => 'Что-то пошло не так при изменении шаблона.',
],
],
@ -143,10 +143,10 @@ return [
'too-big' => 'Загруженный вами файл слишком большой. Загрузите картинку меньше чем :size',
],
'analytics' => [
'analytics' => 'Analytics',
'analytics' => 'Аналитика',
],
'localization' => [
'localization' => 'Localization',
'localization' => 'Локализация',
],
'security' => [
'security' => 'Безопасность',
@ -169,7 +169,7 @@ return [
'login' => 'Войти',
'logged_in' => 'Вы вошли в систему.',
'welcome' => 'С возвращением!',
'two-factor' => 'Пожалуйста, введите ваш токен.',
'two-factor' => 'Пожалуйста, введите ваш одноразовый пароль.',
],
// Sidebar footer

16
resources/lang/ru/forms.php
View File

@ -30,9 +30,9 @@ return [
'email' => 'Эл. почта',
'password' => 'Пароль',
'2fauth' => 'Код аутентификации',
'invalid' => 'Неправильный E-mail или пароль',
'invalid' => 'Неправильный адрес эл. почты или пароль',
'invalid-token' => 'Неправильный токен',
'cookies' => 'Необходимо включить cookies для входа.',
'cookies' => 'Необходимо включить куки для входа.',
],
// Incidents form fields
@ -121,10 +121,10 @@ return [
'theme' => [
'background-color' => 'Цвет фона',
'text-color' => 'Цвет текста',
'dashboard-login' => 'Show dashboard button in the footer?',
'banner-background-color' => 'Banner Background Color',
'banner-padding' => 'Banner Padding',
'fullwidth-banner' => 'Enable fullwidth banner?',
'dashboard-login' => 'Показывать кнопку панели управления внизу страницы?',
'banner-background-color' => 'Фоновый цвет баннера',
'banner-padding' => 'Поля вокруг баннера',
'fullwidth-banner' => 'Включить баннер в полную ширину?',
],
],
@ -134,9 +134,9 @@ return [
'password' => 'Пароль',
'api-token' => 'API токен',
'api-token-help' => 'Обновление вашего API токена заблокирует существующим приложениям доступ в Cachet. Вам будет необходимо прописать в них новый токен.',
'gravatar' => 'Change your profile picture at Gravatar.',
'gravatar' => 'Измените вашу картинку профиля в Gravatar.',
'2fa' => [
'help' => 'Включение двухфакторной аутентификации увеличивает безопасность вашей учетной записи. Вам понадобится скачать <a href="https://support.google.com/accounts/answer/1066447?hl=en">Google Authenticator</a> или аналогичное приложение на свой смартфон. Когда в следующий раз вы войдете в панель управления, вам понадобится токен, выданный этим приложением.',
'help' => 'Включение двухфакторной аутентификации увеличивает безопасность вашей учетной записи. Вам понадобится скачать <a href="https://support.google.com/accounts/answer/1066447?hl=ru">Google Authenticator</a> или аналогичное приложение на свой смартфон. Когда в следующий раз вы войдете в панель управления, вам понадобится токен, выданный этим приложением.',
],
],

2
resources/lang/ru/reminders.php
View File

@ -24,7 +24,7 @@ return [
'password' => 'Пароль должен состоять минимум из 6 символов и совпадать с подтверждением.',
'user' => 'Пользователь с данным адресом электронной почты не существует.',
'token' => 'Неверный токен обнуления пароля.',
'token' => 'Неверный токен сброса пароля.',
'sent' => 'Напоминание о пароле выслано!',
'reset' => 'Ваш пароль был сброшен!',