Merge branch '3.4' into 3.5

.travis.yml

@@ -13,10 +13,6 @@ addons:
 env:
   global:
     - CORE_RELEASE=3.4
-    - "ARTIFACTS_AWS_REGION=us-east-1"
-    - "ARTIFACTS_S3_BUCKET=silverstripe-travis-artifacts"
-    - secure: "7V20Qk3bIG2AlTJaA5D/uzB8vUVvRwQp+xjRYUxlahtj9FcuqEV3HIyjwwJe0T6Z1bnRYuu28ZnCT2CfP9BBZ3FE7AwSZbPase9c0/at2qDJNqkvIdC1xZ1H6Fcy2LSwNB9wLQPe613ItVdanitEuwE41iowxBPslxUUTnwx7eY="
-    - secure: "f/GWlbnNri2YpCOrJfZl7tkhpMmcRVUbCdmb+beAY90gFBJQPHtljzf8M4KaCP0OkLOtRFuGoMFdIcpadl4J6IG1XP18IJNz+nKzCL/sJj/FF9y77RdMHWE9jr21G9ar5tywkn7JM6vrnTCY89OnHeQx67SKvxqX5CpVx+rdcEU="
 
 matrix:
   include:
@@ -47,7 +43,7 @@ script:
  - "if [ \"$BEHAT_TEST\" = \"1\" ]; then vendor/bin/behat @cms; fi"
 
 after_failure:
- - php ~/travis-support/travis_upload_artifacts.php --if-env BEHAT_TEST,ARTIFACTS_AWS_SECRET_ACCESS_KEY --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_S3_BUCKET/
+ - php ~/travis-support/travis_upload_artifacts.php --if-env BEHAT_TEST,ARTIFACTS_KEY --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/
 
 branches:
   except:

code/controllers/CMSMain.php

@@ -1317,10 +1317,14 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
 			$token->updateFieldSet($fields);
 			$tokenField = $fields->First();
 			$tokenHtml = ($tokenField) ? $tokenField->FieldHolder() : '';
+			$publishAllDescription = _t(
+				'CMSMain.PUBALLFUN2',
+				'Pressing this button will do the equivalent of going to every page and pressing "publish".  '
+				. 'It\'s intended to be used after there have been massive edits of the content, such as when '
+				. 'the site was first built.'
+			);
 			$response .= '<h1>' . _t('CMSMain.PUBALLFUN','"Publish All" functionality') . '</h1>
-				<p>' . _t('CMSMain.PUBALLFUN2', 'Pressing this button will do the equivalent of going to every page and pressing "publish".  It\'s
+				<p>' . $publishAllDescription . '</p>
-				intended to be used after there have been massive edits of the content, such as when the site was
-				first built.') . '</p>
 				<form method="post" action="publishall">
 					<input type="submit" name="confirm" value="'
 					. _t('CMSMain.PUBALLCONFIRM',"Please publish every page in the site, copying content stage to live",'Confirmation button') .'" />'

lang/en.yml

@@ -76,9 +76,9 @@ en:
     PUBLISHED_PAGES: 'Published %d pages, %d failures'
     PUBLISH_PAGES: Publish
     RESTORE: Restore
-    RESTORED_PAGES: 'Restored %d pages'
+    RESTORED_PAGES: "Restored %d pages"
-    UNPUBLISHED_PAGES: 'Unpublished %d pages'
+    UNPUBLISHED_PAGES: "Un-published %d pages"
-    UNPUBLISH_PAGES: Unpublish
+    UNPUBLISH_PAGES: Un-publish
   CMSFileAddController:
     MENUTITLE: Files
   CMSMain:
@@ -99,12 +99,12 @@ en:
     DUPLICATED: 'Duplicated ''{title}'' successfully'
     DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully'
     EMAIL: Email
-    EditTree: 'Edit Tree'
+    EditTree: "Edit Tree"
-    ListFiltered: 'Showing search results.'
+    ListFiltered: "Filtered list."
-    MENUTITLE: 'Edit Page'
+    MENUTITLE: "Edit Page"
-    NEWPAGE: 'New {pagetype}'
+    NEWPAGE: "New {pagetype}"
-    PAGENOTEXISTS: 'This page doesn''t exist'
+    PAGENOTEXISTS: "This page doesn't exist"
-    PAGES: 'Page status'
+    PAGES: Pages
     PAGETYPEANYOPT: Any
     PAGETYPEOPT: 'Page type'
     PUBALLCONFIRM: 'Please publish every page in the site, copying content stage to live'