tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.4' into 3.5

Browse Source
This commit is contained in:
Daniel Hensby 2016-11-28 14:01:01 +00:00
commit ca76b9488f
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
3 changed files with 320 additions and 313 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/model/SiteTree.php
View File

@ -1019,7 +1019,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
} }
// Fall over to inherited permissions // Fall over to inherited permissions
if($parent) { if($parent && $parent->exists()) {
return $parent->canAddChildren($member); return $parent->canAddChildren($member);
} else { } else {
// This doesn't necessarily mean we are creating a root page, but that // This doesn't necessarily mean we are creating a root page, but that

627
lang/en.yml
View File

@ -1,132 +1,135 @@
en: en:
AssetAdmin: AssetAdmin:
ADDFILES: 'Add Files' ADDFILES: "Add Files"
ActionAdd: 'Add folder' ActionAdd: "Add folder"
AppCategoryArchive: Archive AppCategoryArchive: Archive
AppCategoryAudio: Audio AppCategoryAudio: Audio
AppCategoryDocument: Document AppCategoryDocument: Document
AppCategoryFlash: Flash AppCategoryFlash: Flash
AppCategoryImage: Image AppCategoryImage: Image
AppCategoryVideo: Video AppCategoryVideo: Video
BackToFolder: 'Back to folder' BackToFolder: "Back to folder"
CMSMENU_OLD: 'Files (old)' CMSMENU_OLD: "Files (old)"
CREATED: Date CREATED: Date
CurrentFolderOnly: 'Limit to current folder?' CurrentFolderOnly: "Limit to current folder?"
DetailsView: Details DetailsView: Details
ErrorItemPermissionDenied: 'It seems you don''t have the necessary permissions to add {ObjectTitle} to a campaign' ErrorItemPermissionDenied: "It seems you don't have the necessary permissions to add {ObjectTitle} to a campaign"
ErrorNotFound: 'That {Type} couldn''t be found' ErrorNotFound: "That {Type} couldn't be found"
FILES: Files FILES: Files
FILESYSTEMSYNC: 'Sync files' FILESYSTEMSYNC: "Sync files"
FILESYSTEMSYNCTITLE: 'Update the CMS database entries of files on the filesystem. Useful when new files have been uploaded outside of the CMS, e.g. through FTP.' FILESYSTEMSYNCTITLE: "Update the CMS database entries of files on the filesystem. Useful when new files have been uploaded outside of the CMS, e.g. through FTP."
FROMTHEINTERNET: 'From the internet' FROMTHEINTERNET: "From the internet"
FROMYOURCOMPUTER: 'From your computer' FROMYOURCOMPUTER: "From your computer"
Filetype: 'File type' Filetype: "File type"
ListView: 'List View' ListView: "List View"
MENUTITLE: Files MENUTITLE: Files
NEWFOLDER: NewFolder NEWFOLDER: NewFolder
SIZE: Size SIZE: Size
THUMBSDELETED: '{count} unused thumbnails have been deleted' THUMBSDELETED: "{count} unused thumbnails have been deleted"
TreeView: 'Tree View' TreeView: "Tree View"
Upload: Upload Upload: Upload
AssetAdmin_DeleteBatchAction: AssetAdmin_DeleteBatchAction:
TITLE: 'Delete folders' TITLE: "Delete folders"
AssetAdmin_Tools: AssetAdmin_Tools:
FILTER: Filter FILTER: Filter
AssetAdmin_left_ss: AssetAdmin_left_ss:
GO: Go GO: Go
AssetTableField: AssetTableField:
BACKLINKCOUNT: 'Used on:' BACKLINKCOUNT: "Used on:"
PAGES: page(s) PAGES: page(s)
BackLink_Button_ss: BackLink_Button_ss:
Back: Back Back: Back
BrokenLinksReport: BrokenLinksReport:
Any: Any Any: Any
BROKENLINKS: 'Broken links report' BROKENLINKS: "Broken links report"
CheckSite: 'Check site' CheckSite: "Check site"
CheckSiteDropdownDraft: 'Draft Site' CheckSiteDropdownDraft: "Draft Site"
CheckSiteDropdownPublished: 'Published Site' CheckSiteDropdownPublished: "Published Site"
ColumnDateLastModified: 'Date last modified' ColumnDateLastModified: "Date last modified"
ColumnDateLastPublished: 'Date last published' ColumnDateLastPublished: "Date last published"
ColumnProblemType: 'Problem type' ColumnProblemType: "Problem type"
ColumnURL: URL ColumnURL: URL
HasBrokenFile: 'has broken file' HasBrokenFile: "has broken file"
HasBrokenLink: 'has broken link' HasBrokenLink: "has broken link"
HasBrokenLinkAndFile: 'has broken link and file' HasBrokenLinkAndFile: "has broken link and file"
HoverTitleEditPage: 'Edit page' HoverTitleEditPage: "Edit page"
PageName: 'Page name' PageName: "Page name"
ReasonDropdown: 'Problem to check' ReasonDropdown: "Problem to check"
ReasonDropdownBROKENFILE: 'Broken file' ReasonDropdownBROKENFILE: "Broken file"
ReasonDropdownBROKENLINK: 'Broken link' ReasonDropdownBROKENLINK: "Broken link"
ReasonDropdownRPBROKENLINK: 'Redirector page pointing to non-existent page' ReasonDropdownRPBROKENLINK: "Redirector page pointing to non-existent page"
ReasonDropdownVPBROKENLINK: 'Virtual page pointing to non-existent page' ReasonDropdownVPBROKENLINK: "Virtual page pointing to non-existent page"
RedirectorNonExistent: 'redirector page pointing to non-existent page' RedirectorNonExistent: "redirector page pointing to non-existent page"
VirtualPageNonExistent: 'virtual page pointing to non-existent page' VirtualPageNonExistent: "virtual page pointing to non-existent page"
CMSAddPageController: CMSAddPageController:
Title: 'Add page' Title: "Add page"
CMSBatchAction_Archive: CMSBatchAction_Archive:
RESULT: 'Deleted %d pages from draft and live, and sent them to the archive' RESULT: "Deleted %d pages from draft and live, and sent them to the archive"
TITLE: 'Unpublish and archive' TITLE: "Unpublish and archive"
CMSBatchActions: CMSBatchActions:
ARCHIVE: Archive ARCHIVE: Archive
ARCHIVED_PAGES: 'Archived %d pages' ARCHIVED_PAGES: "Archived %d pages"
DELETED_DRAFT_PAGES: 'Deleted %d pages from draft site, %d failures' DELETED_DRAFT_PAGES: "Deleted %d pages from draft site, %d failures"
DELETED_PAGES: 'Deleted %d pages from published site, %d failures' DELETED_PAGES: "Deleted %d pages from published site, %d failures"
DELETE_DRAFT_PAGES: 'Delete from draft site' DELETE_DRAFT_PAGES: "Delete from draft site"
DELETE_PAGES: 'Delete from published site' DELETE_PAGES: "Delete from published site"
PUBLISHED_PAGES: 'Published %d pages, %d failures' PUBLISHED_PAGES: "Published %d pages, %d failures"
PUBLISH_PAGES: Publish PUBLISH_PAGES: Publish
RESTORE: Restore 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: CMSFileAddController:
MENUTITLE: Files MENUTITLE: Files
CMSMain: CMSMain:
ACCESS: 'Access to ''{title}'' section' ACCESS: "Access to '{title}' section"
ACCESS_HELP: 'Allow viewing of the section containing page tree and content. View and edit permissions can be handled through page specific dropdowns, as well as the separate "Content permissions".' ACCESS_HELP: "Allow viewing of the section containing page tree and content. View and edit permissions can be handled through page specific dropdowns, as well as the separate \"Content permissions\"."
ARCHIVE: Archive ARCHIVE: Archive
ARCHIVEDPAGE: 'Archived page ''%s''' ARCHIVEDPAGE: "Archived page '%s'"
AddNew: 'Add new page' AddNew: "Add new page"
AddNewButton: 'Add new' AddNewButton: "Add new"
AddPageRestriction: 'Note: Some page types are not allowed for this selection' AddPageRestriction: "Note: Some page types are not allowed for this selection"
Cancel: Cancel Cancel: Cancel
ChoosePageParentMode: 'Choose where to create this page' ChoosePageParentMode: "Choose where to create this page"
ChoosePageType: 'Choose page type' ChoosePageType: "Choose page type"
Create: Create Create: Create
DELETE: 'Delete draft' DELETE: "Delete draft"
DELETEFP: Delete DELETEFP: Delete
DESCREMOVED: 'and {count} descendants' DESCREMOVED: "and {count} descendants"
DUPLICATED: 'Duplicated ''{title}'' successfully' DUPLICATED: "Duplicated '{title}' successfully"
DUPLICATEDWITHCHILDREN: 'Duplicated ''{title}'' and children successfully' DUPLICATEDWITHCHILDREN: "Duplicated '{title}' and children successfully"
EMAIL: Email 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 PAGETYPEANYOPT: Any
PAGETYPEOPT: 'Page type' PAGETYPEOPT: "Page Type"
PUBALLCONFIRM: 'Please publish every page in the site, copying content stage to live' PUBALLCONFIRM: "Please publish every page in the site, copying content stage to live"
PUBALLFUN: '"Publish All" functionality' PUBALLFUN: "\"Publish All\" functionality"
PUBALLFUN2: "Pressing this button will do the equivalent of going to every page and pressing \"publish\". It's\r\n intended to be used after there have been massive edits of the content, such as when the site was\r\n first built." PUBALLFUN2: |-
PUBLISHED: 'Published ''{title}'' successfully.' Pressing this button will do the equivalent of going to every page and pressing "publish". It's
PUBPAGES: 'Done: Published {count} pages' intended to be used after there have been massive edits of the content, such as when the site was
PageAdded: 'Successfully created page' first built.
REMOVED: 'Deleted ''{title}''{description} from live site' PUBLISHED: "Published '{title}' successfully."
REMOVEDPAGE: 'Removed ''{title}'' from the published site' PUBPAGES: "Done: Published {count} pages"
REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site' PageAdded: "Successfully created page"
RESTORE: 'Restore draft' REMOVED: "Deleted '{title}'{description} from live site"
RESTORED: 'Restored ''{title}'' successfully' REMOVEDPAGE: "Removed '{title}' from the published site"
RESTORE_DESC: 'Restore the archived version to draft' REMOVEDPAGEFROMDRAFT: "Removed '%s' from the draft site"
RESTORE_TO_ROOT: 'Restore draft at top level' RESTORE: Restore
RESTORE_TO_ROOT_DESC: 'Restore the archived version to draft as a top level page' RESTORED: "Restored '{title}' successfully"
ROLLBACK: 'Roll back to this version' RESTORE_DESC: "Restore the archived version to draft"
ROLLEDBACKPUBv2: 'Rolled back to published version.' RESTORE_TO_ROOT: "Restore draft at top level"
ROLLEDBACKVERSIONv2: 'Rolled back to version #%d.' RESTORE_TO_ROOT_DESC: "Restore the archived version to draft as a top level page"
ROLLBACK: "Roll back to this version"
ROLLEDBACKPUBv2: "Rolled back to published version."
ROLLEDBACKVERSIONv2: "Rolled back to version #%d."
SAVE: Save SAVE: Save
SAVED: 'Saved ''{title}'' successfully.' SAVED: "Saved '{title}' successfully."
SAVEDRAFT: 'Save draft' SAVEDRAFT: "Save draft"
TabContent: Content TabContent: Content
TabHistory: History TabHistory: History
TabSettings: Settings TabSettings: Settings
@ -134,26 +137,26 @@ en:
TreeFilteredClear: Clear TreeFilteredClear: Clear
UNPUBLISH_AND_ARCHIVE: 'Unpublish and archive' UNPUBLISH_AND_ARCHIVE: 'Unpublish and archive'
CMSMain_left_ss: CMSMain_left_ss:
APPLY_FILTER: Search APPLY_FILTER: "Apply Filter"
CLEAR_FILTER: Clear CLEAR_FILTER: Clear
RESET: Reset RESET: Reset
CMSPageAddController: CMSPageAddController:
MENUTITLE: 'Add page' MENUTITLE: "Add page"
ParentMode_child: 'Under another page' ParentMode_child: "Under another page"
ParentMode_top: 'Top level' ParentMode_top: "Top level"
CMSPageEditController: CMSPageEditController:
MENUTITLE: 'Edit Page' MENUTITLE: "Edit Page"
CMSPageHistoryController: CMSPageHistoryController:
COMPAREMODE: 'Compare mode (select two)' COMPAREMODE: "Compare mode (select two)"
COMPAREVERSIONS: 'Compare Versions' COMPAREVERSIONS: "Compare Versions"
COMPARINGVERSION: 'Comparing versions {version1} and {version2}.' COMPARINGVERSION: "Comparing versions {version1} and {version2}."
MENUTITLE: History MENUTITLE: History
REVERTTOTHISVERSION: 'Revert to this version' REVERTTOTHISVERSION: "Revert to this version"
SHOWUNPUBLISHED: 'Show unpublished versions' SHOWUNPUBLISHED: "Show unpublished versions"
SHOWVERSION: 'Show Version' SHOWVERSION: "Show Version"
VIEW: view VIEW: view
VIEWINGLATEST: 'Currently viewing the latest version.' VIEWINGLATEST: "Currently viewing the latest version."
VIEWINGVERSION: 'Currently viewing version {version}.' VIEWINGVERSION: "Currently viewing version {version}."
CMSPageHistoryController_versions_ss: CMSPageHistoryController_versions_ss:
AUTHOR: Author AUTHOR: Author
NOTPUBLISHED: 'Not published' NOTPUBLISHED: 'Not published'
@ -162,116 +165,116 @@ en:
UNKNOWN: Unknown UNKNOWN: Unknown
WHEN: When WHEN: When
CMSPageSettingsController: CMSPageSettingsController:
MENUTITLE: 'Edit Page' MENUTITLE: "Edit Page"
CMSPagesController: CMSPagesController:
GalleryView: 'Gallery View' GalleryView: "Gallery View"
ListView: 'List View' ListView: "List View"
MENUTITLE: Pages MENUTITLE: Pages
TreeView: 'Tree View' TreeView: "Tree View"
CMSPagesController_ContentToolbar_ss: CMSPagesController_ContentToolbar_ss:
MULTISELECT: 'Batch actions' MULTISELECT: Multi-selection
CMSPagesController_Tools_ss: CMSPagesController_Tools_ss:
FILTER: Filter FILTER: Filter
CMSSIteTreeFilter_PublishedPages: CMSSIteTreeFilter_PublishedPages:
Title: 'Published pages' Title: "Published pages"
CMSSearch: CMSSearch:
FILTERDATEFROM: From FILTERDATEFROM: From
FILTERDATEHEADING: Date FILTERDATEHEADING: Date
FILTERDATETO: To FILTERDATETO: To
FILTERLABELTEXT: Search FILTERLABELTEXT: Content
PAGEFILTERDATEHEADING: 'Last edited' PAGEFILTERDATEHEADING: "Last edited"
CMSSettingsController: CMSSettingsController:
MENUTITLE: Settings MENUTITLE: Settings
CMSSiteTreeFilter_ChangedPages: CMSSiteTreeFilter_ChangedPages:
Title: 'Modified pages' Title: "Changed pages"
CMSSiteTreeFilter_DeletedPages: CMSSiteTreeFilter_DeletedPages:
Title: 'All pages, including archived' Title: "All pages, including deleted"
CMSSiteTreeFilter_Search: CMSSiteTreeFilter_Search:
Title: 'All pages' Title: "All pages"
CMSSiteTreeFilter_StatusDeletedPages: CMSSiteTreeFilter_StatusDeletedPages:
Title: 'Archived pages' Title: "Deleted pages"
CMSSiteTreeFilter_StatusDraftPages: CMSSiteTreeFilter_StatusDraftPages:
Title: 'Draft pages' Title: "Draft unpublished pages"
CMSSiteTreeFilter_StatusRemovedFromDraftPages: CMSSiteTreeFilter_StatusRemovedFromDraftPages:
Title: 'Live but removed from draft' Title: "Live but removed from draft"
ContentControl: ContentControl:
NOTEWONTBESHOWN: 'Note: this message will not be shown to your visitors' NOTEWONTBESHOWN: "Note: this message will not be shown to your visitors"
ContentController: ContentController:
ARCHIVEDSITE: 'Preview version' ARCHIVEDSITE: "Preview version"
ARCHIVEDSITEFROM: 'Archived site from' ARCHIVEDSITEFROM: "Archived site from"
CMS: CMS CMS: CMS
DRAFT: Draft DRAFT: Draft
DRAFTSITE: 'Draft Site' DRAFTSITE: "Draft Site"
DRAFT_SITE_ACCESS_RESTRICTION: 'You must log in with your CMS password in order to view the draft or archived content. <a href="%s">Click here to go back to the published site.</a>' DRAFT_SITE_ACCESS_RESTRICTION: "You must log in with your CMS password in order to view the draft or archived content. <a href=\"%s\">Click here to go back to the published site.</a>"
Email: Email Email: Email
INSTALL_SUCCESS: 'Installation Successful!' INSTALL_SUCCESS: "Installation Successful!"
InstallFilesDeleted: 'Installation files have been successfully deleted.' InstallFilesDeleted: "Installation files have been successfully deleted."
InstallSecurityWarning: 'For security reasons you should now delete the install files, unless you are planning to reinstall later (<em>requires admin login, see above</em>). The web server also now only needs write access to the "assets" folder, you can remove write access from all other folders. <a href="{link}" style="text-align: center;">Click here to delete the install files.</a>' InstallSecurityWarning: "For security reasons you should now delete the install files, unless you are planning to reinstall later (<em>requires admin login, see above</em>). The web server also now only needs write access to the \"assets\" folder, you can remove write access from all other folders. <a href=\"{link}\" style=\"text-align: center;\">Click here to delete the install files.</a>"
InstallSuccessCongratulations: 'SilverStripe has been successfully installed!' InstallSuccessCongratulations: "SilverStripe has been successfully installed!"
LOGGEDINAS: 'Logged in as' LOGGEDINAS: "Logged in as"
LOGIN: Login LOGIN: Login
LOGOUT: 'Log out' LOGOUT: "Log out"
NOTLOGGEDIN: 'Not logged in' NOTLOGGEDIN: "Not logged in"
PUBLISHED: Published PUBLISHED: Published
PUBLISHEDSITE: 'Published Site' PUBLISHEDSITE: "Published Site"
Password: Password Password: Password
PostInstallTutorialIntro: 'This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}.' PostInstallTutorialIntro: "This website is a simplistic version of a SilverStripe 3 site. To extend this, please take a look at {link}."
StartEditing: 'You can start editing your content by opening <a href="{link}">the CMS</a>.' StartEditing: "You can start editing your content by opening <a href=\"{link}\">the CMS</a>."
UnableDeleteInstall: 'Unable to delete installation files. Please delete the files below manually' UnableDeleteInstall: "Unable to delete installation files. Please delete the files below manually"
VIEWPAGEIN: 'View Page in:' VIEWPAGEIN: "View Page in:"
ErrorPage: ErrorPage:
400: '400 - Bad Request' 400: "400 - Bad Request"
401: '401 - Unauthorized' 401: "401 - Unauthorized"
403: '403 - Forbidden' 403: "403 - Forbidden"
404: '404 - Not Found' 404: "404 - Not Found"
405: '405 - Method Not Allowed' 405: "405 - Method Not Allowed"
406: '406 - Not Acceptable' 406: "406 - Not Acceptable"
407: '407 - Proxy Authentication Required' 407: "407 - Proxy Authentication Required"
408: '408 - Request Timeout' 408: "408 - Request Timeout"
409: '409 - Conflict' 409: "409 - Conflict"
410: '410 - Gone' 410: "410 - Gone"
411: '411 - Length Required' 411: "411 - Length Required"
412: '412 - Precondition Failed' 412: "412 - Precondition Failed"
413: '413 - Request Entity Too Large' 413: "413 - Request Entity Too Large"
414: '414 - Request-URI Too Long' 414: "414 - Request-URI Too Long"
415: '415 - Unsupported Media Type' 415: "415 - Unsupported Media Type"
416: '416 - Request Range Not Satisfiable' 416: "416 - Request Range Not Satisfiable"
417: '417 - Expectation Failed' 417: "417 - Expectation Failed"
422: '422 - Unprocessable Entity' 422: "422 - Unprocessable Entity"
429: '429 - Too Many Requests' 429: "429 - Too Many Requests"
500: '500 - Internal Server Error' 500: "500 - Internal Server Error"
501: '501 - Not Implemented' 501: "501 - Not Implemented"
502: '502 - Bad Gateway' 502: "502 - Bad Gateway"
503: '503 - Service Unavailable' 503: "503 - Service Unavailable"
504: '504 - Gateway Timeout' 504: "504 - Gateway Timeout"
505: '505 - HTTP Version Not Supported' 505: "505 - HTTP Version Not Supported"
CODE: 'Error code' CODE: "Error code"
DEFAULTERRORPAGECONTENT: '<p>Sorry, it seems you were trying to access a page that doesn''t exist.</p><p>Please check the spelling of the URL you were trying to access and try again.</p>' DEFAULTERRORPAGECONTENT: "<p>Sorry, it seems you were trying to access a page that doesn't exist.</p><p>Please check the spelling of the URL you were trying to access and try again.</p>"
DEFAULTERRORPAGETITLE: 'Page not found' DEFAULTERRORPAGETITLE: "Page not found"
DEFAULTSERVERERRORPAGECONTENT: '<p>Sorry, there was a problem with handling your request.</p>' DEFAULTSERVERERRORPAGECONTENT: "<p>Sorry, there was a problem with handling your request.</p>"
DEFAULTSERVERERRORPAGETITLE: 'Server error' DEFAULTSERVERERRORPAGETITLE: "Server error"
DESCRIPTION: 'Custom content for different error cases (e.g. "Page not found")' DESCRIPTION: "Custom content for different error cases (e.g. \"Page not found\")"
ERRORFILEPROBLEM: 'Error opening file "{filename}" for writing. Please check file permissions.' ERRORFILEPROBLEM: "Error opening file \"{filename}\" for writing. Please check file permissions."
PLURALNAME: 'Error Pages' PLURALNAME: "Error Pages"
SINGULARNAME: 'Error Page' SINGULARNAME: "Error Page"
File: File:
Title: Title Title: Title
Folder: Folder:
AddFolderButton: 'Add folder' AddFolderButton: "Add folder"
DELETEUNUSEDTHUMBNAILS: 'Delete unused thumbnails' DELETEUNUSEDTHUMBNAILS: "Delete unused thumbnails"
UNUSEDFILESTITLE: 'Unused files' UNUSEDFILESTITLE: "Unused files"
UNUSEDTHUMBNAILSTITLE: 'Unused thumbnails' UNUSEDTHUMBNAILSTITLE: "Unused thumbnails"
UploadFilesButton: Upload UploadFilesButton: Upload
LeftAndMain: LeftAndMain:
DELETED: Deleted. DELETED: Deleted.
PreviewButton: Preview PreviewButton: Preview
SAVEDUP: Saved. SAVEDUP: Saved.
SearchResults: 'Search Results' SearchResults: "Search Results"
Permission: Permission:
CMS_ACCESS_CATEGORY: 'CMS Access' CMS_ACCESS_CATEGORY: "CMS Access"
Permissions: Permissions:
CONTENT_CATEGORY: 'Content permissions' CONTENT_CATEGORY: "Content permissions"
PERMISSIONS_CATEGORY: 'Roles and access permissions' PERMISSIONS_CATEGORY: "Roles and access permissions"
RedirectorPage: RedirectorPage:
DESCRIPTION: 'Redirects to a different internal page' DESCRIPTION: 'Redirects to a different internal page'
HASBEENSETUP: 'A redirector page has been set up without anywhere to redirect to.' HASBEENSETUP: 'A redirector page has been set up without anywhere to redirect to.'
@ -297,199 +300,199 @@ en:
MENUTITLE: Reports MENUTITLE: Reports
ReportTitle: Title ReportTitle: Title
ReportAdminForm: ReportAdminForm:
FILTERBY: 'Filter by' FILTERBY: "Filter by"
SITETREE: SITETREE:
VIRTUALPAGEDRAFTWARNING: 'Please publish the linked page in order to publish the virtual page' VIRTUALPAGEDRAFTWARNING: "Please publish the linked page in order to publish the virtual page"
VIRTUALPAGEWARNING: 'Please choose a linked page and save first in order to publish this page' VIRTUALPAGEWARNING: "Please choose a linked page and save first in order to publish this page"
VIRTUALPAGEWARNINGSETTINGS: 'Please choose a linked page in the main content fields in order to publish' VIRTUALPAGEWARNINGSETTINGS: "Please choose a linked page in the main content fields in order to publish"
SearchForm: SearchForm:
GO: Go GO: Go
SEARCH: Search SEARCH: Search
SearchResults: 'Search Results' SearchResults: "Search Results"
SideReport: SideReport:
BROKENFILES: 'Pages with broken files' BROKENFILES: "Pages with broken files"
BROKENLINKS: 'Pages with broken links' BROKENLINKS: "Pages with broken links"
BROKENREDIRECTORPAGES: 'RedirectorPages pointing to deleted pages' BROKENREDIRECTORPAGES: "RedirectorPages pointing to deleted pages"
BROKENVIRTUALPAGES: 'VirtualPages pointing to deleted pages' BROKENVIRTUALPAGES: "VirtualPages pointing to deleted pages"
BrokenLinksGroupTitle: 'Broken links reports' BrokenLinksGroupTitle: "Broken links reports"
ContentGroupTitle: 'Content reports' ContentGroupTitle: "Content reports"
EMPTYPAGES: 'Pages with no content' EMPTYPAGES: "Pages with no content"
LAST2WEEKS: 'Pages edited in the last 2 weeks' LAST2WEEKS: "Pages edited in the last 2 weeks"
OtherGroupTitle: Other OtherGroupTitle: Other
ParameterLiveCheckbox: 'Check live site' ParameterLiveCheckbox: "Check live site"
REPEMPTY: 'The {title} report is empty.' REPEMPTY: "The {title} report is empty."
SilverStripeNavigator: SilverStripeNavigator:
ARCHIVED: Archived ARCHIVED: Archived
SilverStripeNavigatorLink: SilverStripeNavigatorLink:
ShareInstructions: 'To share this page, copy and paste the link below.' ShareInstructions: "To share a this to this page, copy and paste the link below."
ShareLink: 'Share link' ShareLink: "Share link"
SilverStripeNavigatorLinkl: SilverStripeNavigatorLinkl:
CloseLink: Close CloseLink: Close
SilverStripe\CMS\Controllers\CMSPageAddController: SilverStripe\CMS\Controllers\CMSPageAddController:
MENUTITLE: 'Add page' MENUTITLE: "Add page"
SilverStripe\CMS\Controllers\CMSPageEditController: SilverStripe\CMS\Controllers\CMSPageEditController:
MENUTITLE: 'Edit Page' MENUTITLE: "Edit Page"
SilverStripe\CMS\Controllers\CMSPageHistoryController: SilverStripe\CMS\Controllers\CMSPageHistoryController:
MENUTITLE: History MENUTITLE: History
SilverStripe\CMS\Controllers\CMSPageSettingsController: SilverStripe\CMS\Controllers\CMSPageSettingsController:
MENUTITLE: 'Edit Page' MENUTITLE: "Edit Page"
SilverStripe\CMS\Controllers\CMSPagesController: SilverStripe\CMS\Controllers\CMSPagesController:
MENUTITLE: Pages MENUTITLE: Pages
SilverStripe\CMS\Model\ErrorPage: SilverStripe\CMS\Model\ErrorPage:
DESCRIPTION: 'Custom content for different error cases (e.g. "Page not found")' DESCRIPTION: "Custom content for different error cases (e.g. \"Page not found\")"
PLURALNAME: 'Error Pages' PLURALNAME: "Error Pages"
SINGULARNAME: 'Error Page' SINGULARNAME: "Error Page"
SilverStripe\CMS\Model\RedirectorPage: SilverStripe\CMS\Model\RedirectorPage:
DESCRIPTION: 'Redirects to an internal page or an external URL' DESCRIPTION: "Redirects to an internal page or an external URL"
PLURALNAME: 'Redirector Pages' PLURALNAME: "Redirector Pages"
SINGULARNAME: 'Redirector Page' SINGULARNAME: "Redirector Page"
SilverStripe\CMS\Model\SiteTree: SilverStripe\CMS\Model\SiteTree:
DESCRIPTION: 'Generic content page' DESCRIPTION: "Generic content page"
PLURALNAME: 'Site Trees' PLURALNAME: "Site Trees"
SINGULARNAME: 'Site Tree' SINGULARNAME: "Site Tree"
SilverStripe\CMS\Model\VirtualPage: SilverStripe\CMS\Model\VirtualPage:
DESCRIPTION: 'Displays the content of another page' DESCRIPTION: "Displays the content of another page"
PLURALNAME: 'Virtual Pages' PLURALNAME: "Virtual Pages"
SINGULARNAME: 'Virtual Page' SINGULARNAME: "Virtual Page"
SiteConfig: SiteConfig:
DEFAULTTHEME: '(Use default theme)' DEFAULTTHEME: "(Use default theme)"
EDITHEADER: 'Who can edit pages on this site?' EDITHEADER: "Who can edit pages on this site?"
EDIT_PERMISSION: 'Manage site configuration' EDIT_PERMISSION: "Manage site configuration"
EDIT_PERMISSION_HELP: 'Ability to edit global access settings/top-level page permissions.' EDIT_PERMISSION_HELP: "Ability to edit global access settings/top-level page permissions."
PLURALNAME: 'Site Configs' PLURALNAME: "Site Configs"
SINGULARNAME: 'Site Config' SINGULARNAME: "Site Config"
SITENAMEDEFAULT: 'Your Site Name' SITENAMEDEFAULT: "Your Site Name"
SITETAGLINE: 'Site Tagline/Slogan' SITETAGLINE: "Site Tagline/Slogan"
SITETITLE: 'Site title' SITETITLE: "Site title"
TABACCESS: Access TABACCESS: Access
TABMAIN: Main TABMAIN: Main
TAGLINEDEFAULT: 'your tagline here' TAGLINEDEFAULT: "your tagline here"
THEME: Theme THEME: Theme
TOPLEVELCREATE: 'Who can create pages in the root of the site?' TOPLEVELCREATE: "Who can create pages in the root of the site?"
VIEWHEADER: 'Who can view pages on this site?' VIEWHEADER: "Who can view pages on this site?"
SiteTree: SiteTree:
ACCESSANYONE: Anyone ACCESSANYONE: Anyone
ACCESSHEADER: 'Who can view this page?' ACCESSHEADER: "Who can view this page?"
ACCESSLOGGEDIN: 'Logged-in users' ACCESSLOGGEDIN: "Logged-in users"
ACCESSONLYTHESE: 'Only these people (choose from list)' ACCESSONLYTHESE: "Only these people (choose from list)"
ADDEDTODRAFTHELP: 'Page has not been published yet' ADDEDTODRAFTHELP: "Page has not been published yet"
ADDEDTODRAFTSHORT: Draft ADDEDTODRAFTSHORT: Draft
ALLOWCOMMENTS: 'Allow comments on this page?' ALLOWCOMMENTS: "Allow comments on this page?"
APPEARSVIRTUALPAGES: 'This content also appears on the virtual pages in the {title} sections.' APPEARSVIRTUALPAGES: "This content also appears on the virtual pages in the {title} sections."
ARCHIVEDPAGEHELP: 'Page is removed from draft and live' ARCHIVEDPAGEHELP: "Page is removed from draft and live"
ARCHIVEDPAGESHORT: Archived ARCHIVEDPAGESHORT: Archived
BUTTONARCHIVEDESC: 'Unpublish and send to archive' BUTTONARCHIVEDESC: "Unpublish and send to archive"
BUTTONCANCELDRAFT: 'Cancel draft changes' BUTTONCANCELDRAFT: "Cancel draft changes"
BUTTONCANCELDRAFTDESC: 'Delete your draft and revert to the currently published page' BUTTONCANCELDRAFTDESC: "Delete your draft and revert to the currently published page"
BUTTONDELETEDESC: 'Remove from draft/live and send to archive' BUTTONDELETEDESC: "Remove from draft/live and send to archive"
BUTTONPUBLISHED: Published BUTTONPUBLISHED: Published
BUTTONSAVED: Saved BUTTONSAVED: Saved
BUTTONSAVEPUBLISH: 'Save & publish' BUTTONSAVEPUBLISH: "Save & publish"
BUTTONUNPUBLISH: Unpublish BUTTONUNPUBLISH: Unpublish
BUTTONUNPUBLISHDESC: 'Remove this page from the published site' BUTTONUNPUBLISHDESC: "Remove this page from the published site"
Comments: Comments Comments: Comments
Content: Content Content: Content
DEFAULTABOUTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>' DEFAULTABOUTCONTENT: "<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>"
DEFAULTABOUTTITLE: 'About Us' DEFAULTABOUTTITLE: "About Us"
DEFAULTCONTACTCONTENT: '<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>' DEFAULTCONTACTCONTENT: "<p>You can fill this page out with your own content, or delete it and create your own pages.<br /></p>"
DEFAULTCONTACTTITLE: 'Contact Us' DEFAULTCONTACTTITLE: "Contact Us"
DEFAULTHOMECONTENT: '<p>Welcome to SilverStripe! This is the default homepage. You can edit this page by opening <a href="admin/">the CMS</a>.</p><p>You can now access the <a href="http://docs.silverstripe.org">developer documentation</a>, or begin the <a href="http://www.silverstripe.org/learn/lessons">SilverStripe lessons</a>.</p>' DEFAULTHOMECONTENT: "<p>Welcome to SilverStripe! This is the default homepage. You can edit this page by opening <a href=\"admin/\">the CMS</a>.</p><p>You can now access the <a href=\"http://docs.silverstripe.org\">developer documentation</a>, or begin the <a href=\"http://www.silverstripe.org/learn/lessons\">SilverStripe lessons</a>.</p>"
DEFAULTHOMETITLE: Home DEFAULTHOMETITLE: Home
DELETEDPAGEHELP: 'Page is no longer published' DELETEDPAGEHELP: "Page is no longer published"
DELETEDPAGESHORT: Deleted DELETEDPAGESHORT: Deleted
DEPENDENT_NOTE: 'The following pages depend on this page. This includes virtual pages, redirector pages, and pages with content links.' DEPENDENT_NOTE: "The following pages depend on this page. This includes virtual pages, redirector pages, and pages with content links."
DESCRIPTION: 'Generic content page' DESCRIPTION: "Generic content page"
DependtPageColumnLinkType: 'Link type' DependtPageColumnLinkType: "Link type"
DependtPageColumnURL: URL DependtPageColumnURL: URL
EDITANYONE: 'Anyone who can log-in to the CMS' EDITANYONE: "Anyone who can log-in to the CMS"
EDITHEADER: 'Who can edit this page?' EDITHEADER: "Who can edit this page?"
EDITONLYTHESE: 'Only these people (choose from list)' EDITONLYTHESE: "Only these people (choose from list)"
EDITORGROUPS: 'Editor Groups' EDITORGROUPS: "Editor Groups"
EDIT_ALL_DESCRIPTION: 'Edit any page' EDIT_ALL_DESCRIPTION: "Edit any page"
EDIT_ALL_HELP: 'Ability to edit any page on the site, regardless of the settings on the Access tab. Requires the "Access to ''Pages'' section" permission' EDIT_ALL_HELP: "Ability to edit any page on the site, regardless of the settings on the Access tab. Requires the \"Access to 'Pages' section\" permission"
Editors: 'Editors Groups' Editors: "Editors Groups"
GroupPlaceholder: 'Click to select group' GroupPlaceholder: "Click to select group"
HASBROKENLINKS: 'This page has broken links.' HASBROKENLINKS: "This page has broken links."
HTMLEDITORTITLE: Content HTMLEDITORTITLE: Content
INHERIT: 'Inherit from parent page' INHERIT: "Inherit from parent page"
LASTPUBLISHED: 'Last published' LASTPUBLISHED: "Last published"
LASTSAVED: 'Last saved' LASTSAVED: "Last saved"
LASTUPDATED: 'Last Updated' LASTUPDATED: "Last Updated"
LINKCHANGENOTE: 'Changing this page''s link will also affect the links of all child pages.' LINKCHANGENOTE: "Changing this page's link will also affect the links of all child pages."
LINKSALREADYUNIQUE: ' {url} is already unique' LINKSALREADYUNIQUE: " {url} is already unique"
LINKSCHANGEDTO: ' changed {url1} -> {url2}' LINKSCHANGEDTO: " changed {url1} -> {url2}"
MENUTITLE: 'Navigation label' MENUTITLE: "Navigation label"
METADESC: 'Meta Description' METADESC: "Meta Description"
METADESCHELP: 'Search engines use this content for displaying search results (although it will not influence their ranking).' METADESCHELP: "Search engines use this content for displaying search results (although it will not influence their ranking)."
METAEXTRA: 'Custom Meta Tags' METAEXTRA: "Custom Meta Tags"
METAEXTRAHELP: 'HTML tags for additional meta information. For example &lt;meta name="customName" content="your custom content here" /&gt;' METAEXTRAHELP: "HTML tags for additional meta information. For example &lt;meta name=\"customName\" content=\"your custom content here\" /&gt;"
MODIFIEDONDRAFTHELP: 'Page has unpublished changes' MODIFIEDONDRAFTHELP: "Page has unpublished changes"
MODIFIEDONDRAFTSHORT: Modified MODIFIEDONDRAFTSHORT: Modified
MetadataToggle: Metadata MetadataToggle: Metadata
MoreOptions: 'More options' MoreOptions: "More options"
NOTPUBLISHED: 'Not published' NOTPUBLISHED: "Not published"
OBSOLETECLASS: 'This page is of obsolete type {type}. Saving will reset its type and you may lose data' OBSOLETECLASS: "This page is of obsolete type {type}. Saving will reset its type and you may lose data"
ONLIVEONLYSHORT: 'On live only' ONLIVEONLYSHORT: "On live only"
ONLIVEONLYSHORTHELP: 'Page is published, but has been deleted from draft' ONLIVEONLYSHORTHELP: "Page is published, but has been deleted from draft"
PAGELOCATION: 'Page location' PAGELOCATION: "Page location"
PAGETITLE: 'Page name' PAGETITLE: "Page name"
PAGETYPE: 'Page type' PAGETYPE: "Page type"
PARENTID: 'Parent page' PARENTID: "Parent page"
PARENTTYPE: 'Page location' PARENTTYPE: "Page location"
PARENTTYPE_ROOT: 'Top-level page' PARENTTYPE_ROOT: "Top-level page"
PARENTTYPE_SUBPAGE: 'Sub-page underneath a parent page' PARENTTYPE_SUBPAGE: "Sub-page underneath a parent page"
PERMISSION_GRANTACCESS_DESCRIPTION: 'Manage access rights for content' PERMISSION_GRANTACCESS_DESCRIPTION: "Manage access rights for content"
PERMISSION_GRANTACCESS_HELP: 'Allow setting of page-specific access restrictions in the "Pages" section.' PERMISSION_GRANTACCESS_HELP: "Allow setting of page-specific access restrictions in the \"Pages\" section."
PLURALNAME: Pages PLURALNAME: Pages
PageTypNotAllowedOnRoot: 'Page type "{type}" is not allowed on the root level' PageTypNotAllowedOnRoot: "Page type \"{type}\" is not allowed on the root level"
PageTypeNotAllowed: 'Page type "{type}" not allowed as child of this parent page' PageTypeNotAllowed: "Page type \"{type}\" not allowed as child of this parent page"
REMOVEDFROMDRAFTHELP: 'Page is published, but has been deleted from draft' REMOVEDFROMDRAFTHELP: "Page is published, but has been deleted from draft"
REMOVEDFROMDRAFTSHORT: 'Removed from draft' REMOVEDFROMDRAFTSHORT: "Removed from draft"
REMOVE_INSTALL_WARNING: 'Warning: You should remove install.php from this SilverStripe install for security reasons.' REMOVE_INSTALL_WARNING: "Warning: You should remove install.php from this SilverStripe install for security reasons."
REORGANISE_DESCRIPTION: 'Change site structure' REORGANISE_DESCRIPTION: "Change site structure"
REORGANISE_HELP: 'Rearrange pages in the site tree through drag&drop.' REORGANISE_HELP: "Rearrange pages in the site tree through drag&drop."
SHOWINMENUS: 'Show in menus?' SHOWINMENUS: "Show in menus?"
SHOWINSEARCH: 'Show in search?' SHOWINSEARCH: "Show in search?"
SINGULARNAME: Page SINGULARNAME: Page
TABBEHAVIOUR: Behavior TABBEHAVIOUR: Behavior
TABCONTENT: 'Main Content' TABCONTENT: "Main Content"
TABDEPENDENT: 'Dependent pages' TABDEPENDENT: "Dependent pages"
TOPLEVEL: 'Site Content (Top Level)' TOPLEVEL: "Site Content (Top Level)"
TOPLEVELCREATORGROUPS: 'Top level creators' TOPLEVELCREATORGROUPS: "Top level creators"
URLSegment: 'URL Segment' URLSegment: "URL Segment"
VIEWERGROUPS: 'Viewer Groups' VIEWERGROUPS: "Viewer Groups"
VIEW_ALL_DESCRIPTION: 'View any page' VIEW_ALL_DESCRIPTION: "View any page"
VIEW_ALL_HELP: 'Ability to view any page on the site, regardless of the settings on the Access tab. Requires the "Access to ''Pages'' section" permission' VIEW_ALL_HELP: "Ability to view any page on the site, regardless of the settings on the Access tab. Requires the \"Access to 'Pages' section\" permission"
VIEW_DRAFT_CONTENT: 'View draft content' VIEW_DRAFT_CONTENT: "View draft content"
VIEW_DRAFT_CONTENT_HELP: 'Applies to viewing pages outside of the CMS in draft mode. Useful for external collaborators without CMS access.' VIEW_DRAFT_CONTENT_HELP: "Applies to viewing pages outside of the CMS in draft mode. Useful for external collaborators without CMS access."
Viewers: 'Viewers Groups' Viewers: "Viewers Groups"
Visibility: Visibility Visibility: Visibility
has_one_Parent: 'Parent Page' has_one_Parent: "Parent Page"
many_many_BackLinkTracking: 'Backlink Tracking' many_many_BackLinkTracking: "Backlink Tracking"
many_many_ImageTracking: 'Image Tracking' many_many_ImageTracking: "Image Tracking"
many_many_LinkTracking: 'Link Tracking' many_many_LinkTracking: "Link Tracking"
SiteTreeFileExtension: SiteTreeFileExtension:
BACKLINK_LIST_DESCRIPTION: 'This list shows all pages where the file has been added through a WYSIWYG editor.' BACKLINK_LIST_DESCRIPTION: "This list shows all pages where the file has been added through a WYSIWYG editor."
EDIT: Edit EDIT: Edit
TITLE_INDEX: '#' TITLE_INDEX: "#"
TITLE_TYPE: Type TITLE_TYPE: Type
TITLE_USED_ON: 'Used on' TITLE_USED_ON: "Used on"
SiteTreeURLSegmentField: SiteTreeURLSegmentField:
EMPTY: 'Please enter a URL Segment or click cancel' EMPTY: "Please enter a URL Segment or click cancel"
HelpChars: ' Special characters are automatically converted or removed.' HelpChars: " Special characters are automatically converted or removed."
URLSegmentField: URLSegmentField:
Cancel: Cancel Cancel: Cancel
Edit: Edit Edit: Edit
OK: OK OK: OK
ViewArchivedEmail_ss: ViewArchivedEmail_ss:
CANACCESS: 'You can access the archived site at this link:' CANACCESS: "You can access the archived site at this link:"
HAVEASKED: 'You have asked to view the content of our site on' HAVEASKED: "You have asked to view the content of our site on"
VirtualPage: VirtualPage:
CHOOSE: 'Linked Page' CHOOSE: "Linked Page"
DESCRIPTION: 'Displays the content of another page' DESCRIPTION: "Displays the content of another page"
EditLink: edit EditLink: edit
HEADER: 'This is a virtual page' HEADER: "This is a virtual page"
HEADERWITHLINK: 'This is a virtual page copying content from "{title}" ({link})' HEADERWITHLINK: "This is a virtual page copying content from \"{title}\" ({link})"
PLURALNAME: 'Virtual Pages' PLURALNAME: "Virtual Pages"
PageTypNotAllowedOnRoot: 'Original page type "{type}" is not allowed on the root level for this virtual page' PageTypNotAllowedOnRoot: "Original page type \"{type}\" is not allowed on the root level for this virtual page"
SINGULARNAME: 'Virtual Page' SINGULARNAME: "Virtual Page"

4
tests/model/SiteTreeTest.php
View File

@ -545,6 +545,10 @@ class SiteTreeTest extends SapphireTest {
$this->assertTrue(singleton('SiteTreeTest_ClassA')->canCreate(null)); $this->assertTrue(singleton('SiteTreeTest_ClassA')->canCreate(null));
$this->assertFalse(singleton('SiteTreeTest_ClassA')->canCreate(null, array('Parent' => $parentB))); $this->assertFalse(singleton('SiteTreeTest_ClassA')->canCreate(null, array('Parent' => $parentB)));
$this->assertTrue(singleton('SiteTreeTest_ClassC')->canCreate(null, array('Parent' => $parentB))); $this->assertTrue(singleton('SiteTreeTest_ClassC')->canCreate(null, array('Parent' => $parentB)));
// Test creation underneath a parent which doesn't exist in the database. This should
// fall back to checking whether the user can create pages at the root of the site
$this->assertTrue(singleton('SiteTree')->canCreate(null, array('Parent' => singleton('SiteTree'))));
} }
public function testEditPermissionsOnDraftVsLive() { public function testEditPermissionsOnDraftVsLive() {