From 95995adc9830f509bf030aead024803cc6f9a395 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Tue, 6 Dec 2016 21:43:34 +0000 Subject: [PATCH 1/2] Move travis env vars out of .travis.yml and into travis CI dashboard --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9a30fd63..6076f7e1 100644 --- a/.travis.yml +++ b/.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: From 224b2a4cbad768f27a19b14c2b9ce53efa619619 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Tue, 6 Dec 2016 10:58:26 +1300 Subject: [PATCH 2/2] BUG Fix localisation issues in CMS --- code/controllers/CMSMain.php | 10 +++++++--- lang/en.yml | 37 +++++++++++++++++------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php index 4bb7032d..9f307bd9 100644 --- a/code/controllers/CMSMain.php +++ b/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 .= '

' . _t('CMSMain.PUBALLFUN','"Publish All" functionality') . '

-

' . _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.') . '

+

' . $publishAllDescription . '

' diff --git a/lang/en.yml b/lang/en.yml index 3f7ca46e..156b5a20 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -77,8 +77,8 @@ en: PUBLISH_PAGES: Publish RESTORE: Restore RESTORED_PAGES: "Restored %d pages" - UNPUBLISHED_PAGES: "Un-published %d pages" - UNPUBLISH_PAGES: Un-publish + UNPUBLISHED_PAGES: "Unpublished %d pages" + UNPUBLISH_PAGES: Unpublish CMSFileAddController: MENUTITLE: Files CMSMain: @@ -100,26 +100,23 @@ en: DUPLICATEDWITHCHILDREN: "Duplicated '{title}' and children successfully" EMAIL: Email EditTree: "Edit Tree" - ListFiltered: "Filtered list." + ListFiltered: "Showing search results." MENUTITLE: "Edit Page" NEWPAGE: "New {pagetype}" PAGENOTEXISTS: "This page doesn't exist" - PAGES: Pages + PAGES: "Page status" PAGETYPEANYOPT: Any - PAGETYPEOPT: "Page Type" + PAGETYPEOPT: "Page type" PUBALLCONFIRM: "Please publish every page in the site, copying content stage to live" PUBALLFUN: "\"Publish All\" functionality" - 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. + 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." PUBLISHED: "Published '{title}' successfully." PUBPAGES: "Done: Published {count} pages" PageAdded: "Successfully created page" REMOVED: "Deleted '{title}'{description} from live site" REMOVEDPAGE: "Removed '{title}' from the published site" REMOVEDPAGEFROMDRAFT: "Removed '%s' from the draft site" - RESTORE: Restore + RESTORE: "Restore draft" RESTORED: "Restored '{title}' successfully" RESTORE_DESC: "Restore the archived version to draft" RESTORE_TO_ROOT: "Restore draft at top level" @@ -133,11 +130,11 @@ en: TabContent: Content TabHistory: History TabSettings: Settings - TreeFiltered: "Filtered tree." - TreeFilteredClear: "Clear filter" + TreeFiltered: "Showing search results." + TreeFilteredClear: Clear UNPUBLISH_AND_ARCHIVE: "Unpublish and archive" CMSMain_left_ss: - APPLY_FILTER: "Apply Filter" + APPLY_FILTER: Search CLEAR_FILTER: Clear RESET: Reset CMSPageAddController: @@ -172,7 +169,7 @@ en: MENUTITLE: Pages TreeView: "Tree View" CMSPagesController_ContentToolbar_ss: - MULTISELECT: Multi-selection + MULTISELECT: "Batch actions" CMSPagesController_Tools_ss: FILTER: Filter CMSSIteTreeFilter_PublishedPages: @@ -181,20 +178,20 @@ en: FILTERDATEFROM: From FILTERDATEHEADING: Date FILTERDATETO: To - FILTERLABELTEXT: Content + FILTERLABELTEXT: Search PAGEFILTERDATEHEADING: "Last edited" CMSSettingsController: MENUTITLE: Settings CMSSiteTreeFilter_ChangedPages: - Title: "Changed pages" + Title: "Modified pages" CMSSiteTreeFilter_DeletedPages: - Title: "All pages, including deleted" + Title: "All pages, including archived" CMSSiteTreeFilter_Search: Title: "All pages" CMSSiteTreeFilter_StatusDeletedPages: - Title: "Deleted pages" + Title: "Archived pages" CMSSiteTreeFilter_StatusDraftPages: - Title: "Draft unpublished pages" + Title: "Draft pages" CMSSiteTreeFilter_StatusRemovedFromDraftPages: Title: "Live but removed from draft" ContentControl: @@ -324,7 +321,7 @@ en: SilverStripeNavigator: ARCHIVED: Archived SilverStripeNavigatorLink: - ShareInstructions: "To share a this to this page, copy and paste the link below." + ShareInstructions: "To share this page, copy and paste the link below." ShareLink: "Share link" SilverStripeNavigatorLinkl: CloseLink: Close