Merge branch '1.0'

.travis.yml

@@ -1,4 +1,4 @@
-# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details
+# See https://github.com/silverstripe/silverstripe-travis-support for setup details
 
 sudo: false
 
@@ -8,11 +8,9 @@ php:
   - 5.3
   - 5.4
   - 5.5
-  - 5.6
-  - 7.0
 
 env:
-  - DB=MYSQL CORE_RELEASE=3.2
+  - DB=MYSQL CORE_RELEASE=3.5
 
 matrix:
   include:
@@ -22,12 +20,12 @@ matrix:
       env: DB=MYSQL CORE_RELEASE=3.1
     - php: 5.6
       env: DB=PGSQL CORE_RELEASE=3.2
-  allow_failures:
-    - php: 7.0
+    - php: 7.1
+      env: DB=MYSQL CORE_RELEASE=3.6
 
 before_script:
   - composer self-update || true
-  - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support
+  - git clone git://github.com/silverstripe/silverstripe-travis-support.git ~/travis-support
   - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
   - cd ~/builds/ss
   - composer install

composer.json

@@ -1,29 +1,34 @@
 {
-	"name": "silverstripe/externallinks",
-	"description": "Adds tracking of external broken links to the SilverStripe CMS",
-	"type": "silverstripe-module",
-	"keywords": ["silverstripe", "broken", "links", "href"],
-	"license": "BSD-3-Clause",
-	"authors": [
-		{
-			"name": "Kirk Mayo",
-			"email": "kirk@silverstripe.com"
-		}
-	],
-	"require": {
-		"silverstripe/framework": "~3.1",
-		"silverstripe/cms": "~3.1"
-	},
-	"require-dev": {
-		"hafriedlander/silverstripe-phockito": "*",
-		"phpunit/PHPUnit": "~3.7@stable"
-	},
-	"suggest": {
-		"silverstripe/queuedjobs": "Speeds up running the job for Content Editors fropm the report"
-	},
-	"extra": {
-		"branch-alias": {
-			"dev-master": "1.0.x-dev"
-		}
-	}
+    "name": "silverstripe/externallinks",
+    "description": "Adds tracking of external broken links to the SilverStripe CMS",
+    "type": "silverstripe-module",
+    "keywords": [
+        "silverstripe",
+        "broken",
+        "links",
+        "href"
+    ],
+    "license": "BSD-3-Clause",
+    "authors": [
+        {
+            "name": "Kirk Mayo",
+            "email": "kirk@silverstripe.com"
+        }
+    ],
+    "require": {
+        "silverstripe/framework": "~3.1",
+        "silverstripe/cms": "~3.1"
+    },
+    "require-dev": {
+        "hafriedlander/silverstripe-phockito": "*",
+        "phpunit/PHPUnit": "~3.7@stable"
+    },
+    "suggest": {
+        "silverstripe/queuedjobs": "Speeds up running the job for Content Editors fropm the report"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.x-dev"
+        }
+    }
 }

lang/ru.yml

@@ -0,0 +1,17 @@
+ru:
+  BrokenExternalLink:
+    NOTAVAILABLE: 'Сервер не доступен'
+    PLURALNAME: 'Недоступные внешние ссылки'
+    SINGULARNAME: 'Недоступная внешняя ссылка'
+    UNKNOWNRESPONSE: 'Неизвестный ответ сервера'
+  BrokenExternalPageTrack:
+    PLURALNAME: 'Внешнее отслеживание страниц нарушено'
+    SINGULARNAME: 'Внешнее отслеживание страниц нарушено'
+  BrokenExternalPageTrackStatus:
+    PLURALNAME: 'Внешнее отслеживание страниц нарушено'
+    SINGULARNAME: 'Внешнее отслеживание страниц нарушено'
+  CheckExternalLiksJob:
+    TITLE: 'Проверяю внешние ссылки'
+  ExternalBrokenLinksReport:
+    EXTERNALBROKENLINKS: 'Отчёт о неработающих внешних ссылках'
+    RUNREPORT: 'Создать новый отчёт'