From 3364f5c52bc7a5059412a946fbe193235196001b Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Wed, 26 Jul 2017 18:15:15 +1200 Subject: [PATCH 01/11] API Use setTitleField to use MenuTitle for selecting internal links --- code/Forms/InternalLinkFormFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/Forms/InternalLinkFormFactory.php b/code/Forms/InternalLinkFormFactory.php index 32a3ea5686..a89e22ee8c 100644 --- a/code/Forms/InternalLinkFormFactory.php +++ b/code/Forms/InternalLinkFormFactory.php @@ -23,7 +23,7 @@ protected function getFormFields($controller, $name, $context) SiteTree::class, 'ID', 'TreeTitle' - ), + )->setTitleField('MenuTitle'), TextField::create( 'Description', _t(__CLASS__.'.LINKDESCR', 'Link description') From 53a0206b1d1216bde067435d0c58fb905a19fe51 Mon Sep 17 00:00:00 2001 From: Nic Horstmeier Date: Fri, 28 Jul 2017 14:02:29 -0500 Subject: [PATCH 02/11] BUGFIX check if parent context is SiteTree instance fixes #1913 --- code/Model/SiteTree.php | 5 +++-- tests/model/SiteTreeTest.php | 4 ++++ tests/model/SiteTreeTest.yml | 5 +++++ tests/model/SiteTreeTest_DataObject.php | 28 +++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 tests/model/SiteTreeTest_DataObject.php diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php index 66cd07566c..754899f4f8 100755 --- a/code/Model/SiteTree.php +++ b/code/Model/SiteTree.php @@ -1155,7 +1155,8 @@ public function canCreate($member = null, $context = array()) // Check parent (custom canCreate option for SiteTree) // Block children not allowed for this parent type $parent = isset($context['Parent']) ? $context['Parent'] : null; - if ($parent && !in_array(static::class, $parent->allowedChildren())) { + $strictParentInstance = ($parent && $parent instanceof SiteTree); + if ($strictParentInstance && !in_array(static::class, $parent->allowedChildren())) { return false; } @@ -1171,7 +1172,7 @@ public function canCreate($member = null, $context = array()) } // Fall over to inherited permissions - if ($parent && $parent->exists()) { + if ($strictParentInstance && $parent->exists()) { return $parent->canAddChildren($member); } else { // This doesn't necessarily mean we are creating a root page, but that diff --git a/tests/model/SiteTreeTest.php b/tests/model/SiteTreeTest.php index 2e31fe8e60..c74c91aa3b 100644 --- a/tests/model/SiteTreeTest.php +++ b/tests/model/SiteTreeTest.php @@ -50,6 +50,7 @@ class SiteTreeTest extends SapphireTest SiteTreeTest_ClassCext::class, SiteTreeTest_NotRoot::class, SiteTreeTest_StageStatusInherit::class, + SiteTreeTest_DataObject::class, ); public function testCreateDefaultpages() @@ -632,6 +633,9 @@ public function testCreatePermissions() // 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::class)->canCreate(null, array('Parent' => singleton(SiteTree::class)))); + + //Test we don't check for allowedChildren on parent context if it's not SiteTree instance + $this->assertTrue(singleton(SiteTree::class)->canCreate(null, ['Parent' => $this->objFromFixture('SiteTreeTest_DataObject', 'relations')])); } public function testEditPermissionsOnDraftVsLive() diff --git a/tests/model/SiteTreeTest.yml b/tests/model/SiteTreeTest.yml index 94abe0bb6b..68a4fff6d7 100755 --- a/tests/model/SiteTreeTest.yml +++ b/tests/model/SiteTreeTest.yml @@ -123,3 +123,8 @@ SilverStripe\CMS\Model\RedirectorPage: URLSegment: external RedirectionType: External ExternalURL: "http://www.google.com?a&b" + +SiteTreeTest_DataObject: + relations: + Title: 'Linked DataObject' + Pages: =>Page.home,=>Page.about,=>Page.staff \ No newline at end of file diff --git a/tests/model/SiteTreeTest_DataObject.php b/tests/model/SiteTreeTest_DataObject.php new file mode 100644 index 0000000000..29ca408022 --- /dev/null +++ b/tests/model/SiteTreeTest_DataObject.php @@ -0,0 +1,28 @@ + 'Varchar', + ]; + + /** + * @var array + */ + private static $many_many = [ + 'Pages' => SiteTree::class, + ]; +} From f8ea7f27cf2ed8e9780a9823e8426289cab742a8 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 31 Jul 2017 10:23:57 +1200 Subject: [PATCH 03/11] Remove sprintf translations in CMSMain in favour of named parameters --- code/Controllers/CMSMain.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php index 07a248e8d2..551e1686cf 100644 --- a/code/Controllers/CMSMain.php +++ b/code/Controllers/CMSMain.php @@ -1742,7 +1742,11 @@ public function delete($data, $form) $this->getResponse()->addHeader( 'X-Status', - rawurlencode(sprintf(_t('SilverStripe\\CMS\\Controllers\\CMSMain.REMOVEDPAGEFROMDRAFT', "Removed '%s' from the draft site"), $record->Title)) + rawurlencode(_t( + __CLASS__ . '.REMOVEDPAGEFROMDRAFT', + "Removed '{title}' from the draft site", + ['title' => $record->Title] + )) ); // Even if the record has been deleted from stage and live, it can be viewed in "archive mode" @@ -1774,7 +1778,11 @@ public function archive($data, $form) $this->getResponse()->addHeader( 'X-Status', - rawurlencode(sprintf(_t('SilverStripe\\CMS\\Controllers\\CMSMain.ARCHIVEDPAGE', "Archived page '%s'"), $record->Title)) + rawurlencode(_t( + __CLASS__ . '.ARCHIVEDPAGE', + "Archived page '{title}'", + ['title' => $record->Title] + )) ); // Even if the record has been deleted from stage and live, it can be viewed in "archive mode" From fc0362087e42d66d7d4a138c9fd52be0be0d9f50 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Fri, 19 May 2017 12:11:46 +1200 Subject: [PATCH 04/11] FIX Remove legacy sprintf style translations in favour of placeholders --- code/BatchActions/CMSBatchAction_Archive.php | 4 ++-- code/BatchActions/CMSBatchAction_Publish.php | 4 ++-- code/BatchActions/CMSBatchAction_Restore.php | 4 ++-- code/BatchActions/CMSBatchAction_Unpublish.php | 4 ++-- code/Controllers/CMSMain.php | 8 ++++---- lang/ar.yml | 4 ++-- lang/bg.yml | 6 +++--- lang/bs.yml | 2 +- lang/ca.yml | 2 +- lang/cs.yml | 6 +++--- lang/da.yml | 2 +- lang/de.yml | 6 +++--- lang/en.yml | 6 +++--- lang/eo.yml | 6 +++--- lang/es.yml | 6 +++--- lang/es_AR.yml | 2 +- lang/es_MX.yml | 2 +- lang/et_EE.yml | 2 +- lang/fa_IR.yml | 6 +++--- lang/fi.yml | 6 +++--- lang/fo.yml | 2 +- lang/fr.yml | 6 +++--- lang/gl_ES.yml | 2 +- lang/hr.yml | 6 +++--- lang/hu.yml | 4 ++-- lang/id.yml | 4 ++-- lang/it.yml | 6 +++--- lang/ja.yml | 6 +++--- lang/ko.yml | 4 ++-- lang/lt.yml | 6 +++--- lang/mi.yml | 4 ++-- lang/nb.yml | 6 +++--- lang/nl.yml | 4 ++-- lang/pl.yml | 4 ++-- lang/pt.yml | 4 ++-- lang/pt_BR.yml | 2 +- lang/ro.yml | 4 ++-- lang/ru.yml | 6 +++--- lang/si.yml | 2 +- lang/sk.yml | 6 +++--- lang/sl.yml | 4 ++-- lang/sr.yml | 4 ++-- lang/sr_RS@latin.yml | 4 ++-- lang/sv.yml | 6 +++--- lang/th.yml | 2 +- lang/tr.yml | 2 +- lang/uk.yml | 2 +- lang/zh.yml | 2 +- lang/zh_CN.yml | 2 +- .../CMS/Controllers/Includes/CMSMain_Content.ss | 6 +++--- .../CMS/Controllers/Includes/CMSMain_EditForm.ss | 2 +- .../CMS/Controllers/Includes/CMSMain_ListView.ss | 6 +++--- .../CMS/Controllers/Includes/CMSMain_TreeView.ss | 6 +++--- .../CMS/Controllers/Includes/CMSMain_ViewControls.ss | 4 ++-- .../Includes/CMSPageAddController_Content.ss | 2 +- .../Includes/CMSPageHistoryController_versions.ss | 10 +++++----- .../Includes/CMSPagesController_ContentToolActions.ss | 4 ++-- .../SilverStripe/CMS/Forms/SiteTreeURLSegmentField.ss | 6 +++--- .../Includes/SiteTreeFileExtension_description.ss | 6 +++--- .../CMS/Model/Includes/SiteTree_Information.ss | 6 +++--- 60 files changed, 131 insertions(+), 131 deletions(-) diff --git a/code/BatchActions/CMSBatchAction_Archive.php b/code/BatchActions/CMSBatchAction_Archive.php index 5df614554d..0f185743c0 100644 --- a/code/BatchActions/CMSBatchAction_Archive.php +++ b/code/BatchActions/CMSBatchAction_Archive.php @@ -12,7 +12,7 @@ class CMSBatchAction_Archive extends CMSBatchAction { public function getActionTitle() { - return _t('SilverStripe\\CMS\\BatchActions\\CMSBatchAction_Archive.TITLE', 'Unpublish and archive'); + return _t(__CLASS__ . '.TITLE', 'Unpublish and archive'); } public function run(SS_List $pages) @@ -20,7 +20,7 @@ public function run(SS_List $pages) return $this->batchaction( $pages, 'doArchive', - _t('SilverStripe\\CMS\\BatchActions\\CMSBatchAction_Archive.RESULT', 'Deleted %d pages from draft and live, and sent them to the archive') + _t(__CLASS__ . '.RESULT', 'Deleted %d pages from draft and live, and sent them to the archive') ); } diff --git a/code/BatchActions/CMSBatchAction_Publish.php b/code/BatchActions/CMSBatchAction_Publish.php index d9e7b53340..2ed3fd15d2 100644 --- a/code/BatchActions/CMSBatchAction_Publish.php +++ b/code/BatchActions/CMSBatchAction_Publish.php @@ -12,7 +12,7 @@ class CMSBatchAction_Publish extends CMSBatchAction { public function getActionTitle() { - return _t(__CLASS__.'.PUBLISH_PAGES', 'Publish'); + return _t(__CLASS__ . '.PUBLISH_PAGES', 'Publish'); } public function run(SS_List $pages) @@ -20,7 +20,7 @@ public function run(SS_List $pages) return $this->batchaction( $pages, 'publishRecursive', - _t(__CLASS__.'.PUBLISHED_PAGES', 'Published %d pages, %d failures') + _t(__CLASS__ . '.PUBLISHED_PAGES', 'Published %d pages, %d failures') ); } diff --git a/code/BatchActions/CMSBatchAction_Restore.php b/code/BatchActions/CMSBatchAction_Restore.php index f95634736c..5573b831d7 100644 --- a/code/BatchActions/CMSBatchAction_Restore.php +++ b/code/BatchActions/CMSBatchAction_Restore.php @@ -17,7 +17,7 @@ class CMSBatchAction_Restore extends CMSBatchAction public function getActionTitle() { - return _t(__CLASS__.'.RESTORE', 'Restore'); + return _t(__CLASS__ . '.RESTORE', 'Restore'); } public function run(SS_List $pages) @@ -38,7 +38,7 @@ public function run(SS_List $pages) return $this->batchaction( $pages, 'doRestoreToStage', - _t(__CLASS__.'.RESTORED_PAGES', 'Restored %d pages') + _t(__CLASS__ . '.RESTORED_PAGES', 'Restored %d pages') ); } diff --git a/code/BatchActions/CMSBatchAction_Unpublish.php b/code/BatchActions/CMSBatchAction_Unpublish.php index 7d85149389..ad09509273 100644 --- a/code/BatchActions/CMSBatchAction_Unpublish.php +++ b/code/BatchActions/CMSBatchAction_Unpublish.php @@ -12,7 +12,7 @@ class CMSBatchAction_Unpublish extends CMSBatchAction { public function getActionTitle() { - return _t(__CLASS__.'.UNPUBLISH_PAGES', 'Unpublish'); + return _t(__CLASS__ . '.UNPUBLISH_PAGES', 'Unpublish'); } public function run(SS_List $pages) @@ -20,7 +20,7 @@ public function run(SS_List $pages) return $this->batchaction( $pages, 'doUnpublish', - _t(__CLASS__.'.UNPUBLISHED_PAGES', 'Unpublished %d pages') + _t(__CLASS__ . '.UNPUBLISHED_PAGES', 'Unpublished %d pages') ); } diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php index 551e1686cf..67cf7d5133 100644 --- a/code/Controllers/CMSMain.php +++ b/code/Controllers/CMSMain.php @@ -1708,7 +1708,7 @@ public function revert($data, $form) rawurlencode(_t( 'SilverStripe\\CMS\\Controllers\\CMSMain.RESTORED', "Restored '{title}' successfully", - 'Param %s is a title', + 'Param {title} is a title', array('title' => $record->Title) )) ); @@ -1853,14 +1853,14 @@ public function doRollback($data, $form) if ($version) { $record->doRollbackTo($version); $message = _t( - 'SilverStripe\\CMS\\Controllers\\CMSMain.ROLLEDBACKVERSIONv2', - "Rolled back to version #%d.", + __CLASS__ . '.ROLLEDBACKVERSIONv2', + "Rolled back to version #{version}.", array('version' => $data['Version']) ); } else { $record->doRevertToLive(); $message = _t( - 'SilverStripe\\CMS\\Controllers\\CMSMain.ROLLEDBACKPUBv2', + __CLASS__ . '.ROLLEDBACKPUBv2', "Rolled back to published version." ); } diff --git a/lang/ar.yml b/lang/ar.yml index 2e2faf1680..012e4c8bfe 100644 --- a/lang/ar.yml +++ b/lang/ar.yml @@ -16,10 +16,10 @@ ar: PUBPAGES: 'تمّ: نشر {count} صفحات' PageAdded: 'تم إنشاء الصفحة بنجاح' REMOVEDPAGE: 'أزيل ''{title}'' من الموقع المنشور' - REMOVEDPAGEFROMDRAFT: '''%s'' محذوف من مسودة الموقع' + REMOVEDPAGEFROMDRAFT: '''{title}'' محذوف من مسودة الموقع' RESTORED: 'استعادة ''{title}'' بنجاح' ROLLEDBACKPUBv2: 'التراجع إلى النسخة المنشورة.' - ROLLEDBACKVERSIONv2: 'التراجع إلى النسخة #%d.' + ROLLEDBACKVERSIONv2: 'التراجع إلى النسخة #{version}.' SAVEDRAFT: 'احفظ المسودة' SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: 'تحت صفحة أخرى' diff --git a/lang/bg.yml b/lang/bg.yml index a73b43482b..28238febe6 100644 --- a/lang/bg.yml +++ b/lang/bg.yml @@ -16,7 +16,7 @@ bg: ACCESS_HELP: 'Разреши излгед на раздела съдържащ структурното дърво и съдържанието. Правата за достъп и редактиране могат да бъдат променени през падащи менюта (dropdowns), както и чрез отделни права на съдържанието' APPLY_FILTER: Търси ARCHIVE: 'Архивирай' - ARCHIVEDPAGE: 'Страница ''%s'' беше архивирана' + ARCHIVEDPAGE: 'Страница ''{title}'' беше архивирана' AddNew: 'Добави страница' AddNewButton: 'Добави нова страница' AddPageRestriction: 'Забележка: Някои типове страници не могат да бъдат подстраници на избраната' @@ -42,7 +42,7 @@ bg: PUBPAGES: 'Готово. Публикувани бяха {count} страница/и' PageAdded: 'Страницата беше създадена успешно' REMOVEDPAGE: 'Страница ''{title}'' беше премахната от публикувания сайт' - REMOVEDPAGEFROMDRAFT: 'Премахната(и) ''%s'' от черновите' + REMOVEDPAGEFROMDRAFT: 'Премахната(и) ''{title}'' от черновите' REORGANISATIONSUCCESSFUL: 'Успешна реорганизацията на страниците в сайта.' RESTORE: 'Възстанови чернова' RESTORED: 'Успешно възтановен/а ''{title}''' @@ -51,7 +51,7 @@ bg: RESTORE_TO_ROOT_DESC: 'Възстанови архивираната версия до чернова като страница от най-високо ниво' ROLLBACK: 'Върни към тази версия' ROLLEDBACKPUBv2: 'Беше върнато до публикуваната версия' - ROLLEDBACKVERSIONv2: 'Беше върната версия #%d.' + ROLLEDBACKVERSIONv2: 'Беше върната версия #{version}.' SAVED: 'Страница ''{title}'' беше записана успешно.' SAVEDRAFT: 'Запиши чернова' SHOW_AS_LIST: 'покажи в списък' diff --git a/lang/bs.yml b/lang/bs.yml index c15ef03be6..d2875f46b1 100644 --- a/lang/bs.yml +++ b/lang/bs.yml @@ -4,7 +4,7 @@ bs: PAGENOTEXISTS: 'Ova stranica ne postoji' PUBALLCONFIRM: 'Molimo, objavite svaku stavku na ovoj stranici, kopiranjem sadržaja na aktivnu stranicu' PUBALLFUN: 'Funkcija "Objavi sve"' - REMOVEDPAGEFROMDRAFT: 'Uklonjeno ''%s'' sa privremenog nacrta stranice' + REMOVEDPAGEFROMDRAFT: 'Uklonjeno ''{title}'' sa privremenog nacrta stranice' SilverStripe\CMS\Model\ErrorPage: CODE: 'Kod greške' CODE_400: '400 - Pogrešan zahtjev' diff --git a/lang/ca.yml b/lang/ca.yml index eb3927fb7f..9dfa2ae4e2 100644 --- a/lang/ca.yml +++ b/lang/ca.yml @@ -3,7 +3,7 @@ ca: PAGENOTEXISTS: 'Aquesta pàgina no existeix' PUBALLCONFIRM: 'Publica cada pàgina del lloc web, copiant el contingut cap a la versió publicada' PUBALLFUN: 'Funcionalitat de "Publica-ho tot"' - REMOVEDPAGEFROMDRAFT: 'S''ha suprimit ''%s'' del lloc esborrany' + REMOVEDPAGEFROMDRAFT: 'S''ha suprimit ''{title}'' del lloc esborrany' SilverStripe\CMS\Model\ErrorPage: CODE: 'Codi d''error' CODE_400: '400 - Mala petició' diff --git a/lang/cs.yml b/lang/cs.yml index 347e6359d1..d8bc347bb6 100644 --- a/lang/cs.yml +++ b/lang/cs.yml @@ -16,7 +16,7 @@ cs: ACCESS_HELP: 'Povolit prohlížení sekce obsahující strukturu a obsah webu. Oprávnění na prohlížení a úpravu mohou být nastavena skrze menu pro samostatnou stránku, také jako jednotlivé oprávnění pro obsah.' APPLY_FILTER: Hledat ARCHIVE: Archív - ARCHIVEDPAGE: 'Archivovaná stránka ''%s''' + ARCHIVEDPAGE: 'Archivovaná stránka ''{title}''' AddNew: 'Přidat novou stránku' AddNewButton: 'Přidat nový' AddPageRestriction: 'Poznámka: Některé typy stránek nejsou povoleny při tomto výběru' @@ -47,7 +47,7 @@ cs: PUBPAGES: 'Hotovo: Zveřejněno {count} stránek' PageAdded: 'Stránka vytvořena úspěšně' REMOVEDPAGE: 'Odstraněno ''{title}'' ze zveřejněného webu' - REMOVEDPAGEFROMDRAFT: 'Odstraněno ''%s'' z konceptu webu' + REMOVEDPAGEFROMDRAFT: 'Odstraněno ''{title}'' z konceptu webu' REORGANISATIONSUCCESSFUL: 'Strom webu reorganizován úspěšně.' RESTORE: 'Obnovit koncept' RESTORED: 'Obnoveno ''{title}'' úspěšně' @@ -56,7 +56,7 @@ cs: RESTORE_TO_ROOT_DESC: 'Obnovit archivovanou verzi na koncept stránky nejvyšší úrovně' ROLLBACK: 'Vrátit zpět na tuto verzi' ROLLEDBACKPUBv2: 'Vráceno zpět na zveřejněnou verzi.' - ROLLEDBACKVERSIONv2: 'Vráceno zpět na verzi #%d.' + ROLLEDBACKVERSIONv2: 'Vráceno zpět na verzi #{version}.' SAVED: 'Uloženo ''{title}'' úspěšně' SAVEDRAFT: 'Uložit koncept' SHOW_AS_LIST: 'ukázat jako seznam' diff --git a/lang/da.yml b/lang/da.yml index d785c6599f..d651229103 100644 --- a/lang/da.yml +++ b/lang/da.yml @@ -14,7 +14,7 @@ da: PUBPAGES: 'Færdig: Udgav {count} sider' PageAdded: 'Siden blev oprettet med succes' REMOVEDPAGE: 'Fjernede ''{title}'' fra den udgivne side' - REMOVEDPAGEFROMDRAFT: '''%s'' fjernet fra udkast-sitet' + REMOVEDPAGEFROMDRAFT: '''{title}'' fjernet fra udkast-sitet' RESTORED: 'Genskabte ''{title}'' korrekt' SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: 'Under en anden side' diff --git a/lang/de.yml b/lang/de.yml index 6bfdf91e5e..235e999dfe 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -16,7 +16,7 @@ de: ACCESS_HELP: 'Seiteninhalt im CMS anzeigen. Anzeige- und Bearbeitungsberechtigungen können sowohl seitenspezifische als auch über die globalen Inhaltsberechtigungen gesetzt werden.' APPLY_FILTER: Suche ARCHIVE: Archiv - ARCHIVEDPAGE: 'Seite ''%s'' archiviert' + ARCHIVEDPAGE: 'Seite ''{title}'' archiviert' AddNew: 'Neue Seite hinzufügen' AddNewButton: Hinzufügen AddPageRestriction: 'Hinweis: einige Seitentypen sind in diesem Bereich nicht erlaubt.' @@ -39,7 +39,7 @@ de: PUBPAGES: 'Abgeschlossen: {count} Seiten wurden veröffentlicht' PageAdded: 'Seite erfolgreich erstellt' REMOVEDPAGE: '''{title}'' wurde von der veröffentlichten Site entfernt' - REMOVEDPAGEFROMDRAFT: 'Lösche ''%s'' von der Entwurfs-Site' + REMOVEDPAGEFROMDRAFT: 'Lösche ''{title}'' von der Entwurfs-Site' RESTORE: 'Entwurf wiederherstellen' RESTORED: '''{title}'' wurde wiederhergestellt' RESTORE_DESC: 'Entwurf aus archivierter Version wiederherstellen' @@ -47,7 +47,7 @@ de: RESTORE_TO_ROOT_DESC: 'Archivierte Version als Entwurf in oberster Ebene wiederherstellen' ROLLBACK: 'Diese Version wiederherstellen' ROLLEDBACKPUBv2: 'Veröffentlichte Version wiederhergestellt' - ROLLEDBACKVERSIONv2: 'Version #%d wiederhergestellt.' + ROLLEDBACKVERSIONv2: 'Version #{version} wiederhergestellt.' SAVED: '''{title}'' erfolgreich gespeichert.' SAVEDRAFT: 'Entwurf speichern' SHOW_AS_LIST: 'als Liste zeigen' diff --git a/lang/en.yml b/lang/en.yml index 1a231cf088..246998108c 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -16,7 +16,7 @@ en: 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".' APPLY_FILTER: Search ARCHIVE: Archive - ARCHIVEDPAGE: 'Archived page ''%s''' + ARCHIVEDPAGE: 'Archived page ''{title}''' AddNew: 'Add new page' AddNewButton: 'Add new' AddPageRestriction: 'Note: Some page types are not allowed for this selection' @@ -47,7 +47,7 @@ en: PUBPAGES: 'Done: Published {count} pages' PageAdded: 'Successfully created page' REMOVEDPAGE: 'Removed ''{title}'' from the published site' - REMOVEDPAGEFROMDRAFT: 'Removed ''%s'' from the draft site' + REMOVEDPAGEFROMDRAFT: 'Removed ''{title}'' from the draft site' REORGANISATIONSUCCESSFUL: 'Reorganised the site tree successfully.' RESTORE: 'Restore draft' RESTORED: 'Restored ''{title}'' successfully' @@ -56,7 +56,7 @@ en: 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.' + ROLLEDBACKVERSIONv2: 'Rolled back to version #{version}.' SAVED: 'Saved ''{title}'' successfully.' SAVEDRAFT: 'Save draft' SHOW_AS_LIST: 'show as list' diff --git a/lang/eo.yml b/lang/eo.yml index e959bc3854..d0b3a396e7 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -16,7 +16,7 @@ eo: ACCESS_HELP: 'Permesi vidigi la sekcion kiu enhavas paĝarbon kaj enhavon. Vidigaj kaj redaktaj permesoj estas trakteblaj per paĝspecifaj fallistoj, kaj ankaŭ la apartaj "Enhavaj permesoj".' APPLY_FILTER: Serĉi ARCHIVE: Enarkivigi - ARCHIVEDPAGE: 'Enarkivigis paĝon ''%s''' + ARCHIVEDPAGE: 'Enarkivigis paĝon ''{title}''' AddNew: 'Aldoni novan paĝon' AddNewButton: 'Aldoni novan' AddPageRestriction: 'Noto: iuj tipoj de paĝoj ne estas permesataj por ĉi tiu elektaĵo.' @@ -47,7 +47,7 @@ eo: PUBPAGES: 'Farite: publikigis {count} paĝojn' PageAdded: 'Sukcese kreis paĝon' REMOVEDPAGE: 'Forigis je ''{title}'' el la publikigita retejo' - REMOVEDPAGEFROMDRAFT: 'Forigis je ''%s'' el la malneta retejo' + REMOVEDPAGEFROMDRAFT: 'Forigis je ''{title}'' el la malneta retejo' REORGANISATIONSUCCESSFUL: 'Sukcese reorganizis la retejan arbon.' RESTORE: 'Restaŭri malneton' RESTORED: 'Sukcese restaŭris je ''{title}''' @@ -56,7 +56,7 @@ eo: RESTORE_TO_ROOT_DESC: 'Restaŭri la enarkivigitan version al malneto kiel supranivela paĝo' ROLLBACK: 'Malfari al ĉi tiu versio' ROLLEDBACKPUBv2: 'Malfaris ŝanĝojn ĝis la publikigita versio.' - ROLLEDBACKVERSIONv2: 'Malfaris ŝanĝojn ĝis versio #%d.' + ROLLEDBACKVERSIONv2: 'Malfaris ŝanĝojn ĝis versio #{version}.' SAVED: 'Sukcese konservis je ''{title}''' SAVEDRAFT: 'Konservi malneton' SHOW_AS_LIST: 'vidigi kiel liston' diff --git a/lang/es.yml b/lang/es.yml index 231db76d08..22065893be 100644 --- a/lang/es.yml +++ b/lang/es.yml @@ -7,7 +7,7 @@ es: ACCESS_HELP: 'Permitir la visualización de la sección que contiene el árbol de la página y el contenido. Ver y editar permisos puede ser gestionado a través de menús desplegables específicos de las páginas, así como los "permisos de contenido" separados.' APPLY_FILTER: Buscar ARCHIVE: Archivar - ARCHIVEDPAGE: '''%s'' páginas archivadas' + ARCHIVEDPAGE: '''{title}'' páginas archivadas' AddPageRestriction: 'Agregar restricción a la página' CLEAR_FILTER: Limpiar Cancel: Cancelar @@ -28,14 +28,14 @@ es: PUBPAGES: 'Hecho: Publicadas {count} páginas' PageAdded: 'Página creada correctamente' REMOVEDPAGE: 'Eliminado ''{title}'' del sitio publicado' - REMOVEDPAGEFROMDRAFT: 'Borrado ''%s''%s desde el sitio no publicado' + REMOVEDPAGEFROMDRAFT: 'Borrado ''{title}'' desde el sitio no publicado' RESTORE: 'Restaurar borrador' RESTORED: 'Restablecido ''{title}'' correctamente' RESTORE_DESC: 'Recuperar la versión archivada del borrador' RESTORE_TO_ROOT: 'Recuperar borrador al nivel superior' RESTORE_TO_ROOT_DESC: 'Recuperar la versión archivada del borrador como de nivel superior' ROLLEDBACKPUBv2: Restaurado - ROLLEDBACKVERSIONv2: 'Versión #%d restaurada' + ROLLEDBACKVERSIONv2: 'Versión #{version} restaurada' SAVED: '''{title}'' guardado satisfactoriamente.' SAVEDRAFT: 'Guardar borrador' UNPUBLISH_AND_ARCHIVE: 'Despublicar y archivar' diff --git a/lang/es_AR.yml b/lang/es_AR.yml index ca270f470d..ac97775db5 100644 --- a/lang/es_AR.yml +++ b/lang/es_AR.yml @@ -4,7 +4,7 @@ es_AR: PAGENOTEXISTS: 'Esta página no existe' PUBALLCONFIRM: 'Por favor publica todas las páginas del sitio, copiando el contenido del boceto al sitio público' PUBALLFUN: 'Funcionalidad "Publicar Todo"' - REMOVEDPAGEFROMDRAFT: 'Quitados ''%s'' del borrador del sitio' + REMOVEDPAGEFROMDRAFT: 'Quitados ''{title}'' del borrador del sitio' SilverStripe\CMS\Controllers\ContentController: DRAFTSITE: 'Sitio borrador' LOGGEDINAS: 'Conectado como' diff --git a/lang/es_MX.yml b/lang/es_MX.yml index 19c8995039..9611d721a3 100644 --- a/lang/es_MX.yml +++ b/lang/es_MX.yml @@ -3,7 +3,7 @@ es_MX: PAGENOTEXISTS: 'Esta página no existe' PUBALLCONFIRM: 'Por favor publique todas las páginas del sitio, copiando el contenido del boceto al sitio público' PUBALLFUN: 'Funcionalidad "Publicar todo"' - REMOVEDPAGEFROMDRAFT: 'Se ha eliminado ''%s'' del boceto del sitio' + REMOVEDPAGEFROMDRAFT: 'Se ha eliminado ''{title}'' del boceto del sitio' SilverStripe\CMS\Controllers\ContentController: ARCHIVEDSITEFROM: 'Sito archivado de' DRAFTSITE: 'Proyecto del Sitio' diff --git a/lang/et_EE.yml b/lang/et_EE.yml index 9b875d568a..866c6d45da 100644 --- a/lang/et_EE.yml +++ b/lang/et_EE.yml @@ -13,7 +13,7 @@ et_EE: PUBPAGES: 'Valmis: {count} lehte avaldatud' PageAdded: 'Lehekülje loomine õnnestus' REMOVEDPAGE: 'Leht ''{title}'' eemaldati avaldatud saitide hulgast' - REMOVEDPAGEFROMDRAFT: '''%s'' eemaldatud visandi lehelt' + REMOVEDPAGEFROMDRAFT: '''{title}'' eemaldatud visandi lehelt' RESTORED: '''{title}'' taastati edukalt' SAVEDRAFT: 'Salvesta mustand' SilverStripe\CMS\Controllers\CMSPageAddController: diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml index 000cda79aa..db6749e0d3 100644 --- a/lang/fa_IR.yml +++ b/lang/fa_IR.yml @@ -10,7 +10,7 @@ fa_IR: ACCESS: 'دسترسی به بخش ''{title}''' APPLY_FILTER: جستجو ARCHIVE: بایگانی - ARCHIVEDPAGE: 'صفحه بایگانی شده ''%s''' + ARCHIVEDPAGE: 'صفحه بایگانی شده ''{title}''' AddPageRestriction: 'یادداشت: برخی انواع صفحه برای این انتخاب مجاز نیستند.' CLEAR_FILTER: پاک‌کردن Cancel: لغو @@ -30,14 +30,14 @@ fa_IR: PUBPAGES: 'انجام شد: انتشار {count} صفحه' PageAdded: 'صفحه با موفقیت ایجاد شد' REMOVEDPAGE: 'حذف ''{title}'' از سایت منتشر شده' - REMOVEDPAGEFROMDRAFT: 'حذف ''%s'' از سایت پیش‌نویس' + REMOVEDPAGEFROMDRAFT: 'حذف ''{title}'' از سایت پیش‌نویس' RESTORE: 'بازنشانی پیش‌نویس' RESTORED: 'بازنشانی موفقیت‌آمیز ''{title}''' RESTORE_DESC: 'بازنشانی نسخه‌ی بایگانی‌شده در پیش‌نویس' RESTORE_TO_ROOT: 'بازنشانی پیش‌نویس در سطح بالا' RESTORE_TO_ROOT_DESC: 'بازنشانی نسخه‌ی بایگانی‌شده به پیش‌نویس به عنوان یک صفحه‌ی سطح بالا' ROLLEDBACKPUBv2: 'بازگردانی به نسخه‌ی منتشرشده.' - ROLLEDBACKVERSIONv2: 'بازگردانی به نسخه‌ی #%d.' + ROLLEDBACKVERSIONv2: 'بازگردانی به نسخه‌ی #{version}.' SAVED: 'دخیره‌سازی ''{title}'' باموفقیت انجام شد.' SAVEDRAFT: 'ذخیره پیش‌نویس' UNPUBLISH_AND_ARCHIVE: 'عدم انتشار و بایگانی' diff --git a/lang/fi.yml b/lang/fi.yml index 33dcc2e07e..d6a5cbf606 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -15,7 +15,7 @@ fi: ACCESS_HELP: 'Oikeuttaa näkemään osion, joka sisältää sivurakenteen ja sisällön. Katselu- ja muokkausoikeuksia voidaan käsitellä sivukohtaisten pudotusvalikoiden kautta, kuten myös erillisestä "Sisällön oikeudet"-kohdasta.' APPLY_FILTER: Haku ARCHIVE: Arkistoi - ARCHIVEDPAGE: 'Arkistoitiin sivu ''%s''' + ARCHIVEDPAGE: 'Arkistoitiin sivu ''{title}''' AddNew: 'Lisää uusi sivu' AddNewButton: 'Lisää uusi' AddPageRestriction: 'Huomio: Tietyt sivutyypit eivät ole sallittuja valitun sivutyypin alle.' @@ -46,7 +46,7 @@ fi: PUBPAGES: 'Valmis: julkaistiin {count} sivu(a)' PageAdded: 'Sivun luonti onnistui' REMOVEDPAGE: '''{title}'' poistettiin julkaistulta sivustolta' - REMOVEDPAGEFROMDRAFT: 'Poistettu ''%s'' luonnossivustolta' + REMOVEDPAGEFROMDRAFT: 'Poistettu ''{title}'' luonnossivustolta' REORGANISATIONSUCCESSFUL: 'Hakemistopuu uudelleenjärjestettiin onnistuneesti.' RESTORE: 'Palauta luonnos' RESTORED: '''{title}'' palautettiin onnistuneesti' @@ -55,7 +55,7 @@ fi: RESTORE_TO_ROOT_DESC: 'Palauta arkistoitu versio luonnoksena päätason sivuksi' ROLLBACK: 'Palauta tähän versioon' ROLLEDBACKPUBv2: 'Palattiin takaisin julkaistuun versioon' - ROLLEDBACKVERSIONv2: 'Palautettu versioon #%d.' + ROLLEDBACKVERSIONv2: 'Palautettu versioon #{version}.' SAVED: 'Tallennettiin ''{title}'' onnistuneesti.' SAVEDRAFT: 'Tallenna luonnos' SHOW_AS_LIST: 'näytä listana' diff --git a/lang/fo.yml b/lang/fo.yml index eb3a8683d2..e92ec165af 100644 --- a/lang/fo.yml +++ b/lang/fo.yml @@ -3,7 +3,7 @@ fo: PAGENOTEXISTS: 'Hendan síðan finst ikki.' PUBALLCONFIRM: 'Vinarliga almenna kunngerð allar síðurnar á heimasíðuni, avrita innihaldsstøðið til beinleiðis' PUBALLFUN: '"Ger alt alment" funka' - REMOVEDPAGEFROMDRAFT: 'Strikaði ''%s'' frá kladdu heimasíðuni' + REMOVEDPAGEFROMDRAFT: 'Strikaði ''{title}'' frá kladdu heimasíðuni' SilverStripe\CMS\Model\ErrorPage: CODE: Feilkota CODE_404: '404 - Ikki funnin' diff --git a/lang/fr.yml b/lang/fr.yml index 3ab630a387..13ef354867 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -3,7 +3,7 @@ fr: ACCESS: "Droits d’accès à la section «\_{title}\_»" ACCESS_HELP: 'Permettre l''affichage de la section contenant l''arborescence et le contenu. La gestion des permissions de visualisation et d''édition peut se faire à travers des liste spécifiques à chaque page. Et aussi la "Permission de contenu" séparé.' ARCHIVE: Archive - ARCHIVEDPAGE: 'Page ''%s'' archivée' + ARCHIVEDPAGE: 'Page ''{title}'' archivée' AddPageRestriction: 'Note : certains types de page ne sont pas autorisés pour cette sélection' Cancel: Annuler ChoosePageParentMode: 'Choisissez où créer cette page' @@ -19,10 +19,10 @@ fr: PUBPAGES: '{count} pages ont été correctement publiées' PageAdded: 'La page a été créée avec succès ' REMOVEDPAGE: "«\_{title}\_» a été éliminée du site public " - REMOVEDPAGEFROMDRAFT: 'Supprimé ''%s'' du site de test' + REMOVEDPAGEFROMDRAFT: 'Supprimé ''{title}'' du site de test' RESTORED: "«\_{title}\_» restaurée avec succès" ROLLEDBACKPUBv2: 'Revenir à la version publiée' - ROLLEDBACKVERSIONv2: 'Revenir à la version #%d' + ROLLEDBACKVERSIONv2: 'Revenir à la version #{version}' SAVEDRAFT: 'Sauvegarder le brouillon' SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: 'Sous une autre page' diff --git a/lang/gl_ES.yml b/lang/gl_ES.yml index c729f31bfa..dba1a817b1 100644 --- a/lang/gl_ES.yml +++ b/lang/gl_ES.yml @@ -7,7 +7,7 @@ gl_ES: PAGETYPEANYOPT: Ningún PUBALLCONFIRM: 'Por favor publica toda a páxina no sitio, copiando o contido a contorna de produción' PUBALLFUN: 'Funcionalidade "Publicar Todo"' - REMOVEDPAGEFROMDRAFT: 'Eliminado ''%s'' do borrador do sitio' + REMOVEDPAGEFROMDRAFT: 'Eliminado ''{title}'' do borrador do sitio' SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: 'Baixo outra páxina' ParentMode_top: 'Nivel superior' diff --git a/lang/hr.yml b/lang/hr.yml index 70fa0d7fda..4e062073e1 100644 --- a/lang/hr.yml +++ b/lang/hr.yml @@ -7,7 +7,7 @@ hr: ACCESS_HELP: 'Dozvoli pregledavati sekcije sadržanog stabla i sadržaja strancie. Dozvole za pregled i uređivanje mogu se mijenjati putem stranicama specifičnim padajućim izbornicima kao i posebnim "Sadržajnim dozvolama".' APPLY_FILTER: Traži ARCHIVE: Arhiviraj - ARCHIVEDPAGE: 'Arhivirane stranice ''%s''' + ARCHIVEDPAGE: 'Arhivirane stranice ''{title}''' AddPageRestriction: 'Napomena: neke vrste stranica nisu dozvoljene za ovu sekciju' CLEAR_FILTER: Očisti Cancel: Odustani @@ -28,14 +28,14 @@ hr: PUBPAGES: 'Gotovo: Objavljeno {count} stranica' PageAdded: 'Uspješno kreirane stranice' REMOVEDPAGE: 'Uklonjen ''{title}'' sa objavljene stranice' - REMOVEDPAGEFROMDRAFT: 'Uklonjen ''%s'' sa nacrtne stranice' + REMOVEDPAGEFROMDRAFT: 'Uklonjen ''{title}'' sa nacrtne stranice' RESTORE: 'Povrati nacrt' RESTORED: 'Vraćeno ''{title}'' uspješno' RESTORE_DESC: 'Vrati arhiviranu verziju u nacrt' RESTORE_TO_ROOT: 'Povrati nacrt na najviši nivo' RESTORE_TO_ROOT_DESC: 'Povrati arhiviranu verziju u nacrt na najviši nivo' ROLLEDBACKPUBv2: 'Vraćeno na objavljenu verziju' - ROLLEDBACKVERSIONv2: 'Vraćeno na verziju #%d.' + ROLLEDBACKVERSIONv2: 'Vraćeno na verziju #{version}.' SAVED: 'Uspješno spremljen ''{title}''' SAVEDRAFT: 'Spremiti nacrt' UNPUBLISH_AND_ARCHIVE: 'Odjavi i arhiviraj' diff --git a/lang/hu.yml b/lang/hu.yml index 7245b43fa3..1c9384a8b1 100644 --- a/lang/hu.yml +++ b/lang/hu.yml @@ -14,10 +14,10 @@ hu: PUBPAGES: '{count} oldalt publikált' PageAdded: 'Oldal sikeresen létrehozva' REMOVEDPAGE: '''{title}'' törölve a publikált oldalról' - REMOVEDPAGEFROMDRAFT: '''%s'' törlése a piszkozatoldalról' + REMOVEDPAGEFROMDRAFT: '''{title}'' törlése a piszkozatoldalról' RESTORED: '''{title}'' sikeresen helyreállítva' ROLLEDBACKPUBv2: 'Visszatérés a publikált verzióhoz.' - ROLLEDBACKVERSIONv2: '#%d verzió beállítva.' + ROLLEDBACKVERSIONv2: '#{version} verzió beállítva.' SAVEDRAFT: 'Piszkozat mentése' SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: 'Másik oldal alatt' diff --git a/lang/id.yml b/lang/id.yml index b8b6c0ba51..1298412ce7 100644 --- a/lang/id.yml +++ b/lang/id.yml @@ -17,13 +17,13 @@ id: PUBPAGES: 'Selesai: {count} laman terbit' PageAdded: 'Laman berhasil dibuat' REMOVEDPAGE: 'Menghapus ''{title}'' dari situs terbit' - REMOVEDPAGEFROMDRAFT: 'Menghapus ''%s'' dari draf situs' + REMOVEDPAGEFROMDRAFT: 'Menghapus ''{title}'' dari draf situs' RESTORED: 'Pemulihan ''{title}'' sukses' RESTORE_DESC: 'Pulihkan versi arsip ke draf' RESTORE_TO_ROOT: 'Pulihkan draf pada level teratas' RESTORE_TO_ROOT_DESC: 'Pulihkan versi arsip ke draf sebagai halaman level teratas' ROLLEDBACKPUBv2: 'Kembali ke versi terbit' - ROLLEDBACKVERSIONv2: 'Kembali ke versi #%d.' + ROLLEDBACKVERSIONv2: 'Kembali ke versi #{version}.' SAVEDRAFT: 'Simpan draf' SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: 'Di bawah laman lain' diff --git a/lang/it.yml b/lang/it.yml index 5ca23f785f..f363df63a4 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -16,7 +16,7 @@ it: ACCESS_HELP: 'Consente la visualizzazione della sezione con l''albero delle pagine e i contenuti. I permessi di visualizzazione e modifica possono essere gestiti attraverso menù a tendina specifici della pagina, come dai separati "Permessi sui contenuti".' APPLY_FILTER: Cerca ARCHIVE: Archivia - ARCHIVEDPAGE: 'Pagina ''%s'' archiviata' + ARCHIVEDPAGE: 'Pagina ''{title}'' archiviata' AddNew: 'Aggiungi nuova pagina' AddNewButton: 'Aggiungi nuova' AddPageRestriction: 'Nota: alcuni tipi di pagina non sono permessi in questa sezione' @@ -47,7 +47,7 @@ it: PUBPAGES: 'Fatto: Pubblicate {count} pagine' PageAdded: 'Pagina creata con successo' REMOVEDPAGE: 'Eliminata ''{title}'' dal sito pubblicato' - REMOVEDPAGEFROMDRAFT: 'Eliminata ''%s'' dal sito bozza' + REMOVEDPAGEFROMDRAFT: 'Eliminata ''{title}'' dal sito bozza' REORGANISATIONSUCCESSFUL: 'Albero del sito riorganizzato con successo.' RESTORE: 'Ripristina bozza' RESTORED: 'Ripristinata ''{title}'' con successo' @@ -56,7 +56,7 @@ it: RESTORE_TO_ROOT_DESC: 'Ripristinare la versione archiviata nella bozza come pagina di primo livello' ROLLBACK: 'Ripristina a questa versione' ROLLEDBACKPUBv2: 'Ripristinata la versione pubblicata.' - ROLLEDBACKVERSIONv2: 'Ripristinata la versione #%d.' + ROLLEDBACKVERSIONv2: 'Ripristinata la versione #{version}.' SAVED: '''{title}'' salvata correttamente.' SAVEDRAFT: 'Salva bozza' SHOW_AS_LIST: 'Mostra come lista' diff --git a/lang/ja.yml b/lang/ja.yml index 4248a0199d..ea10c6136a 100644 --- a/lang/ja.yml +++ b/lang/ja.yml @@ -3,7 +3,7 @@ ja: ACCESS: '''{title}'' セクションにアクセス' ACCESS_HELP: 'ページツリーとコンテンツを含むセクションの閲覧を許可します。　表示および編集の権限は、ページの特定のドロップダウンだけでなく、独立した"コンテンツの権限"を介して処理することができます。' ARCHIVE: アーカイブ - ARCHIVEDPAGE: '''%s''ページがアーカイブされました' + ARCHIVEDPAGE: '''{title}''ページがアーカイブされました' AddPageRestriction: 注：一部の種類のページは、この選択には含まれていません Cancel: キャンセル ChoosePageParentMode: 'このページを作成する場所を選択' @@ -19,10 +19,10 @@ ja: PUBPAGES: '完了: {count}ページを公開しました' PageAdded: ページの作成に成功 REMOVEDPAGE: '''{title}''を公開されているサイトから削除しました' - REMOVEDPAGEFROMDRAFT: '%sを下書きサイトから削除しました' + REMOVEDPAGEFROMDRAFT: '{title}を下書きサイトから削除しました' RESTORED: '{title}を復旧しました' ROLLEDBACKPUBv2: '公開されたバージョンにロールバックされました。' - ROLLEDBACKVERSIONv2: '#%d. のバージョンにロールバック' + ROLLEDBACKVERSIONv2: '#{version}. のバージョンにロールバック' SAVEDRAFT: 下書きを保存 SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: 他のページの下に作成 diff --git a/lang/ko.yml b/lang/ko.yml index a15204a52c..1280aed989 100644 --- a/lang/ko.yml +++ b/lang/ko.yml @@ -17,10 +17,10 @@ ko: PUBPAGES: '완료: {count} 페이지를 공개했습니다' PageAdded: '페이지를 만드는 데 성공' REMOVEDPAGE: '''{title}''을 공개된 사이트에서 제거했습니다' - REMOVEDPAGEFROMDRAFT: '%s 초안 사이트에서 제거했습니다' + REMOVEDPAGEFROMDRAFT: '{title} 초안 사이트에서 제거했습니다' RESTORED: '{title}를 복구했습니다' ROLLEDBACKPUBv2: '공개된 버전으로 롤백되었습니다.' - ROLLEDBACKVERSIONv2: '#%d. 버전으로 롤백' + ROLLEDBACKVERSIONv2: '#{version}. 버전으로 롤백' SAVEDRAFT: '임시 저장' SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: '다른 페이지 아래에 작성' diff --git a/lang/lt.yml b/lang/lt.yml index 26ff91408a..5be4a10483 100644 --- a/lang/lt.yml +++ b/lang/lt.yml @@ -3,7 +3,7 @@ lt: ACCESS: 'Priėjimas prie ''{title}'' dalies' ACCESS_HELP: 'Leisti peržiūrėti svetainės medžio ir turinio skiltį. Peržiūros, bei redagavimo leidimai gali būti pakeisti per iškrentančius pasirinkimus ir per atskirus "Turinio leidimai".' ARCHIVE: Archyvas - ARCHIVEDPAGE: 'Suarchyvuotas puslapis ''%s''' + ARCHIVEDPAGE: 'Suarchyvuotas puslapis ''{title}''' AddPageRestriction: 'Pastaba: kai kurie puslapių tipai šioje vietoje neleidžiami' Cancel: Atšaukti ChoosePageParentMode: 'Pasirinkite kur sukurti šį puslapį' @@ -19,13 +19,13 @@ lt: PUBPAGES: 'Įvykdyta: Publikuoti {count} puslapiai' PageAdded: 'Puslapis sėkmingai sukurtas' REMOVEDPAGE: 'Iš publikuojamos svetainės pašalintas ''{title}''' - REMOVEDPAGEFROMDRAFT: '''%s'' pašalintas iš juodraštinės svetainės' + REMOVEDPAGEFROMDRAFT: '''{title}'' pašalintas iš juodraštinės svetainės' RESTORED: '''{title}'' atstatytas sėkmingai' RESTORE_DESC: 'Atstatyti suarchyvuotą versiją kaip juodraštinį puslapį' RESTORE_TO_ROOT: 'Atstatyti juodraštį aukščiausiame lygyje' RESTORE_TO_ROOT_DESC: 'Atstatyti suarchyvuotą versiją kaip aukščiausio lygio juodraštinį puslapį' ROLLEDBACKPUBv2: 'Sugrįžta prie publikuotos versijos.' - ROLLEDBACKVERSIONv2: 'Sugrįžta prie #%d versijos.' + ROLLEDBACKVERSIONv2: 'Sugrįžta prie #{version} versijos.' SAVEDRAFT: 'Išsaugoti juodraštį' SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: 'Po kitu puslapiu' diff --git a/lang/mi.yml b/lang/mi.yml index 73322fdcac..55b0333743 100644 --- a/lang/mi.yml +++ b/lang/mi.yml @@ -16,10 +16,10 @@ mi: PUBPAGES: 'Kua oti: I whakaputaina ngā whārangi {count}' PageAdded: 'I momoho te hanga whārangi' REMOVEDPAGE: 'I tango te ''{title}'' i te pae kua whakaputaina' - REMOVEDPAGEFROMDRAFT: 'I tangohia a ''%s'' i te pae hukihuki' + REMOVEDPAGEFROMDRAFT: 'I tangohia a ''{title}'' i te pae hukihuki' RESTORED: 'I momoho te whakaora i te ''{title}''' ROLLEDBACKPUBv2: 'I hoki ki te tauira kua whakaputaina.' - ROLLEDBACKVERSIONv2: 'I hoki ki te tauira #%d.' + ROLLEDBACKVERSIONv2: 'I hoki ki te tauira #{version}.' SAVEDRAFT: 'Tiaki hukihuki' SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: 'Kei raro i tētahi atu whārangi' diff --git a/lang/nb.yml b/lang/nb.yml index a64de9df5e..eb2c84fca7 100644 --- a/lang/nb.yml +++ b/lang/nb.yml @@ -3,7 +3,7 @@ nb: ACCESS: 'Adgang til seksjon for ''{title}''' ACCESS_HELP: 'Lar deg se seksjonen som inneholder sidetreet og annet innhold. Tillatelser for å vise og redigere kan behandles gjennom sidespesifikke nedtrekkslister, så vel som separate "Innholdstillatelser".' ARCHIVE: Arkiver - ARCHIVEDPAGE: 'Arkiverte side ''%s''' + ARCHIVEDPAGE: 'Arkiverte side ''{title}''' AddPageRestriction: 'Merk: Noen sidetyper er ikke tillatt for dette valget.' Cancel: Avbryt ChoosePageParentMode: 'Velg hvor du vil opprette siden' @@ -19,13 +19,13 @@ nb: PUBPAGES: 'Ferdig: Publiserte {count} sider.' PageAdded: 'Siden ble opprettet.' REMOVEDPAGE: 'Fjernet "{title}" fra det publiserte nettstedet' - REMOVEDPAGEFROMDRAFT: 'Fjernet ''%s'' fra utkastnettstedet' + REMOVEDPAGEFROMDRAFT: 'Fjernet ''{title}'' fra utkastnettstedet' RESTORED: 'Vellykket gjenoppretting av "{title}".' RESTORE_DESC: 'Gjenopprett arkivert versjon som utkast' RESTORE_TO_ROOT: 'Gjenopprett utkast på toppnivå' RESTORE_TO_ROOT_DESC: 'Gjenopprett arkivert versjon som utkast på toppnivå' ROLLEDBACKPUBv2: 'Tilbakestilte til den publiserte versjonen.' - ROLLEDBACKVERSIONv2: 'Tilbakestile til versjon #%d.' + ROLLEDBACKVERSIONv2: 'Tilbakestile til versjon #{version}.' SAVEDRAFT: 'Lagre utkast' SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: 'Under en annen side' diff --git a/lang/nl.yml b/lang/nl.yml index 2f236e83d0..5ebfcdd04d 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -18,10 +18,10 @@ nl: PUBPAGES: 'Gereed: {count} pagina''s gepubliceerd' PageAdded: 'Pagina met succes aangemaakt' REMOVEDPAGE: '''{title}'' is van de gepubliceerde site verwijderd' - REMOVEDPAGEFROMDRAFT: '''%s'' is verwijderd uit de concept site' + REMOVEDPAGEFROMDRAFT: '''{title}'' is verwijderd uit de concept site' RESTORED: '''{title}'' is met succes hersteld' ROLLEDBACKPUBv2: 'Teruggedraaid naar gepubliceerde versie.' - ROLLEDBACKVERSIONv2: 'Teruggedraaid naar versie #%d.' + ROLLEDBACKVERSIONv2: 'Teruggedraaid naar versie #{version}.' SAVEDRAFT: 'Concept opslaan' SilverStripe\CMS\Controllers\CMSPageAddController: MENUTITLE: 'Pagina toevoegen' diff --git a/lang/pl.yml b/lang/pl.yml index 91594a7f3f..3a8fa68b95 100644 --- a/lang/pl.yml +++ b/lang/pl.yml @@ -18,11 +18,11 @@ pl: PUBPAGES: 'Zrobiono: Opublikowano {count} stron' PageAdded: 'Pomyślnie utworzono stronę' REMOVEDPAGE: 'Usunięto ''{title}'' z opublikowanej witryny' - REMOVEDPAGEFROMDRAFT: '''%s'' usunięto ze szkiców' + REMOVEDPAGEFROMDRAFT: '''{title}'' usunięto ze szkiców' RESTORED: 'Pomyślnie przywrócono ''{title}''' RESTORE_DESC: 'Przywróć jako szkic' ROLLEDBACKPUBv2: 'Przywrócono opublikowaną wersję' - ROLLEDBACKVERSIONv2: 'Przywrócono wersję #%d.' + ROLLEDBACKVERSIONv2: 'Przywrócono wersję #{version}.' SAVEDRAFT: 'Zapisz szkic' SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: 'Pod inną stroną' diff --git a/lang/pt.yml b/lang/pt.yml index 3432e7ee49..e97958c8d8 100644 --- a/lang/pt.yml +++ b/lang/pt.yml @@ -16,10 +16,10 @@ pt: PUBPAGES: 'Concluído: Publicadas {count} páginas' PageAdded: 'Página criada com sucesso' REMOVEDPAGE: 'Remover ''{title}'' do site publicado' - REMOVEDPAGEFROMDRAFT: 'Removido ''%s'' do site de rascunho' + REMOVEDPAGEFROMDRAFT: 'Removido ''{title}'' do site de rascunho' RESTORED: '''{title}'' restaurado com sucesso' ROLLEDBACKPUBv2: 'Voltar para a versão publicada.' - ROLLEDBACKVERSIONv2: 'Voltar para a versão #%d.' + ROLLEDBACKVERSIONv2: 'Voltar para a versão #{version}.' SAVEDRAFT: 'Guardar rascunho' SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: 'Por cima de outra página' diff --git a/lang/pt_BR.yml b/lang/pt_BR.yml index ec7d51a9a5..79564b7a11 100644 --- a/lang/pt_BR.yml +++ b/lang/pt_BR.yml @@ -3,7 +3,7 @@ pt_BR: PAGENOTEXISTS: 'Esta página não existe' PUBALLCONFIRM: 'Por favor publique todas as páginas no site, copiando content stage to live' PUBALLFUN: 'Funcionalidade "Publicar Tudo"' - REMOVEDPAGEFROMDRAFT: 'Removido ''%s'' do site de rascunho' + REMOVEDPAGEFROMDRAFT: 'Removido ''{title}'' do site de rascunho' SilverStripe\CMS\Controllers\CMSPagesController: MENUTITLE: Páginas SilverStripe\CMS\Model\ErrorPage: diff --git a/lang/ro.yml b/lang/ro.yml index bb5e333382..f2a20ec232 100644 --- a/lang/ro.yml +++ b/lang/ro.yml @@ -16,10 +16,10 @@ ro: PUBPAGES: 'Finalizat: Publicate {count} pagini' PageAdded: 'Pagină creată cu succes' REMOVEDPAGE: 'Înlătură ''{title}'' din site-ul publicat' - REMOVEDPAGEFROMDRAFT: 'Înlătură ''%s'' din site-ul ciornă' + REMOVEDPAGEFROMDRAFT: 'Înlătură ''{title}'' din site-ul ciornă' RESTORED: 'Restaurare ''{title}'' cu succes' ROLLEDBACKPUBv2: 'Revenire la versiunea publicată' - ROLLEDBACKVERSIONv2: 'Revenire la versiunea #%d' + ROLLEDBACKVERSIONv2: 'Revenire la versiunea #{version}' SAVEDRAFT: 'Salvează ciornă' SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: 'Sub altă pagină' diff --git a/lang/ru.yml b/lang/ru.yml index 18f968cf7e..fb7bd545b6 100644 --- a/lang/ru.yml +++ b/lang/ru.yml @@ -16,7 +16,7 @@ ru: ACCESS_HELP: 'Возможность просматривать раздел, содержащий дерево страниц и контент. Настройка прав просмотра и редактирования производится через выпадающие меню на отдельных страницах, а также через "Права доступа к содержимому".' APPLY_FILTER: Поиск ARCHIVE: 'В архив' - ARCHIVEDPAGE: 'Страница ''%s'' отправлена в архив' + ARCHIVEDPAGE: 'Страница ''{title}'' отправлена в архив' AddNew: 'Добавить новую страницу' AddNewButton: Добавить AddPageRestriction: 'Внимание: некоторые типы страниц в этом случае недоступны для выбора' @@ -47,7 +47,7 @@ ru: PUBPAGES: 'Готово: опубликовано {count} страниц' PageAdded: 'Страница успешно создана' REMOVEDPAGE: 'Страница ''{title}'' удалена с опубликованного сайта' - REMOVEDPAGEFROMDRAFT: 'Страница ''%s'' удалена с чернового сайта' + REMOVEDPAGEFROMDRAFT: 'Страница ''{title}'' удалена с чернового сайта' REORGANISATIONSUCCESSFUL: 'Древесная структура сайта успешно реорганизована.' RESTORE: 'Восстановить черновик' RESTORED: '''{title}'' успешно восстановлен' @@ -56,7 +56,7 @@ ru: RESTORE_TO_ROOT_DESC: 'Восстановить архивную версию в черновик в корне сайта' ROLLBACK: 'Вернуться к этой версии' ROLLEDBACKPUBv2: 'Восстановлена опубликованная версия.' - ROLLEDBACKVERSIONv2: 'Версия #%d восстановлена.' + ROLLEDBACKVERSIONv2: 'Версия #{version} восстановлена.' SAVED: '''{title}'' сохранен' SAVEDRAFT: 'Сохранить черновик' SHOW_AS_LIST: 'в виде списка' diff --git a/lang/si.yml b/lang/si.yml index 4b6ba5a954..2467d3c445 100644 --- a/lang/si.yml +++ b/lang/si.yml @@ -3,7 +3,7 @@ si: PAGENOTEXISTS: 'මෙම පිටුව තවදුරටත් නොපවතී' PUBALLCONFIRM: 'අඩවියේ ඇති සියලු පිටු, වේදිකාවට පිටපත් කර ප්රසිද්ධ කරන්න' PUBALLFUN: 'සියලු ක්රම වේද ප්රසිද්ධ කරන ලදී' - REMOVEDPAGEFROMDRAFT: 'කටු අඩවියෙන් ''%s'' මකන ලදී' + REMOVEDPAGEFROMDRAFT: 'කටු අඩවියෙන් ''{title}'' මකන ලදී' SilverStripe\CMS\Model\ErrorPage: CODE: 'වැරදි කේතය' CODE_400: '400 - දුර්වල ඉල්ළීමක්' diff --git a/lang/sk.yml b/lang/sk.yml index 7ac3a280d4..9d0d9dc5d1 100644 --- a/lang/sk.yml +++ b/lang/sk.yml @@ -16,7 +16,7 @@ sk: ACCESS_HELP: 'Povoliť prezeranie sekcie obsahujúcu strom stránok a obsah. Práva na prezeranie a úpravu môžu byť nastavené cez výber, ako aj jednotlivo "Práva obsahu".' APPLY_FILTER: Hľadať ARCHIVE: Archív - ARCHIVEDPAGE: 'Archivovaná stránka ''%s''' + ARCHIVEDPAGE: 'Archivovaná stránka ''{title}''' AddNew: 'Pridať novú stránku' AddNewButton: 'Pridať nový' AddPageRestriction: 'Poznámka: Niektoré typy stránok nie sú povolené pre tento výber' @@ -47,7 +47,7 @@ sk: PUBPAGES: 'Hotovo: Publikované {count} stránky' PageAdded: 'Stránka vytvorená úspešne' REMOVEDPAGE: 'Zmazané ''{title}'' z verejného webu' - REMOVEDPAGEFROMDRAFT: 'Odstránené ''%s'' z konceptu webu' + REMOVEDPAGEFROMDRAFT: 'Odstránené ''{title}'' z konceptu webu' REORGANISATIONSUCCESSFUL: 'Strom webu bol reorganizovaný úspešne.' RESTORE: 'Obnoviť koncept' RESTORED: 'Obnovené ''{title}'' úspešne' @@ -56,7 +56,7 @@ sk: RESTORE_TO_ROOT_DESC: 'Obnoviť archivovanú verziu na koncept ako stránku najvyššej úrovne' ROLLBACK: 'Návrat na túto verziu' ROLLEDBACKPUBv2: 'Vrátené späť na zverejnenú verziu.' - ROLLEDBACKVERSIONv2: 'Vrátené späť na verziu #%d.' + ROLLEDBACKVERSIONv2: 'Vrátené späť na verziu #{version}.' SAVED: 'Uložené ''{title}'' úspešne.' SAVEDRAFT: 'Uložiť koncept' SHOW_AS_LIST: 'ukázať ako zoznam' diff --git a/lang/sl.yml b/lang/sl.yml index 49cda5792a..c45801a57b 100644 --- a/lang/sl.yml +++ b/lang/sl.yml @@ -5,7 +5,7 @@ sl: ACCESS: 'Dostop do razdelka ''{title}'' ' ACCESS_HELP: 'Dovoli vpogled sklop z drevesno strukturo in vsebino. Pravice za ogled in urejanje je možno urejati prek dropdown-seznamov za vsako posamezno stran, ali pa ločeno v sklopu Nastavitve pravic za upravljanje z vsebino (Content permissions). ' ARCHIVE: Arhiv - ARCHIVEDPAGE: 'Arhivirana stran ''%s''' + ARCHIVEDPAGE: 'Arhivirana stran ''{title}''' AddPageRestriction: 'Pozor: nekateri tipi strani niso dovoljeni za to izbiro' Cancel: Prekliči ChoosePageParentMode: 'Izberite mesto, kjer želite ustvariti novo stran' @@ -18,7 +18,7 @@ sl: PUBPAGES: 'Opravljeno: Objavljenih je {count} strani' PageAdded: 'Stran je bila uspešno ustvarjena' REMOVEDPAGE: '''{title}'' je odstranjen z objavljenega spletnega mesta. ' - REMOVEDPAGEFROMDRAFT: 'Vsebina, odstranjena iz osnutka spletnega mesta: ''%s''' + REMOVEDPAGEFROMDRAFT: 'Vsebina, odstranjena iz osnutka spletnega mesta: ''{title}''' SAVED: 'Uspešno shranjeno ''{title}''.' SAVEDRAFT: 'Shrani osnutek' UNPUBLISH_AND_ARCHIVE: 'Odstrani iz objave in arhiviraj' diff --git a/lang/sr.yml b/lang/sr.yml index 4e9afcb9de..dab4b94479 100644 --- a/lang/sr.yml +++ b/lang/sr.yml @@ -16,10 +16,10 @@ sr: PUBPAGES: 'Урађено: Објављено {count} страница' PageAdded: 'Успешно креирана страница' REMOVEDPAGE: 'Са објављеног сајта уклоњена је страница ''{title}''' - REMOVEDPAGEFROMDRAFT: 'Страница ''%s'' је уклоњена из нацрта сајта' + REMOVEDPAGEFROMDRAFT: 'Страница ''{title}'' је уклоњена из нацрта сајта' RESTORED: '''{title}'' успешно обновљен' ROLLEDBACKPUBv2: 'Враћено на објављену верзију.' - ROLLEDBACKVERSIONv2: 'Враћено на верзију #%d.' + ROLLEDBACKVERSIONv2: 'Враћено на верзију #{version}.' SAVEDRAFT: 'Сачувај нацрт' SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: 'Као подстраницу друге странице' diff --git a/lang/sr_RS@latin.yml b/lang/sr_RS@latin.yml index b096aaf6e2..a6cd7ca653 100644 --- a/lang/sr_RS@latin.yml +++ b/lang/sr_RS@latin.yml @@ -16,10 +16,10 @@ sr_RS@latin: PUBPAGES: 'Urađeno: Objavljeno {count} stranica' PageAdded: 'Uspešno kreirana stranica' REMOVEDPAGE: 'Sa objavljenog sajta uklonjena je stranica ''{title}''' - REMOVEDPAGEFROMDRAFT: 'Stranica ''%s'' je uklonjena iz nacrta sajta' + REMOVEDPAGEFROMDRAFT: 'Stranica ''{title}'' je uklonjena iz nacrta sajta' RESTORED: '''{title}'' uspešno obnovljen' ROLLEDBACKPUBv2: 'Vraćeno na objavljenu verziju.' - ROLLEDBACKVERSIONv2: 'Vraćeno na verziju #%d.' + ROLLEDBACKVERSIONv2: 'Vraćeno na verziju #{version}.' SAVEDRAFT: 'Sačuvaj nacrt' SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: 'Kao podstranicu druge stranice' diff --git a/lang/sv.yml b/lang/sv.yml index 544a291f23..d3df25d0bf 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -7,7 +7,7 @@ sv: ACCESS_HELP: 'Tillåt visning av sektionen innehållande sidträdet och dess innehåll. Rättigheter att visa och redigera sidan kan hanteras i dess rullgardinsmenyer, liksom i "Innehållsbehörigheter".' APPLY_FILTER: Sök ARCHIVE: Arkiv - ARCHIVEDPAGE: 'Arkiverade sidor ''%s''' + ARCHIVEDPAGE: 'Arkiverade sidor ''{title}''' AddPageRestriction: 'OBS: Vissa sidtyper är inte tillåtna här' CLEAR_FILTER: Rensa Cancel: Avbryt @@ -26,14 +26,14 @@ sv: PUBPAGES: 'Klar: Publicerade {count} sidor' PageAdded: 'Lyckades skapa sida' REMOVEDPAGE: 'Tog bort ''{title}'' från den publicerade sajten' - REMOVEDPAGEFROMDRAFT: 'Raderade ''%s'' från utkast' + REMOVEDPAGEFROMDRAFT: 'Raderade ''{title}'' från utkast' RESTORE: 'Återskapa utkast' RESTORED: 'Återskapandet av ''{title}'' lyckades' RESTORE_DESC: 'Återställ den arkiverade versionen av sidan som ett utkast' RESTORE_TO_ROOT: 'Återskapa utkast på top nivå' RESTORE_TO_ROOT_DESC: 'Återställ den arkiverade versionen till ett utkast som en top menu sida' ROLLEDBACKPUBv2: 'Återställde till den publicerade versionen.' - ROLLEDBACKVERSIONv2: 'Återställde till version #%d.' + ROLLEDBACKVERSIONv2: 'Återställde till version #{version}.' SAVED: 'Sparade ''{title}'' lyckades.' SAVEDRAFT: 'Spara utkast' UNPUBLISH_AND_ARCHIVE: 'Avpublicerad och arkivera' diff --git a/lang/th.yml b/lang/th.yml index 39b3c5a5e9..9d9dce317f 100644 --- a/lang/th.yml +++ b/lang/th.yml @@ -13,7 +13,7 @@ th: PUBPAGES: 'เผยแแพร่หน้าเว็บแล้ว {count} หน้า' PageAdded: หน้าเว็บที่สร้างเสร็จเรียบร้อยแล้ว REMOVEDPAGE: 'ลบ ''{title}'' ออกจากเว็บไซต์ที่เผยแพร่อยู่แล้ว' - REMOVEDPAGEFROMDRAFT: 'ลบ ''%s'' ออกจากเว็บไซต์ฉบับร่างแล้ว' + REMOVEDPAGEFROMDRAFT: 'ลบ ''{title}'' ออกจากเว็บไซต์ฉบับร่างแล้ว' RESTORED: 'เรียกคืนค่า ''{title}'' เสร็จเรียบร้อยแล้ว' SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: อยู่ใต้หน้าอื่นๆ diff --git a/lang/tr.yml b/lang/tr.yml index 9c65299d32..f789a8f86f 100644 --- a/lang/tr.yml +++ b/lang/tr.yml @@ -7,7 +7,7 @@ tr: PUBALLCONFIRM: 'Lütfen taslak sitedeki tüm sayfaları yayınlanmakta olan siteye kopyalayıp yayınla.' PUBALLFUN: '"Hepsini Yayınla" özelliği' PageAdded: 'Sayfa başarıyla oluşturuldu' - REMOVEDPAGEFROMDRAFT: '''%s'' taslak siteden silindi' + REMOVEDPAGEFROMDRAFT: '''{title}'' taslak siteden silindi' SilverStripe\CMS\Controllers\CMSPagesController: MENUTITLE: Sayfalar SilverStripe\CMS\Controllers\CMSSiteTreeFilter_Search: diff --git a/lang/uk.yml b/lang/uk.yml index ffab6d7937..1be15540d8 100644 --- a/lang/uk.yml +++ b/lang/uk.yml @@ -11,7 +11,7 @@ uk: PUBALLFUN: 'Дія "Опублікувати все"' PageAdded: 'Сторінка успішно створена' REMOVEDPAGE: '''{title}'' видалено з публічного сайту' - REMOVEDPAGEFROMDRAFT: 'Видалено ''%s'' з чорнового сайту' + REMOVEDPAGEFROMDRAFT: 'Видалено ''{title}'' з чорнового сайту' SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: 'Під іншою сторінкою' ParentMode_top: 'Вищий рівень' diff --git a/lang/zh.yml b/lang/zh.yml index 7f56d01c89..f374c6fb95 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -19,7 +19,7 @@ zh: REMOVEDPAGEFROMDRAFT: '从草稿站点删除‘s%’' RESTORED: '成功恢复’{title}‘' ROLLEDBACKPUBv2: 回滚到已发布版本。 - ROLLEDBACKVERSIONv2: '回滚到版本#%d。' + ROLLEDBACKVERSIONv2: '回滚到版本#{version}。' SAVEDRAFT: 保存草稿 SilverStripe\CMS\Controllers\CMSPageAddController: ParentMode_child: '根据另一个页面' diff --git a/lang/zh_CN.yml b/lang/zh_CN.yml index 3d9446c301..9a57bc0cd4 100644 --- a/lang/zh_CN.yml +++ b/lang/zh_CN.yml @@ -3,7 +3,7 @@ zh_CN: PAGENOTEXISTS: 该网页不存在 PUBALLCONFIRM: '请发布该站的每一网页，这样，预备发布站上的内容就会复制到正式发布站上' PUBALLFUN: '“全部发布“功能' - REMOVEDPAGEFROMDRAFT: '已从测试站点删除 ''%s''' + REMOVEDPAGEFROMDRAFT: '已从测试站点删除 ''{title}''' SilverStripe\CMS\Model\ErrorPage: CODE: '错误代码' SilverStripe\CMS\Model\RedirectorPage: diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_Content.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_Content.ss index b87776f61c..423bc445c5 100644 --- a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_Content.ss +++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_Content.ss @@ -12,17 +12,17 @@ diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss index be139c3cdd..a5846dab57 100644 --- a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss +++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_EditForm.ss @@ -24,7 +24,7 @@ <% end_loop %> <% if $Controller.LinkPreview %> - <% _t('SilverStripe\Admin\LeftAndMain.PreviewButton', 'Preview') %> » + <%t SilverStripe\Admin\LeftAndMain.PreviewButton 'Preview' %> » <% end_if %> diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_ListView.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_ListView.ss index 28e4f7c07a..30c5cbd761 100644 --- a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_ListView.ss +++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_ListView.ss @@ -1,15 +1,15 @@ <% include SilverStripe\\CMS\\Controllers\\CMSPagesController_ContentToolActions %> -
+
$AddForm
<% if $TreeIsFiltered %>
- <% _t('SilverStripe\CMS\Controllers\CMSMain.ListFiltered', 'Showing search results.') %> + <%t SilverStripe\CMS\Controllers\CMSMain.ListFiltered 'Showing search results.' %> - <% _t('SilverStripe\CMS\Controllers\CMSMain.TreeFilteredClear', 'Clear') %> + <%t SilverStripe\CMS\Controllers\CMSMain.TreeFilteredClear 'Clear' %>
diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_TreeView.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_TreeView.ss index c12c608e41..441d0b3a87 100644 --- a/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_TreeView.ss +++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSMain_TreeView.ss @@ -1,6 +1,6 @@ <% include SilverStripe\\CMS\\Controllers\\CMSPagesController_ContentToolActions View='Tree' %> -
+
$AddForm
@@ -8,9 +8,9 @@ $ExtraTreeTools <% if $TreeIsFiltered %>
- <% _t('SilverStripe\CMS\Controllers\CMSMain.TreeFiltered', 'Showing search results.') %> + <%t SilverStripe\CMS\Controllers\CMSMain.TreeFiltered 'Showing search results.' %> - <% _t('SilverStripe\CMS\Controllers\CMSMain.TreeFilteredClear', 'Clear') %> + <%t SilverStripe\CMS\Controllers\CMSMain.TreeFilteredClear 'Clear' %>
diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSPageAddController_Content.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSPageAddController_Content.ss index 0ce812d42d..5296cef171 100644 --- a/templates/SilverStripe/CMS/Controllers/Includes/CMSPageAddController_Content.ss +++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSPageAddController_Content.ss @@ -6,7 +6,7 @@

  1. - <% _t('SilverStripe\CMS\Controllers\CMSPageAddController.Title','Add page') %> + <%t SilverStripe\CMS\Controllers\CMSPageAddController.Title 'Add page' %>

diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSPageHistoryController_versions.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSPageHistoryController_versions.ss index c35a2e3643..01bb2da385 100755 --- a/templates/SilverStripe/CMS/Controllers/Includes/CMSPageHistoryController_versions.ss +++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSPageHistoryController_versions.ss @@ -2,9 +2,9 @@ - <% _t('SilverStripe\CMS\Controllers\CMSPageHistoryController.WHEN','When') %> - <% _t('SilverStripe\CMS\Controllers\CMSPageHistoryController.AUTHOR','Author') %> - <% _t('SilverStripe\CMS\Controllers\CMSPageHistoryController.PUBLISHER','Publisher') %> + <%t SilverStripe\CMS\Controllers\CMSPageHistoryController.WHEN 'When' %> + <%t SilverStripe\CMS\Controllers\CMSPageHistoryController.AUTHOR 'Author' %> + <%t SilverStripe\CMS\Controllers\CMSPageHistoryController.PUBLISHER 'Publisher' %> @@ -15,8 +15,8 @@ <% with $LastEdited %> $Nice <% end_with %> - <% if $Author %>$Author.FirstName $Author.Surname.Initial<% else %><% _t('SilverStripe\CMS\Controllers\CMSPageHistoryController.UNKNOWN','Unknown') %><% end_if %> - <% if $Published %><% if $Publisher %>$Publisher.FirstName $Publisher.Surname.Initial<% else %><% _t('SilverStripe\CMS\Controllers\CMSPageHistoryController.UNKNOWN','Unknown') %><% end_if %><% else %><% _t('SilverStripe\CMS\Controllers\CMSPageHistoryController.NOTPUBLISHED','Not published') %><% end_if %> + <% if $Author %>$Author.FirstName $Author.Surname.Initial<% else %><%t SilverStripe\CMS\Controllers\CMSPageHistoryController.UNKNOWN 'Unknown' %><% end_if %> + <% if $Published %><% if $Publisher %>$Publisher.FirstName $Publisher.Surname.Initial<% else %><%t SilverStripe\CMS\Controllers\CMSPageHistoryController.UNKNOWN 'Unknown' %><% end_if %><% else %><%t SilverStripe\CMS\Controllers\CMSPageHistoryController.NOTPUBLISHED 'Not published' %><% end_if %> <% end_loop %> diff --git a/templates/SilverStripe/CMS/Controllers/Includes/CMSPagesController_ContentToolActions.ss b/templates/SilverStripe/CMS/Controllers/Includes/CMSPagesController_ContentToolActions.ss index 182358e79e..501a564792 100644 --- a/templates/SilverStripe/CMS/Controllers/Includes/CMSPagesController_ContentToolActions.ss +++ b/templates/SilverStripe/CMS/Controllers/Includes/CMSPagesController_ContentToolActions.ss @@ -1,11 +1,11 @@
<% if not $TreeIsFiltered %> - <% _t('SilverStripe\CMS\Controllers\CMSMain.AddNewButton', 'Add new') %> + <%t SilverStripe\CMS\Controllers\CMSMain.AddNewButton 'Add new' %> <% if $View == 'Tree' %> <% end_if %> <% end_if %> diff --git a/templates/SilverStripe/CMS/Forms/SiteTreeURLSegmentField.ss b/templates/SilverStripe/CMS/Forms/SiteTreeURLSegmentField.ss index a8558bbe8c..ff1a5b9793 100644 --- a/templates/SilverStripe/CMS/Forms/SiteTreeURLSegmentField.ss +++ b/templates/SilverStripe/CMS/Forms/SiteTreeURLSegmentField.ss @@ -4,17 +4,17 @@ <% if not $IsReadonly %> <% end_if %>
<% if $HelpText %>

$HelpText

<% end_if %>
diff --git a/templates/SilverStripe/CMS/Model/Includes/SiteTreeFileExtension_description.ss b/templates/SilverStripe/CMS/Model/Includes/SiteTreeFileExtension_description.ss index a37bba8d42..ea02ed2573 100644 --- a/templates/SilverStripe/CMS/Model/Includes/SiteTreeFileExtension_description.ss +++ b/templates/SilverStripe/CMS/Model/Includes/SiteTreeFileExtension_description.ss @@ -2,9 +2,9 @@ - - - + + + diff --git a/templates/SilverStripe/CMS/Model/Includes/SiteTree_Information.ss b/templates/SilverStripe/CMS/Model/Includes/SiteTree_Information.ss index 7ef63aff6e..e1ce035cda 100644 --- a/templates/SilverStripe/CMS/Model/Includes/SiteTree_Information.ss +++ b/templates/SilverStripe/CMS/Model/Includes/SiteTree_Information.ss @@ -1,9 +1,9 @@
-

<% _t('SilverStripe\CMS\Model\SiteTree.LASTSAVED', 'Last saved') %> $LastEdited.Ago(0) +

<%t SilverStripe\CMS\Model\SiteTree.LASTSAVED 'Last saved' %> $LastEdited.Ago(0) <% if $ExistsOnLive %> -
<% _t('SilverStripe\CMS\Model\SiteTree.LASTPUBLISHED', 'Last published') %> $Live.LastEdited.Ago(0) +
<%t SilverStripe\CMS\Model\SiteTree.LASTPUBLISHED 'Last published' %> $Live.LastEdited.Ago(0) <% else %> -
<% _t('SilverStripe\CMS\Model\SiteTree.NOTPUBLISHED', 'Not published') %> +
<%t SilverStripe\CMS\Model\SiteTree.NOTPUBLISHED 'Not published' %> <% end_if %>

From 417caf29724c1bd6df286d4a0ef9bad71152bf2f Mon Sep 17 00:00:00 2001 From: Saophalkun Ponlu Date: Thu, 3 Aug 2017 13:32:14 +1200 Subject: [PATCH 05/11] ENHANCEMENT Allow insert links with display link text --- client/dist/js/TinyMCE_sslink-internal.js | 2 +- client/src/legacy/TinyMCE_sslink-internal.js | 5 +++++ code/Forms/InternalLinkFormFactory.php | 14 ++++++++++++++ code/Forms/InternalLinkModalExtension.php | 8 ++++++-- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/client/dist/js/TinyMCE_sslink-internal.js b/client/dist/js/TinyMCE_sslink-internal.js index 23d70c6086..a3247f0a0a 100644 --- a/client/dist/js/TinyMCE_sslink-internal.js +++ b/client/dist/js/TinyMCE_sslink-internal.js @@ -1 +1 @@ -!function(e){function t(r){if(n[r])return n[r].exports;var i=n[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,t),i.l=!0,i.exports}var n={};t.m=e,t.c=n,t.i=function(e){return e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=18)}([function(e,t){e.exports=jQuery},function(e,t){e.exports=i18n},,,,,,,,function(e,t){e.exports=Injector},function(e,t){e.exports=InsertLinkModal},function(e,t){e.exports=React},function(e,t){e.exports=ReactApollo},function(e,t){e.exports=ReactDom},function(e,t){e.exports=ShortcodeSerialiser},function(e,t){e.exports=TinyMCEActionRegistrar},,,function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(1),i=n.n(r),o=n(15),a=n.n(o),l=n(11),s=n.n(l),c=n(13),u=n.n(c),d=n(12),p=(n.n(d),n(0)),f=n.n(p),g=n(14),k=n.n(g),h=n(10),m=(n.n(h),n(9));n.n(m),a.a.addAction("sslink",{text:i.a._t("CMS.LINKLABEL_PAGE","Page on this site"),onclick:function(e){return e.execCommand("sslinkinternal")}}).addCommandWithUrlTest("sslinkinternal",/^\[sitetree_link/);var _={init:function(e){e.addCommand("sslinkinternal",function(){f()("#"+e.id).entwine("ss").openLinkInternalDialog()})}},x="insert-link__dialog-wrapper--internal",A=n.i(m.provideInjector)(n.i(h.createInsertLinkModal)("SilverStripe\\CMS\\Controllers\\CMSPageEditController","editorInternalLink"));f.a.entwine("ss",function(e){e("textarea.htmleditor").entwine({openLinkInternalDialog:function(){var t=e("#"+x);t.length||(t=e('
'),e("body").append(t)),t.addClass("insert-link__dialog-wrapper"),t.setElement(this),t.open()}}),e("#"+x).entwine({renderModal:function(e){var t=this,n=ss.store,r=ss.apolloClient,o=function(){return t.close()},a=function(){return t.handleInsert.apply(t,arguments)},l=this.getOriginalAttributes();u.a.render(s.a.createElement(d.ApolloProvider,{store:n,client:r},s.a.createElement(A,{show:e,onInsert:a,onHide:o,title:i.a._t("CMS.LINK_PAGE","Link to a page"),bodyClassName:"modal__dialog",className:"insert-link__dialog-wrapper--internal",fileAttributes:l,identifier:"Admin.InsertLinkInternalModal"})),this[0])},buildAttributes:function(e){return{href:k.a.serialise({name:"sitetree_link",properties:{id:e.PageID}},!0)+(e.Anchor&&e.Anchor.length?"#"+e.Anchor:""),target:e.TargetBlank?"_blank":"",title:e.Description}},getOriginalAttributes:function(){var t=this.getElement().getEditor(),n=e(t.getSelectedNode()),r=(n.attr("href")||"").split("#");if(!r[0])return{};var i=k.a.match("sitetree_link",!1,r[0]);return i?{PageID:i.properties.id?parseInt(i.properties.id,10):0,Anchor:r[1]||"",Description:n.attr("title"),TargetBlank:!!n.attr("target")}:{}}})}),tinymce.PluginManager.add("sslinkinternal",function(e){return _.init(e)}),t.default=_}]); \ No newline at end of file +!function(e){function t(r){if(n[r])return n[r].exports;var i=n[r]={i:r,l:!1,exports:{}};return e[r].call(i.exports,i,i.exports,t),i.l=!0,i.exports}var n={};t.m=e,t.c=n,t.i=function(e){return e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=18)}([function(e,t){e.exports=jQuery},function(e,t){e.exports=i18n},,,,,,,,function(e,t){e.exports=Injector},function(e,t){e.exports=InsertLinkModal},function(e,t){e.exports=React},function(e,t){e.exports=ReactApollo},function(e,t){e.exports=ReactDom},function(e,t){e.exports=ShortcodeSerialiser},function(e,t){e.exports=TinyMCEActionRegistrar},,,function(e,t,n){"use strict";Object.defineProperty(t,"__esModule",{value:!0});var r=n(1),i=n.n(r),o=n(15),a=n.n(o),l=n(11),s=n.n(l),c=n(13),u=n.n(c),d=n(12),p=(n.n(d),n(0)),f=n.n(p),g=n(14),m=n.n(g),k=n(10),h=(n.n(k),n(9));n.n(h),a.a.addAction("sslink",{text:i.a._t("CMS.LINKLABEL_PAGE","Page on this site"),onclick:function(e){return e.execCommand("sslinkinternal")}}).addCommandWithUrlTest("sslinkinternal",/^\[sitetree_link/);var _={init:function(e){e.addCommand("sslinkinternal",function(){f()("#"+e.id).entwine("ss").openLinkInternalDialog()})}},x="insert-link__dialog-wrapper--internal",A=n.i(h.provideInjector)(n.i(k.createInsertLinkModal)("SilverStripe\\CMS\\Controllers\\CMSPageEditController","editorInternalLink"));f.a.entwine("ss",function(e){e("textarea.htmleditor").entwine({openLinkInternalDialog:function(){var t=e("#"+x);t.length||(t=e('
'),e("body").append(t)),t.addClass("insert-link__dialog-wrapper"),t.setElement(this),t.open()}}),e("#"+x).entwine({renderModal:function(e){var t=this,n=ss.store,r=ss.apolloClient,o=function(){return t.close()},a=function(){return t.handleInsert.apply(t,arguments)},l=this.getOriginalAttributes(),c=tinymce.activeEditor.selection,p=c.getContent()||"",f=c.getNode().tagName,g="A"!==f&&""===p.trim();u.a.render(s.a.createElement(d.ApolloProvider,{store:n,client:r},s.a.createElement(A,{show:e,onInsert:a,onHide:o,title:i.a._t("CMS.LINK_PAGE","Link to a page"),bodyClassName:"modal__dialog",className:"insert-link__dialog-wrapper--internal",fileAttributes:l,identifier:"Admin.InsertLinkInternalModal",requireLinkText:g})),this[0])},buildAttributes:function(e){return{href:m.a.serialise({name:"sitetree_link",properties:{id:e.PageID}},!0)+(e.Anchor&&e.Anchor.length?"#"+e.Anchor:""),target:e.TargetBlank?"_blank":"",title:e.Description}},getOriginalAttributes:function(){var t=this.getElement().getEditor(),n=e(t.getSelectedNode()),r=(n.attr("href")||"").split("#");if(!r[0])return{};var i=m.a.match("sitetree_link",!1,r[0]);return i?{PageID:i.properties.id?parseInt(i.properties.id,10):0,Anchor:r[1]||"",Description:n.attr("title"),TargetBlank:!!n.attr("target")}:{}}})}),tinymce.PluginManager.add("sslinkinternal",function(e){return _.init(e)}),t.default=_}]); \ No newline at end of file diff --git a/client/src/legacy/TinyMCE_sslink-internal.js b/client/src/legacy/TinyMCE_sslink-internal.js index 45d0b61bff..81a0cc77a2 100644 --- a/client/src/legacy/TinyMCE_sslink-internal.js +++ b/client/src/legacy/TinyMCE_sslink-internal.js @@ -61,6 +61,10 @@ jQuery.entwine('ss', ($) => { const handleHide = () => this.close(); const handleInsert = (...args) => this.handleInsert(...args); const attrs = this.getOriginalAttributes(); + const selection = tinymce.activeEditor.selection; + const selectionContent = selection.getContent() || ''; + const tagName = selection.getNode().tagName; + const requireLinkText = tagName !== 'A' && selectionContent.trim() === ''; // create/update the react component ReactDOM.render( @@ -74,6 +78,7 @@ jQuery.entwine('ss', ($) => { className="insert-link__dialog-wrapper--internal" fileAttributes={attrs} identifier="Admin.InsertLinkInternalModal" + requireLinkText={requireLinkText} /> , this[0] diff --git a/code/Forms/InternalLinkFormFactory.php b/code/Forms/InternalLinkFormFactory.php index a89e22ee8c..a26439eafc 100644 --- a/code/Forms/InternalLinkFormFactory.php +++ b/code/Forms/InternalLinkFormFactory.php @@ -8,6 +8,7 @@ use SilverStripe\Forms\FieldList; use SilverStripe\Forms\TextField; use SilverStripe\Forms\TreeDropdownField; +use SilverStripe\Forms\RequiredFields; /** * Provides a form factory for inserting internal page links in a HTML editor @@ -35,6 +36,19 @@ protected function getFormFields($controller, $name, $context) ), ]); + if ($context['RequireLinkText']) { + $fields->insertAfter('PageID', TextField::create('Text', _t(__CLASS__.'.LINKTEXT', 'Link text'))); + } + return $fields; } + + protected function getValidator($controller, $name, $context) + { + if ($context['RequireLinkText']) { + return RequiredFields::create('Text'); + } + + return null; + } } diff --git a/code/Forms/InternalLinkModalExtension.php b/code/Forms/InternalLinkModalExtension.php index 39c4b4a617..158fbefb7d 100644 --- a/code/Forms/InternalLinkModalExtension.php +++ b/code/Forms/InternalLinkModalExtension.php @@ -34,8 +34,12 @@ public function getOwner() */ public function editorInternalLink() { - /** @var InternalLinkFormFactory $factory */ + $showLinkText = $this->getOwner()->getRequest()->getVar('requireLinkText'); $factory = InternalLinkFormFactory::singleton(); - return $factory->getForm($this->getOwner(), "editorInternalLink"); + return $factory->getForm( + $this->getOwner(), + "editorInternalLink", + [ 'RequireLinkText' => isset($showLinkText) ] + ); } } From d3451b9843cddba1ac3555c25fd5717d89c05430 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Mon, 7 Aug 2017 14:34:14 +1200 Subject: [PATCH 06/11] Update translations --- lang/ar.yml | 31 ----------- lang/az.yml | 7 --- lang/bg.yml | 33 ----------- lang/bs.yml | 29 ---------- lang/ca.yml | 29 ---------- lang/cs.yml | 36 ------------ lang/da.yml | 8 --- lang/de.yml | 11 ---- lang/el.yml | 6 -- lang/en.yml | 4 +- lang/eo.yml | 39 ------------- lang/es.yml | 14 ----- lang/es_AR.yml | 29 ---------- lang/es_MX.yml | 29 ---------- lang/et_EE.yml | 31 ----------- lang/fa_IR.yml | 10 ---- lang/fi.yml | 22 +++----- lang/fo.yml | 7 --- lang/fr.yml | 31 ----------- lang/gl_ES.yml | 8 --- lang/he_IL.yml | 31 ----------- lang/hr.yml | 11 ---- lang/hu.yml | 17 ------ lang/id.yml | 31 ----------- lang/is.yml | 6 -- lang/it.yml | 39 ------------- lang/ja.yml | 33 ----------- lang/ko.yml | 33 ----------- lang/lt.yml | 33 ----------- lang/lv.yml | 29 ---------- lang/mi.yml | 31 ----------- lang/ms.yml | 7 --- lang/nb.yml | 33 ----------- lang/nl.yml | 127 ++++++++++++++++++++++++++++++++++++++++--- lang/pl.yml | 33 ----------- lang/pt.yml | 28 ---------- lang/pt_BR.yml | 29 ---------- lang/ro.yml | 30 ---------- lang/ru.yml | 48 +++------------- lang/si.yml | 16 ------ lang/sk.yml | 36 ------------ lang/sl.yml | 10 ---- lang/sr.yml | 31 ----------- lang/sr_RS@latin.yml | 31 ----------- lang/sv.yml | 11 ---- lang/th.yml | 31 ----------- lang/tr.yml | 29 ---------- lang/uk.yml | 8 --- lang/vi_VN.yml | 6 -- lang/zh.yml | 31 ----------- lang/zh_CN.yml | 4 -- lang/zh_TW.yml | 8 --- 52 files changed, 136 insertions(+), 1159 deletions(-) diff --git a/lang/ar.yml b/lang/ar.yml index 012e4c8bfe..b81c3caa38 100644 --- a/lang/ar.yml +++ b/lang/ar.yml @@ -55,35 +55,6 @@ ar: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'الرجاء إدخال مقطع URL أو انقر فوق إلغاء الأمر' HelpChars: 'يتم تلقائيا تحويل الأحرف الخاصة أو إزالتها.' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'كود الخطأ' - CODE_400: '400 - طلب خاطئ' - CODE_401: '401 - غير مصرح' - CODE_403: '403 - ممنوع' - CODE_404: '404 - غير موجود' - CODE_405: '405 - الطريقة غير مسموح بها' - CODE_406: '406 - غير مقبول' - CODE_407: '407 - مطلوب الوثوقية من Proxy' - CODE_408: '408 - إنتهاء الوقت المحدد للطلب' - CODE_409: '409 - تعارض' - CODE_410: '410 - إنتهى' - CODE_411: '411 - طول الطلب' - CODE_412: '412 - فشل في الشرط المبدئي' - CODE_413: '413 - الطلب المدخل طويل جداً' - CODE_414: '414 - رابط الطلب طويل جداً' - CODE_415: '415 - ملف الوسائط غير مدعوم' - CODE_416: '416 - مدى الطلب غير متحقق' - CODE_417: '417 - توقع حدوث خطأ' - CODE_500: '500 - خطأ في الخادم الداخلي' - CODE_501: '501 - لم يتم التنفيذ' - CODE_502: '502 - بوابة خاطئة' - CODE_503: '503 - خدمة غير متوفرة' - CODE_504: '504 - انتهاء وقت البوابة' - CODE_505: '505 - إصدار HTTP غير مدعوم' - DEFAULTERRORPAGECONTENT: '

عذراً ، يبدو أنك تحاول الدخول إلى صفحة غير موجودة.

فضلاً تأكد من الرابط و أعد محاولة الدخول مرة أخرى.

' - DEFAULTERRORPAGETITLE: 'الصفحة غير موجودة' - DEFAULTSERVERERRORPAGECONTENT: '

عذرا، كانت هناك مشكلة في التعامل مع طلبك.

' - DEFAULTSERVERERRORPAGETITLE: 'خطأ في الملقم' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'صفحة التحويل تم تهيئتها بدون تحديد وجهة التحويل' HEADER: 'هذه الصفحة سوف تقوم بتحويل الأعضاء إلى صفحة أخرى' @@ -115,9 +86,7 @@ ar: DEPENDENT_NOTE: 'الصفحات التالية تعتمد على هذه الصفحة. وهذا يشمل صفحات الظاهري، وصفحات معيد التوجيه، والصفحات التي تحتوي على روابط المحتوى.' DependtPageColumnLinkType: 'نوع الرابط' DependtPageColumnURL: رابط - EDITANYONE: 'أي شخص ' EDITHEADER: 'من يستطيع تعديل هذه الصفحة؟' - EDITONLYTHESE: 'فقط هؤلاء الأشخاص (اختر من القائمة)' EDITORGROUPS: 'مجموعات المحرر' EDIT_ALL_DESCRIPTION: 'Can edit any page on the site, bypassing page specific security' EDIT_ALL_HELP: 'القدرة على تحرير أي صفحة على الموقع ، بغض النظر عن الإعدادات على علامة تبويب الوصول. يتطلب تصريح "الوصول إلى محتوى الموقع" ' diff --git a/lang/az.yml b/lang/az.yml index 274ad06edd..f1cc118bb7 100644 --- a/lang/az.yml +++ b/lang/az.yml @@ -9,11 +9,6 @@ az: NOTLOGGEDIN: 'Daxil olmayıb' PUBLISHEDSITE: 'Dərc olunmuş sayt' VIEWPAGEIN: 'Səhifəni göstər:' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Səhv kodu' - CODE_501: '501 - Implementasiya olunmayıb' - DEFAULTERRORPAGECONTENT: '

Üzr istəyirik, görünür siz mövcud olan səhifəyə giriş əldə etməyə cəhd edirdiniz.

Xahiş sizin giriş əldə etməyə və bir daha sınaqdan keçirməyə cəhd etdiyiniz URL-i yoxlayasınız

' - DEFAULTERRORPAGETITLE: 'Səhifə tapılmadı' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Yönləndirmə səhifəsinə yönlənmə istiqaməti verilməyib.' HEADER: 'Bu səhifə istifadəçiləri başqa səhifəyə yönləndirəcək' @@ -37,9 +32,7 @@ az: DEFAULTCONTACTTITLE: 'Bizimlə əlaqə' DEFAULTHOMETITLE: 'Baş səhifə' DependtPageColumnLinkType: 'Keçid növü' - EDITANYONE: 'CMS-ə login olan hər kəs' EDITHEADER: 'Bu səhifəni kimlər deyişə bilər?' - EDITONLYTHESE: 'Yalnız aşağıdakılar(siyahıdan seçin)' EDIT_ALL_DESCRIPTION: 'İstənilən səhifəni redaktə et' Editors: 'Redaktor qrupları' HASBROKENLINKS: 'Səhifədə xarab linklər var.' diff --git a/lang/bg.yml b/lang/bg.yml index 28238febe6..6b115ca0f7 100644 --- a/lang/bg.yml +++ b/lang/bg.yml @@ -128,37 +128,6 @@ bg: ARCHIVED: 'Архивирани' SilverStripe\CMS\Forms\SiteTreeURLSegmentField: HelpChars: 'Специалните символи са автоматично конвертирани или изтрити.' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Грешка в кода' - CODE_400: '400 - Лошо Поискване' - CODE_401: '401 - Неауторизирано' - CODE_403: '403 - Забранено' - CODE_404: '404 - Не Намерено' - CODE_405: '405 - Не позволен Метод' - CODE_406: '406 - Не е допустимо' - CODE_407: '407 - Нужна е Proxy Автентификация' - CODE_408: '408 - Времето за искане изтече' - CODE_409: '409 - Конфликт' - CODE_410: '410 - Изчезнал' - CODE_411: '411 - Задължена е Дължина' - CODE_412: '412 - Предпоставката се провали' - CODE_413: '413 - Поисканото лице е прекалено дълго' - CODE_414: '414 - Поисканото-URI е прекалено дълго' - CODE_415: '415 - Неподдържан тип медия' - CODE_416: '416 - Поисканият обсег не е удоволетворен' - CODE_417: '417 - Очакването се провали' - CODE_422: '422 - Необработваеми данни' - CODE_429: '429 - Твърде много заявки' - CODE_500: '500 - Вътрешна грешка при сървъра' - CODE_501: '501 - Не реализирано' - CODE_502: '502 - Лош Gateway' - CODE_503: '503 - Услугата не е налична' - CODE_504: '504 - Gateway времето изтече' - CODE_505: '505 - HTTP Версия не се поддържа' - DEFAULTERRORPAGECONTENT: '

Опитвате се да отворите страница, която не съществува.

Проверете изписването на адреса и опитайте отново.

' - DEFAULTERRORPAGETITLE: 'Страницата не беше намерена' - DEFAULTSERVERERRORPAGECONTENT: '

Проблем при изпълнението на заявката.

' - DEFAULTSERVERERRORPAGETITLE: 'Сървърна грешка' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Създадена е страница за пренасочване без да има накъде да се пренасочи.' HEADER: 'Тази страница ще пренасочи потребители към друга страница' @@ -197,9 +166,7 @@ bg: DESCRIPTION: 'Обща страница със съдържание' DependtPageColumnLinkType: 'Тип на връзката' DependtPageColumnURL: URL - EDITANYONE: 'Всеки, който може да влезе в CMS' EDITHEADER: 'Кой може да променя вътре в CMS?' - EDITONLYTHESE: 'Само тези хора (изберете от списъка)' EDITORGROUPS: 'Групи редактори' EDIT_ALL_DESCRIPTION: 'Редактиране на всяка от странциите' EDIT_ALL_HELP: 'Възможност за редактиране на всяка страница на сайта, независимо от настройките в раздела за достъп. Изисква "Достъп до раздел" секция достъп' diff --git a/lang/bs.yml b/lang/bs.yml index d2875f46b1..3907c4a6b4 100644 --- a/lang/bs.yml +++ b/lang/bs.yml @@ -5,33 +5,6 @@ bs: PUBALLCONFIRM: 'Molimo, objavite svaku stavku na ovoj stranici, kopiranjem sadržaja na aktivnu stranicu' PUBALLFUN: 'Funkcija "Objavi sve"' REMOVEDPAGEFROMDRAFT: 'Uklonjeno ''{title}'' sa privremenog nacrta stranice' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Kod greške' - CODE_400: '400 - Pogrešan zahtjev' - CODE_401: '401 - Neovlašteno' - CODE_403: '403 - Zabranjeno' - CODE_404: '404 - Nije pronađeno' - CODE_405: '405 - Metoda nije dozvoljena' - CODE_406: '406 - NIje prihvatljivo' - CODE_407: '407 - Potrebna proxy ovjera' - CODE_408: '408 - Zahtjev zaustavljen' - CODE_409: '409 - Konflikt' - CODE_410: '410 - Nestalo' - CODE_411: '411 - Potrebna dužina' - CODE_412: '412 - Neuspjela pretpostavka' - CODE_413: '413 - Preveliki entitet zahtjeva' - CODE_414: '414 - Predug URI zahtjeva' - CODE_415: '415 - Tip medija nije podržan' - CODE_416: '416 - Opseg zahtjeva nije zadovoljavajući' - CODE_417: '417 - Neuspješno očekivanje' - CODE_500: '500 - INterna greška na serveru' - CODE_501: '501 - Nije realizirano' - CODE_502: '502 - Pogrešan gateway' - CODE_503: '503 - Nedostupan servis ' - CODE_504: '504 - Gateway zaustavljen' - CODE_505: '505 - HTTP izdanje nije podržano' - DEFAULTERRORPAGECONTENT: '

Žao nam je, pokušali ste pristupiti stranici koja ne postoji.

Molimo provjerite da li ste ispravno ukucali URL kojem ste pokušali pristupiti i pokušajte ponovo.

' - DEFAULTERRORPAGETITLE: 'Stranica nije pronađena' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Stranica za preusmjeravanje je podešena bez odredišta.' HEADER: 'Ova stranica će preusmjeriti korisnike na drugu stranicu' @@ -52,9 +25,7 @@ bs: DEFAULTABOUTTITLE: 'O nama' DEFAULTCONTACTTITLE: 'Kontaktirajte nas' DEFAULTHOMETITLE: Početna - EDITANYONE: 'Svi korisnici koji se mogu prijaviti u CMS' EDITHEADER: 'Ko može izmijeniti ovu stavku unutar CMS-a?' - EDITONLYTHESE: 'Samo ovi korisnici (izaberite sa popisa)' HASBROKENLINKS: 'Ova stranica ima neispravnih linkova.' HTMLEDITORTITLE: Sadržaj MENUTITLE: 'Oznaka navigacije' diff --git a/lang/ca.yml b/lang/ca.yml index 9dfa2ae4e2..393532062b 100644 --- a/lang/ca.yml +++ b/lang/ca.yml @@ -4,33 +4,6 @@ ca: PUBALLCONFIRM: 'Publica cada pàgina del lloc web, copiant el contingut cap a la versió publicada' PUBALLFUN: 'Funcionalitat de "Publica-ho tot"' REMOVEDPAGEFROMDRAFT: 'S''ha suprimit ''{title}'' del lloc esborrany' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Codi d''error' - CODE_400: '400 - Mala petició' - CODE_401: '401 - Sense autorització' - CODE_403: '403 - Prohibit' - CODE_404: '404 - No s''ha trobat' - CODE_405: '405 - Mètode no permès' - CODE_406: '406 - No acceptable' - CODE_407: '407 - Autenticació de servidor intermediari requerida' - CODE_408: '408 - Temps excedit de la petició' - CODE_409: '409 - Conflicte' - CODE_410: '410 - Ja no hi és' - CODE_411: '411 - Longitud requerida' - CODE_412: '412 - Una precondició ha fallat' - CODE_413: '413 - Entitat de la petició massa gran' - CODE_414: '414 - Adreça de la petició massa llarga' - CODE_415: '415 - Tipus mèdia no suportat' - CODE_416: '416 - Rang de la petició no satisfactible' - CODE_417: '417 - Expectació ha fallat' - CODE_500: '500 - Error intern del servidor' - CODE_501: '501 - No implementat' - CODE_502: '502 - Pasarel·la errònia' - CODE_503: '503 - Servei no disponible' - CODE_504: '504 - Temps excedit de la pasarel·la' - CODE_505: '505 - Versió HTTP no suportada' - DEFAULTERRORPAGECONTENT: '

Sembla que intenteu accedir a una pàgina que no existeix.

Si us plau, reviseu com heu escrit la URL que intenteu accedir i proveu-ho de nou.

' - DEFAULTERRORPAGETITLE: 'Pàgina no trobada' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'S''ha definit una pàgina redirectora sense cap lloc on redirigir.' HEADER: 'Aquesta pàgina redirigirà usuaris a una altra pàgina' @@ -53,9 +26,7 @@ ca: DEFAULTABOUTTITLE: 'Sobre nosaltres' DEFAULTCONTACTTITLE: 'Contacteu amb nosaltres' DEFAULTHOMETITLE: Portada - EDITANYONE: 'Qualsevol que pot entrar al SGC' EDITHEADER: 'Qui pot editar-la des del SGC?' - EDITONLYTHESE: 'Només aquesta gent (trieu d''una llista)' Editors: 'Grups d''editors' HASBROKENLINKS: 'Aquesta pàgina té enllaços trencats' HTMLEDITORTITLE: Contingut diff --git a/lang/cs.yml b/lang/cs.yml index d8bc347bb6..a5eb39a207 100644 --- a/lang/cs.yml +++ b/lang/cs.yml @@ -141,40 +141,6 @@ cs: Edit: Editovat HelpChars: 'Zvláštní znaky jsou automaticky zkonvertovány nebo odstraněny' OK: OK - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Chybový kód' - CODE_400: '400 - Špatný požadavek' - CODE_401: '401 - Neautorizováno' - CODE_403: '403 - Zakázáno' - CODE_404: '404 - Nenalezeno' - CODE_405: '405 - Metoda není povolena' - CODE_406: '406 - Není přijatelné' - CODE_407: '407 - Požadována proxy autentizace' - CODE_408: '408 - Vypršel čas požadavku' - CODE_409: '409 - Konflikt' - CODE_410: '410 - Uplynulý' - CODE_411: '411 - Požadována délka' - CODE_412: '412 - Nezdařená podmínka' - CODE_413: '413 - Žádaná entita je moc velká' - CODE_414: '414 - Vyžádání URI trvá moc dlouho' - CODE_415: '415 - Nepodporovaný typ média' - CODE_416: '416 - Vyžádaný rozsah není dostatečný' - CODE_417: '417 - Očekávání se nezdařilo' - CODE_422: '422 - Nezpracovatelná entita' - CODE_429: '429 - Příliš mnoho požadavků' - CODE_500: '500 - Interní chyba serveru' - CODE_501: '501 - Není implementováno' - CODE_502: '502 - Špatná Gateway' - CODE_503: '503 - Nedostupná služba' - CODE_504: '504 - Vypršel čas Gateway' - CODE_505: '505 - HTTP verze není podporována' - DEFAULTERRORPAGECONTENT: '

Omlouváme se, zdá se, že jste se pokoušeli o přístup na stránku, která neexistuje.

Zkontrolujte prosím pravopis požadované URL adresy, ke které jste se pokoušeli přistoupit a zkuste to znovu.

' - DEFAULTERRORPAGETITLE: 'Stránka nenelazena' - DEFAULTSERVERERRORPAGECONTENT: '

Promiňte, nastal problém s obsloužením vaší žádosti.

' - DEFAULTSERVERERRORPAGETITLE: 'Chyba serveru' - DESCRIPTION: 'Vlastní obsah pro různé případy chyb (např. "Stránka nenalezena")' - PLURALNAME: 'Chybové stránky' - SINGULARNAME: 'Chybová stránka' SilverStripe\CMS\Model\RedirectorPage: DESCRIPTION: 'Přesměruje na interní stránku nebo na externí URL' HASBEENSETUP: 'Přesměrovací stránka byla nastavena bez cíle.' @@ -216,9 +182,7 @@ cs: DESCRIPTION: 'Obecný obsah stránky' DependtPageColumnLinkType: 'Typ odkazu' DependtPageColumnURL: URL - EDITANYONE: 'Kdokoliv, kdo se do CMS může přihlásit' EDITHEADER: 'Kdo může tuto stránku editovat?' - EDITONLYTHESE: 'Jenom tito lidé (vyberte ze seznamu)' EDITORGROUPS: 'Editor skupin' EDIT_ALL_DESCRIPTION: 'Může editovat jakoukoli stránku webu, obcházeje bezpečnostní specifikaci stránky' EDIT_ALL_HELP: 'Možnost upravit libovolnou stránku na webu, bez ohledu na nastavení na kartě Přístup. Vyžaduje povolení "Přístup k sekci ''Stránky''"' diff --git a/lang/da.yml b/lang/da.yml index d651229103..c506565880 100644 --- a/lang/da.yml +++ b/lang/da.yml @@ -42,12 +42,6 @@ da: VIEWPAGEIN: 'Vis side i:' SilverStripe\CMS\Forms\SiteTreeURLSegmentField: HelpChars: 'Specialkarakterer bliver automatisk konverteret eller fjernet.' - SilverStripe\CMS\Model\ErrorPage: - CODE: Fejlkode - DEFAULTERRORPAGECONTENT: '

Det lader til at du har forsøgt at få vist en side som ikke findes

Undersøg venligst om URL''en er korrekt stavet og forsøg derefter igen.

' - DEFAULTERRORPAGETITLE: 'Siden blev ikke fundet' - DEFAULTSERVERERRORPAGECONTENT: '

Der opstod desværre et problem med at håndtere din forespørgsel.

' - DEFAULTSERVERERRORPAGETITLE: Serverfejl SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'En omdirigeringsside er blevet sat op, uden et sted at omdirigere til.' HEADER: 'Denne side omdirigerer besøgende til en anden side' @@ -77,9 +71,7 @@ da: DEFAULTCONTACTTITLE: 'Kontakt os' DEFAULTHOMETITLE: Forside DependtPageColumnLinkType: Linktype - EDITANYONE: 'Enhver der kan logge ind på CMS' EDITHEADER: 'Hvem kan redigere denne side ?' - EDITONLYTHESE: 'Kun disse personer (vælg fra liste)' EDITORGROUPS: Redaktionsgrupper EDIT_ALL_DESCRIPTION: 'Rediger enhver side' HASBROKENLINKS: 'Denne side har links der ikke virker.' diff --git a/lang/de.yml b/lang/de.yml index 235e999dfe..cacf5c7052 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -126,15 +126,6 @@ de: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'Bitte geben Sie ein URL-Segment ein oder drücken Sie auf Abbrechen' HelpChars: 'Sonderzeichen werden automatisch umgewandelt oder entfernt.' - SilverStripe\CMS\Model\ErrorPage: - CODE: Fehlercode - DEFAULTERRORPAGECONTENT: '

Entschuldigung, möglicherweise versuchen Sie eine Seite zu erreichen die nicht existiert.

Bitte überprüfen Sie die Schreibweise der URL die Sie versucht haben zu erreichen und versuchen Sie es noch einmal.

' - DEFAULTERRORPAGETITLE: 'Seite nicht gefunden' - DEFAULTSERVERERRORPAGECONTENT: '

Entschuldigung, bei der Bearbeitung ihrer Anfrage ist ein Problem aufgetreten.

' - DEFAULTSERVERERRORPAGETITLE: Serverfehler - DESCRIPTION: 'Spezieller Inhalt für andere Fehlerfälle (z.B. "Seite nicht gefunden")' - PLURALNAME: Fehlerseiten - SINGULARNAME: Fehlerseite SilverStripe\CMS\Model\RedirectorPage: DESCRIPTION: 'Leitet zu einer anderen internen oder externen Seite weiter' HASBEENSETUP: 'Eine Weiterleitungsseite wurde erstellt ohne das eine Weiterleitung definiert wurde.' @@ -173,9 +164,7 @@ de: DESCRIPTION: 'Allgemeine Inhaltsseite' DependtPageColumnLinkType: Linktyp DependtPageColumnURL: URL - EDITANYONE: 'Jeder der sich in das CMS einloggen kann' EDITHEADER: 'Wer kann diese Seite im CMS verändern?' - EDITONLYTHESE: 'Nur folgende Personen (aus der der Liste wählen)' EDITORGROUPS: Bearbeitergruppen EDIT_ALL_DESCRIPTION: 'Kann beliebige Seiten bearbeiten' EDIT_ALL_HELP: 'Kann beliebige Seiten auf der Site bearbeiten; seitenspezifische Sicherheitseinstellungen werden ignoriert.' diff --git a/lang/el.yml b/lang/el.yml index 6f63df31d7..163cc090ae 100644 --- a/lang/el.yml +++ b/lang/el.yml @@ -32,11 +32,6 @@ el: ARCHIVED: Αρχειοθετημένο SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'Παρακαλώ εισάγεται ένα τμήμα διεύθυνσης URL ή πατήστε άκυρο' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Κωδικός σφάλματος' - CODE_404: '404 - Δεν βρέθηκε' - DEFAULTERRORPAGETITLE: 'Η σελίδα δεν βρέθηκε' - DEFAULTSERVERERRORPAGETITLE: 'Σφάλμα διακομιστή' SilverStripe\CMS\Model\RedirectorPage: HEADER: 'Αυτή η σελίδα θα ανακατευθύνει τους χρήστες σε μια άλλη σελίδα' REDIRECTTO: 'Ανακατεύθυνση σε' @@ -57,7 +52,6 @@ el: DependtPageColumnLinkType: 'Τύπος συνδέσμου' DependtPageColumnURL: 'Διεύθυνση URL' EDITHEADER: 'Ποιος μπορεί να επεξεργαστεί αυτή τη σελίδα;' - EDITONLYTHESE: 'Μόνο αυτοί οι χρήστες (επιλέξτε από τη λίστα)' EDITORGROUPS: 'Ομάδες Συντακτών' Editors: 'Ομάδες Συντακτών' GroupPlaceholder: 'Κάντε κλικ για επιλογή ομάδας' diff --git a/lang/en.yml b/lang/en.yml index 246998108c..2747dcaa53 100644 --- a/lang/en.yml +++ b/lang/en.yml @@ -139,6 +139,7 @@ en: ANCHORVALUE: Anchor LINKDESCR: 'Link description' LINKOPENNEWWIN: 'Open in new window/tab' + LINKTEXT: 'Link text' SELECT_PAGE: 'Select a page' SilverStripe\CMS\Forms\SiteTreeURLSegmentField: Cancel: Cancel @@ -148,7 +149,6 @@ en: OK: OK SilverStripe\CMS\Model\RedirectorPage: DESCRIPTION: 'Redirects to an internal page or an external URL' - HASBEENSETUP: 'A redirector page has been set up without anywhere to redirect to.' HEADER: 'This page will redirect users to another page' OTHERURL: 'Other website URL' PLURALNAME: 'Redirector Pages' @@ -160,6 +160,8 @@ en: REDIRECTTOPAGE: 'A page on your website' SINGULARNAME: 'Redirector Page' YOURPAGE: 'Page on your website' + SilverStripe\CMS\Model\RedirectorPageController: + HASBEENSETUP: 'A redirector page has been set up without anywhere to redirect to.' SilverStripe\CMS\Model\SiteTree: ACCESSANYONE: Anyone ACCESSHEADER: 'Who can view this page?' diff --git a/lang/eo.yml b/lang/eo.yml index d0b3a396e7..858658d231 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -141,43 +141,6 @@ eo: Edit: Redakti HelpChars: 'Aŭtomate konvertas aŭ forigas specialajn signojn.' OK: Akcepti - SilverStripe\CMS\Model\ErrorPage: - CODE: Erarokodo - CODE_400: '400 - Nevalida peto' - CODE_401: '401- Nepermesita' - CODE_403: '403 - Nepermesebla' - CODE_404: '404 - Netrovita' - CODE_405: '405 - Metodo nepermesita' - CODE_406: '406 - Ne akceptebla' - CODE_407: '407 - Bezonas prokuran aŭtentokontrolon' - CODE_408: '408 - Pasis tempolimo de peto' - CODE_409: '409 - Konflikto' - CODE_410: '410 - For' - CODE_411: '411 - Longo bezonata' - CODE_412: '412 - Antaŭkondiĉo malsukcesis' - CODE_413: '413 - Petaĵo tro granda' - CODE_414: '414 - Petita URI tro longa' - CODE_415: '415 - Nesubtenata spekta tipo' - CODE_416: '416 - Peta amplekso ne plenumebla' - CODE_417: '417 - Atendo malsukcesis' - CODE_422: '422 - Netrakebla ento' - CODE_429: '429 - Tro da petoj' - CODE_500: '500 - Eraro de interna servilo' - CODE_501: '501 - Ne realigita' - CODE_502: '502 - Malbona kluzo' - CODE_503: '503 - Servo nehavebla' - CODE_504: '504 - Kluza tempolimo' - CODE_505: '505 - HTTP-Versio ne subtenata' - DEFAULTERRORPAGECONTENT: '

Bedaŭrinde, ŝajne vi provis aliri paĝon kiu ne ekzistas.

Bonvole kontrolu la literumadon de la URL alirota kaj provu denove.

' - DEFAULTERRORPAGETITLE: 'Ne trovis paĝon' - DEFAULTSERVERERRORPAGECONTENT: '

Bedaŭrinde, estis problemo pri via peto.

' - DEFAULTSERVERERRORPAGETITLE: 'Servila eraro' - DESCRIPTION: 'Propra enhavo por diversaj okazoj de eraro (ekzemple, "Ne trovis paĝon")' - PLURALNAME: 'Paĝoj pri eraroj' - PLURALS: - one: 'Unu prierara paĝo' - other: '{count} prieraraj paĝoj' - SINGULARNAME: 'Paĝo pri eraroj' SilverStripe\CMS\Model\RedirectorPage: DESCRIPTION: 'Alidirektas al interna paĝo aŭ ekstera URL' HASBEENSETUP: 'Alidirekta paĝo estis agordita sen ie al kie alidirekti.' @@ -222,9 +185,7 @@ eo: DESCRIPTION: 'Paĝo por ĝenerala enhavo' DependtPageColumnLinkType: 'Ligila tipo' DependtPageColumnURL: URL - EDITANYONE: 'Tiu, kiu povas ensaluti en la CMS' EDITHEADER: 'Kiuj povas redakti ĉi tiun paĝon?' - EDITONLYTHESE: 'Nur ĉi tiuj homoj (elektu de listo)' EDITORGROUPS: 'Grupoj de redaktantoj' EDIT_ALL_DESCRIPTION: 'Redakti ajnan paĝon' EDIT_ALL_HELP: 'Eblo redakti ajnan paĝon en la retejo, senkonsidere de la agordoj en la langeto Aliro. Necesas la permeso "Aliro al sekcio ''Paĝoj'' "' diff --git a/lang/es.yml b/lang/es.yml index 22065893be..33cdeb397f 100644 --- a/lang/es.yml +++ b/lang/es.yml @@ -91,18 +91,6 @@ es: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: Vacío HelpChars: 'Los caracteres especiales son automáticamente convertidos o eliminados.' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Código de error' - DEFAULTERRORPAGECONTENT: '

Lo sentimos, parece que intentaste acceder a una página que no existe.

Por favor, comprueba que la URL que intentabas acceder está bien escrita e inténtalo de nuevo.

' - DEFAULTERRORPAGETITLE: 'Página no encontrada' - DEFAULTSERVERERRORPAGECONTENT: '

Lo sentimos, hubo un problema al gestionar tu solicitud.

' - DEFAULTSERVERERRORPAGETITLE: 'Error de servidor' - DESCRIPTION: 'Contenido personalizado para los distintos casos de error (p.e. "Página no encontrada")' - PLURALNAME: 'Páginas de error' - PLURALS: - one: 'Una Página de error' - other: '{count} Páginas de error' - SINGULARNAME: 'Página de error' SilverStripe\CMS\Model\RedirectorPage: DESCRIPTION: 'Redirecciona a una página interna o a una URL externa' HASBEENSETUP: 'Se ha establecido una página redireccionadora sin ningún sitio al cual redireccionar.' @@ -145,9 +133,7 @@ es: DESCRIPTION: 'Página de contenido genérico' DependtPageColumnLinkType: 'Tipo de enlace' DependtPageColumnURL: 'Depende de' - EDITANYONE: 'Cualquiera que pueda iniciar sesión en el CMS' EDITHEADER: '¿Quién puede editar esta página?' - EDITONLYTHESE: 'Solo estas personas (elija de la lista)' EDITORGROUPS: 'Grupos de Editor' EDIT_ALL_DESCRIPTION: 'Editar cualquier página' EDIT_ALL_HELP: 'Posibilidad de editar cualquier página en el sitio, independientemente de la configuración de la pestaña de Acceso. Requiere permiso "Acceso a la sección ''Páginas''"' diff --git a/lang/es_AR.yml b/lang/es_AR.yml index ac97775db5..2cd95d3ae3 100644 --- a/lang/es_AR.yml +++ b/lang/es_AR.yml @@ -14,33 +14,6 @@ es_AR: NOTLOGGEDIN: 'No conectado' PUBLISHEDSITE: 'Sitio publicado' VIEWPAGEIN: 'Ver página en:' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Código de Error' - CODE_400: '400 - Petición Incorrecta' - CODE_401: '401 - No estás autorizado' - CODE_403: '403 - Acceso Restringido' - CODE_404: '404 - No se encuentra' - CODE_405: '405 - Método No Permitido' - CODE_406: '406 - No es Aceptable' - CODE_407: '407 - Se Requiere Autenticación por Proxy' - CODE_408: '408 - Petición Excedida en Tiempo' - CODE_409: '409 - Existe Un Conflicto' - CODE_410: '410 - Reubicado' - CODE_411: '411 - Requiere Longitud' - CODE_412: '412 - Falló Precondición' - CODE_413: '413 - Elemento Requerido muy Largo' - CODE_414: '414 - URL Requerida muy Larga' - CODE_415: '415 - Tipo de Medio no Soportado' - CODE_416: '416 - No Satisface el Rango de Petición' - CODE_417: '417 - Falló la Expectativa' - CODE_500: '500 - Error Interno del Servidor' - CODE_501: '501 - No Implementado' - CODE_502: '502 - Puerta de Acceso Incorrecta' - CODE_503: '503 - Fuera de Servicio' - CODE_504: '504 - Tiempo Excedido en Puerta de Acceso' - CODE_505: '505 - Versión HTTP Sin Soporte' - DEFAULTERRORPAGECONTENT: '

Disculpa, parece que estás tratando de ingresar a una página que no existe.

Por favor verifica la escritura de la URL que deseas visitar e inténtalo de nuevo.

' - DEFAULTERRORPAGETITLE: 'Página inexistente' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Se ha instalado una página de redirección sin algún lugar a donde redireccionar.' HEADER: 'Esta página dirigirá al usuarios a otra página' @@ -65,9 +38,7 @@ es_AR: DEFAULTHOMETITLE: Inicio DEPENDENT_NOTE: 'Las siguientes páginas dependen de esta página. Esto incluye páginas virtuales, páginas de redireccionamiento y páginas con enlaces de contenido.' DependtPageColumnLinkType: 'Tipo de enlace' - EDITANYONE: 'Cualquiera que pueda ingresar al CMS' EDITHEADER: '¿Quién puede editar ésta página?' - EDITONLYTHESE: 'Únicamente éstas personas (selecciona de la lista)' EDIT_ALL_DESCRIPTION: 'Editar cualquier página' EDIT_ALL_HELP: 'Capacidad para editar cualquier página en el sitio, independientemente de la configuración en la pestaña Acceso. Necesita del permiso "Acceder al contenido del sitio".' Editors: 'Grupos de Editores' diff --git a/lang/es_MX.yml b/lang/es_MX.yml index 9611d721a3..1984f6a2ae 100644 --- a/lang/es_MX.yml +++ b/lang/es_MX.yml @@ -14,33 +14,6 @@ es_MX: NOTLOGGEDIN: 'No ha iniciado sesión' PUBLISHEDSITE: 'Sitio Publicado' VIEWPAGEIN: 'Ver página en:' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Código de Error' - CODE_400: '400 - Petición Incorrecta' - CODE_401: '401 - No estás autorizado' - CODE_403: '403 - Acceso Restringido' - CODE_404: '404 - No se encuentra' - CODE_405: '405 - Método No Permitido' - CODE_406: '406 - No es Aceptable' - CODE_407: '407 - Se Requiere Autentificación del Proxy' - CODE_408: '408 - La Petición Excede Del Tiempo Autorizado' - CODE_409: '409 - Existe Un Conflicto' - CODE_410: '410 - Reubicado' - CODE_411: '411 - Requiere Longitud' - CODE_412: '412 - Falló la precondición' - CODE_413: '413 - Elemento solicitado muy largo' - CODE_414: '414 - La URI solicitada es muy larga' - CODE_415: '415 - Tipo de medio sin soporte' - CODE_416: '416 - No Satisface el Rango de Petición' - CODE_417: '417 - Esperaba otra cosa' - CODE_500: '500 - Error Interno del Servidor' - CODE_501: '501 - No Implementado' - CODE_502: '502 - Puerta de acceso equivocada' - CODE_503: '503 - Fuera de Servicio' - CODE_504: '504 - Excesivo Tiempo en la Puerta de Acceso' - CODE_505: '505 - Versión HTTP Sin Soporte' - DEFAULTERRORPAGECONTENT: '

Disculpe, parece que está tratando de ingresar a una página que no existe.

Por favor verifique la URL que desea visitar e inténtelo de nuevo.

' - DEFAULTERRORPAGETITLE: 'Página inexistente' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Se ha instalado una página de redirección sin algún lugar a donde redireccionar.' HEADER: 'Esta página dirigirá al usuarios a otra página' @@ -65,9 +38,7 @@ es_MX: DEFAULTHOMETITLE: Inicio DEPENDENT_NOTE: 'Las siguientes páginas depender de esta página. Esto incluye páginas virtuales, redirección de páginas y páginas con enlaces de contenido.' DependtPageColumnLinkType: 'Tipo de enlace' - EDITANYONE: 'Cualquiera que pueda ingresar al CMS' EDITHEADER: '¿Quién puede modificar esta página?' - EDITONLYTHESE: 'Únicamente éstas personas (selecciona de la lista)' EDITORGROUPS: 'Editor de grupos' EDIT_ALL_DESCRIPTION: 'Editar cualquier página' EDIT_ALL_HELP: 'La capacidad para editar cualquier página en el sitio, independientemente de la configuración en la ficha Acceso. Requiere el permiso de "Acceso al contenido del sitio".' diff --git a/lang/et_EE.yml b/lang/et_EE.yml index 866c6d45da..5fbc0e8601 100644 --- a/lang/et_EE.yml +++ b/lang/et_EE.yml @@ -47,35 +47,6 @@ et_EE: ARCHIVED: Arhiveeritud SilverStripe\CMS\Forms\SiteTreeURLSegmentField: HelpChars: 'Erimärgid teisendatakse või eemaldatakse automaatselt.' - SilverStripe\CMS\Model\ErrorPage: - CODE: Veakood - CODE_400: '400 - Halb päring' - CODE_401: '401 - Volitamata ligipääs' - CODE_403: '403 - Keelatud' - CODE_404: '404 - Ei leitud' - CODE_405: '405 - Meetod pole lubatud' - CODE_406: '406 - Ligipääs puudub' - CODE_407: '407 - Proxy tuvastus vajalik' - CODE_408: '408 - Palve aegunud' - CODE_409: '409 - Konflikt' - CODE_410: '410 - Kustutatud' - CODE_411: '411 - Distants vajalik' - CODE_412: '412 - Eeltingimused täitmata' - CODE_413: '413 - Palve käsklus liiga suur' - CODE_414: '414 - soovitud URL liiga pikk' - CODE_415: '415 - Ebasoovitav meedia tüüp' - CODE_416: '416 - Päring rahuldamata' - CODE_417: '417 - Eeldus puudub' - CODE_500: '500 - Serveri viga' - CODE_501: '501 - Rakendus puudub' - CODE_502: '502 - Halb sissepääsutee' - CODE_503: '503 - Teenus puudub' - CODE_504: '504 - Sissepääsutee aegmaas' - CODE_505: '505 - HTTP versioon ei ole kasutusel' - DEFAULTERRORPAGECONTENT: '

Vabandust aga tundub, et proovid ligipääseda lehele mida pole olemas.

Palun kontrolli uuesti aadressi kuhu proovid ligi pääseda.

' - DEFAULTERRORPAGETITLE: 'Lehekülge ei leitud' - DEFAULTSERVERERRORPAGECONTENT: '

Vabandust, teie taotluse töötlemisel ilmnes probleem.

' - DEFAULTSERVERERRORPAGETITLE: 'Serveri viga' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Suunav lehekülg seati üles ilma, et ta kuhugile suunaks.' HEADER: 'See lehekülg suunab kasutajad teisele leheküljele' @@ -107,9 +78,7 @@ et_EE: DEPENDENT_NOTE: 'Alljärgnevad lehed sõltuvad sellest lehest. See hõlmab virtuaalseid lehti, ümbersuunamislehti ja sisulinkidega lehti.' DependtPageColumnLinkType: 'Lingi tüüp' DependtPageColumnURL: URL - EDITANYONE: 'Igaüks, kes sisuhaldussüsteemi sisse võib logida' EDITHEADER: 'Kes tohib seda sisuhaldussüsteemi kaudu muuta?' - EDITONLYTHESE: 'Ainult järgnevad isikud (vali nimekirjast)' EDITORGROUPS: Muutjagrupid EDIT_ALL_DESCRIPTION: 'Redigeeri mis tahes lehte' EDIT_ALL_HELP: 'Võimalus redigeerida mis tahes lehte sellel saidil, hoolimata vahekaardi Juurdepääs seadetest. Vajab jaotise "Juurdepääs lehtedele" õigusi\n' diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml index db6749e0d3..39b99ea53a 100644 --- a/lang/fa_IR.yml +++ b/lang/fa_IR.yml @@ -93,14 +93,6 @@ fa_IR: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'لطفاً یک بخش نشانی اینترنتی را درج نمایید یا روی لغو کلیک کنید.' HelpChars: 'کاراکترهای ویژه به‌طور خودکار تبدیل یا حذف می‌شوند.' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'کد خطا' - DEFAULTERRORPAGECONTENT: '

متاسفانه، به‌نظر می‌رسد شما در تلاش برای دستیابی به صفحه‌ای هستید که وجود ندارد.

لطفاً نشانی اینترنتی را از جهت وجود خطای نگارشی بررسی و مجدداً تلاش نمایید.

' - DEFAULTERRORPAGETITLE: 'برگ پیدا نشد' - DEFAULTSERVERERRORPAGECONTENT: '

با پوزش، در پردازش درخواست شما ایرادی بوجود آمد.

' - DEFAULTSERVERERRORPAGETITLE: 'خطای سرور' - PLURALNAME: 'صفحات خطا' - SINGULARNAME: 'صفحه‌ی خطا' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'یک صفحه‌ی هدایت‌گر ایجاد گردیده است بدون این‌که به جایی ارجاع داشته باشد.' HEADER: 'این صفحه کاربران را به صفحه‌ای دیگر هدایت می‌کند' @@ -139,9 +131,7 @@ fa_IR: DESCRIPTION: 'صفحه محتوای عمومی' DependtPageColumnLinkType: 'نوع پیوند' DependtPageColumnURL: 'نشانی اینترنتی' - EDITANYONE: 'هر کسی بتواند به سیستم مدیریت محتوا وارد شود' EDITHEADER: 'چه کسی بتواند این صفحه را ویرایش کند ؟' - EDITONLYTHESE: 'فقط این افراد (انتخاب از لیست)' EDITORGROUPS: 'گروه‌های ویرایشگر' EDIT_ALL_DESCRIPTION: 'ویرایش هر صفحه‌ای' Editors: 'گروه‌های ویرایشگران' diff --git a/lang/fi.yml b/lang/fi.yml index d6a5cbf606..b8d4910207 100644 --- a/lang/fi.yml +++ b/lang/fi.yml @@ -3,6 +3,7 @@ fi: RESULT: 'Poistettiin %d sivua luonnoksista ja julkaistuista sivuista sekä arkistoitiin' TITLE: 'Poista näkyviltä ja arkistoi' SilverStripe\CMS\BatchActions\CMSBatchAction_Publish: + PUBLISHED_PAGES: 'Julkaistu %d sivua, %d virhettä' PUBLISH_PAGES: Julkaise SilverStripe\CMS\BatchActions\CMSBatchAction_Restore: RESTORE: Palauta @@ -134,24 +135,17 @@ fi: VIEWPAGEIN: 'Tarkastele sivua:' SilverStripe\CMS\Controllers\SilverStripeNavigator: ARCHIVED: Arkistoitu + SilverStripe\CMS\Forms\InternalLinkFormFactory: + ANCHORVALUE: Ankkuri + LINKDESCR: 'Linkin kuvaus' + LINKOPENNEWWIN: 'Avataanko linkki uudessa ikkunassa/välilehdellä?' + SELECT_PAGE: 'Valitse sivu' SilverStripe\CMS\Forms\SiteTreeURLSegmentField: Cancel: Peruuta EMPTY: 'Anna URL-osoite tai napsauta peruuta' Edit: Muokkaa HelpChars: 'Erikoismerkit muunnetaan tai poistetaan automaattisesti.' OK: OK - SilverStripe\CMS\Model\ErrorPage: - CODE: Virhekoodi - DEFAULTERRORPAGECONTENT: '

Valitettavasti hakemaasi sivua ei ole olemassa.

Tarkista hakemasi sivun URL-osoitteen kirjoitusasu ja yritä uudelleen.

' - DEFAULTERRORPAGETITLE: 'Sivua ei löytynyt' - DEFAULTSERVERERRORPAGECONTENT: '

Pahoittelut, mutta pyyntösi aiheutti virheen.

' - DEFAULTSERVERERRORPAGETITLE: Palvelinvirhe - DESCRIPTION: 'Omat virheilmoitukset (sivuille, kuten "Sivua ei löytynyt")' - PLURALNAME: Virhesivut - PLURALS: - one: Virhesivu - other: '{count} Virhesivua' - SINGULARNAME: Virhesivu SilverStripe\CMS\Model\RedirectorPage: DESCRIPTION: 'Edelleenohjaa toiselle sisäiselle sivulle tai ulkoiseen URL-osoitteeseen' HASBEENSETUP: 'Sivu, joka ohjaa käyttäjän toiselle sivulle on valmis, mutta sivua, jolle käyttäjä ohjataan, ei ole.' @@ -196,10 +190,9 @@ fi: DESCRIPTION: 'Yleinen sisältösivu' DependtPageColumnLinkType: 'Linkin tyyppi' DependtPageColumnURL: URL - EDITANYONE: 'Jokainen, joka voi kirjautua sisään CMS:ään.' EDITHEADER: 'Kuka voi muokata tätä CMS:ssä?' - EDITONLYTHESE: 'Vain seuraavat henkilöt (valitse listasta)' EDITORGROUPS: 'Muokkaa ryhmiä' + EDITOR_GROUPS_FIELD_DESC: 'Ryhmät, joilla laajat muokkausoikeudet: {groupList}' EDIT_ALL_DESCRIPTION: 'Muokkaa mitä tahansa sivua' EDIT_ALL_HELP: 'Mahdollisuus muokata mitä tahansa sivua sivustosta, riippumatta Käyttöoikeus-välilehden asetuksista. Vaatii "Käyttöoikeus sivuston sisältöön" -lupaa' Editors: Toimittajaryhmät @@ -253,6 +246,7 @@ fi: TOPLEVEL: 'Sivuston sisältö (ylin taso)' URLSegment: URL-osoite VIEWERGROUPS: Katsojaryhmät + VIEWER_GROUPS_FIELD_DESC: 'Ryhmät, joilla laajat katseluoikeudet: {groupList}' VIEW_ALL_DESCRIPTION: 'Näytä mikä tahansa sivu' VIEW_ALL_HELP: 'Mahdollisuus nähdä mikä tahansa sivu, huolimatta Käyttöoikeudet-välilehden asetuksista. Vaatii "Käyttöoikeus ''Sivuihin''" -oikeudet.' VIEW_DRAFT_CONTENT: 'Näytä luonnoksen sisältö' diff --git a/lang/fo.yml b/lang/fo.yml index e92ec165af..11d3fe5a83 100644 --- a/lang/fo.yml +++ b/lang/fo.yml @@ -4,11 +4,6 @@ fo: PUBALLCONFIRM: 'Vinarliga almenna kunngerð allar síðurnar á heimasíðuni, avrita innihaldsstøðið til beinleiðis' PUBALLFUN: '"Ger alt alment" funka' REMOVEDPAGEFROMDRAFT: 'Strikaði ''{title}'' frá kladdu heimasíðuni' - SilverStripe\CMS\Model\ErrorPage: - CODE: Feilkota - CODE_404: '404 - Ikki funnin' - CODE_411: '411 - Longd er kravd' - DEFAULTERRORPAGETITLE: 'Síðan var ikki funnin' SilverStripe\CMS\Model\RedirectorPage: REDIRECTTO: 'Víðarisend til' REDIRECTTOEXTERNAL: 'Onnur heimasíðu' @@ -28,9 +23,7 @@ fo: DEFAULTABOUTTITLE: 'Um okkum' DEFAULTCONTACTTITLE: 'Samband við okkum' DEFAULTHOMETITLE: Heim - EDITANYONE: 'Øll kunna innrita á CMS skipanina' EDITHEADER: 'Hvør kann broyta hesa síðuna?' - EDITONLYTHESE: 'Bert hesa fólkini (vel frá yvirliti)' HASBROKENLINKS: 'Hendan síðan inniheldur brotnar leinkur.' HTMLEDITORTITLE: Innihald METADESC: Frágreiðing diff --git a/lang/fr.yml b/lang/fr.yml index 13ef354867..d615543745 100644 --- a/lang/fr.yml +++ b/lang/fr.yml @@ -60,35 +60,6 @@ fr: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'Merci d''entrer une URL ou cliquez sur Annuler' HelpChars: 'Les caractères spéciaux sont automatiquement convertis ou supprimés.' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Code d''erreur' - CODE_400: '400 - Requête incorrecte' - CODE_401: '401 - Non autorisé' - CODE_403: '403 - Interdit' - CODE_404: '404 - Non trouvé' - CODE_405: '405 - Méthode non authorisée' - CODE_406: '406 - Inacceptable' - CODE_407: '407 - Authentification de mandataire (Proxy) requise' - CODE_408: '408 - Temps d''attente d''une réponse du serveur écoulé' - CODE_409: '409 - La requête ne peut être traitée à l''état actuel' - CODE_410: '410 - La ressource est indisponible et aucune adresse de redirection n''est connue' - CODE_411: '411 - La longueur de la requête n''a pas été précisée' - CODE_412: '412 - Préconditions envoyées par la requête non-vérifiées' - CODE_413: '413 - Entité de la requête trop grande' - CODE_414: '414 - URI de la requête trop longue' - CODE_415: '415 - Type de média non géré' - CODE_416: '416 - Champs d''en-tête de requête ''range'' incorrect.' - CODE_417: '417 - Comportement attendu et défini dans l''en-tête de la requête insatisfaisable' - CODE_500: '500 - Erreur interne du serveur' - CODE_501: '501 - Fonctionnalité réclamée non supportée par le serveur' - CODE_502: '502 - Mauvaise passerelle d''accès' - CODE_503: '503 - Service indisponible' - CODE_504: '504 - Temps d''attente d''une réponse d''un serveur à un serveur intermédiaire écoulé' - CODE_505: '505 - Version HTTP non supportée' - DEFAULTERRORPAGECONTENT: '

Désolé, il semble que vous tentez d''accéder à une page qui n''existe pas.

Merci de vérifier l''URL que vous avez saisie puis d''essayer à nouveau.

' - DEFAULTERRORPAGETITLE: 'Page non trouvée' - DEFAULTSERVERERRORPAGECONTENT: '

Nous sommes désolés, un problème nous a empêché de traiter votre requête.

' - DEFAULTSERVERERRORPAGETITLE: 'Erreur du serveur' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Une page de redirection sans adresse de redirection a été créée.' HEADER: 'Cette page va rediriger les utilisateurs vers une autre page' @@ -122,9 +93,7 @@ fr: DEPENDENT_NOTE: 'Les pages suivantes dépendent de cette page. Ceci inclut les pages virtuelles, les redirections et les pages avec des liens.' DependtPageColumnLinkType: 'Type de lien' DependtPageColumnURL: URL - EDITANYONE: 'Toute personne pouvant se connecter au CMS' EDITHEADER: 'Qui peut modifier cette page?' - EDITONLYTHESE: 'Seulement ces personnes (choisir à partir de la liste)' EDITORGROUPS: 'Groupes d''édition' EDIT_ALL_DESCRIPTION: 'Editer toute la page' EDIT_ALL_HELP: 'Possibilité d''édition de toute les pages du site, peu importe les réglages de l''onglet Accès. Nécessite la permission "Access to Site Content". ' diff --git a/lang/gl_ES.yml b/lang/gl_ES.yml index dba1a817b1..58ff0075f2 100644 --- a/lang/gl_ES.yml +++ b/lang/gl_ES.yml @@ -30,12 +30,6 @@ gl_ES: NOTLOGGEDIN: 'Sen iniciar sesión' PUBLISHEDSITE: 'Sitio Publicado' VIEWPAGEIN: 'Ver a Páxina en:' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Código de erro' - DEFAULTERRORPAGECONTENT: '

Sintoo, parece que estabas tratando de acceder a unha página que non existe.

Por favor, comproba o enderezo da URL que estaba tratando de acceder e volva tentalo.

' - DEFAULTERRORPAGETITLE: 'Páxina non atopada' - DEFAULTSERVERERRORPAGECONTENT: '

Sintoo, houbo un problema coa xestión da túa petición.

' - DEFAULTSERVERERRORPAGETITLE: 'Erro Servidor' SilverStripe\CMS\Model\RedirectorPage: HEADER: 'Esta páxina redirixirá os usuarios a outra páxina' OTHERURL: 'Outra URL do sitio web' @@ -58,9 +52,7 @@ gl_ES: DEFAULTCONTACTTITLE: Contactarnos DEFAULTHOMETITLE: Inicio DependtPageColumnLinkType: 'Tipo de ligazón' - EDITANYONE: 'Ningún pode iniciar sesión no CMS' EDITHEADER: 'Quen pode editar esta páxina?' - EDITONLYTHESE: 'Só esta xente (escoller da lista)' EDITORGROUPS: 'Grupos Editor' EDIT_ALL_DESCRIPTION: 'Editar calquer páxina' Editors: 'Grupos dos Editores' diff --git a/lang/he_IL.yml b/lang/he_IL.yml index df7abbdadf..5a26f62ab7 100644 --- a/lang/he_IL.yml +++ b/lang/he_IL.yml @@ -42,35 +42,6 @@ he_IL: VIEWPAGEIN: 'צפייה בעמוד תחת:' SilverStripe\CMS\Forms\SiteTreeURLSegmentField: HelpChars: ' תווים מיוחדים מומרים אוטומטית או שהם מוסרים.' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'הודעת שגיאה' - CODE_400: '400 - בקשה שגויה' - CODE_401: '401 - אין הרשאה' - CODE_403: '403 - אין כניסה' - CODE_404: '404 - לא נמצא' - CODE_405: '405 - השיטה חסומה' - CODE_406: '406 - לא מקובל' - CODE_407: '407 - דרשו זיהוי מתווך' - CODE_408: '408 - זמן הבקשה פג' - CODE_409: '409 - התנגשות' - CODE_410: '410 - בלעה אותו האדמה' - CODE_411: '411 - נדרש אורך' - CODE_412: '412 - תנאי הקדם נכשל' - CODE_413: '413 - יישות הבקשה גדולה מדי' - CODE_414: '414 - כתובת הבקשה ארוכה מדי' - CODE_415: '415 - סוג המדיה אינו נתמך' - CODE_416: '416 - טווח הבקשה אינו מספק' - CODE_417: '417 - הציפיות כשלו' - CODE_500: '500 - שגיאת שרת פנימית' - CODE_501: '501 - לא הוטמע' - CODE_502: '502 - שער גישה שגוי' - CODE_503: '503 - השירות אינו זמין' - CODE_504: '504 - תם הזמן שהוקצב לשער הגישה' - CODE_505: '505 - גרסת ה־HTTP לא נתמכת' - DEFAULTERRORPAGECONTENT: '

מצטערים, נראה שהדף שניסית להגיע אליו אינו קיים

נא לבדוק את הכתובת המבוקשת ולנסות שנית

' - DEFAULTERRORPAGETITLE: 'הדף המבוקש לא נמצא' - DEFAULTSERVERERRORPAGECONTENT: '

אירעה תקלה בעת הטיפול בבקשתך, עמך הסליחה.

' - DEFAULTSERVERERRORPAGETITLE: 'שגיאת שרת' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'נוצר דף הפניה ללא יעד' HEADER: 'העמוד הזה יוביל משתמשים לעמוד אחר' @@ -99,9 +70,7 @@ he_IL: DEPENDENT_NOTE: 'העמודים הבאים תלויים בעמוד זה. בין אלו נכללים, עמודים וירטואליים, עמודי הפנייה ועמודים עם קישורי תוכן.' DependtPageColumnLinkType: 'סוג הקישור' DependtPageColumnURL: קישור - EDITANYONE: 'כל מי שיכול להיכנס ל־CMS' EDITHEADER: 'מי יכול לערוך עמוד זה?' - EDITONLYTHESE: 'רק האנשים האלה (יש לבחור מהרשימה)' EDITORGROUPS: 'קבוצות עורכים' EDIT_ALL_DESCRIPTION: 'עריכת עמוד כלשהו' EDIT_ALL_HELP: 'היכולת לערוך כל עמוד באתר זה, ללא תלות בהגדרות בלשונית הגישה. דורש את ההרשאה „גישה לאגף „עמודים““.' diff --git a/lang/hr.yml b/lang/hr.yml index 4e062073e1..05ffff9a10 100644 --- a/lang/hr.yml +++ b/lang/hr.yml @@ -91,15 +91,6 @@ hr: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'Molimo unesite dio URLa ili kliknite odustani' HelpChars: 'Posebni znakovi se automatski pretvaraju ili uklanjaju.' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Kod pogreške' - DEFAULTERRORPAGECONTENT: '

Nažalost, čini se kako pokušavate pristupiti stranici koja ne postoji.

Molimo provjerite jeste li upisali točan URL i pokušajte ponovo.

' - DEFAULTERRORPAGETITLE: 'Stranica nije pronađena' - DEFAULTSERVERERRORPAGECONTENT: '

Nažalost, dogodio se problem prilikom rukovanja vašim zahtjevom.

' - DEFAULTSERVERERRORPAGETITLE: 'Serverska greška' - DESCRIPTION: 'Prilagođeni sadržaj za različite slučajeve grešaka (npr. "Stranica nije pronađena")' - PLURALNAME: 'Stranice greške' - SINGULARNAME: 'Stranica greške' SilverStripe\CMS\Model\RedirectorPage: DESCRIPTION: 'Preusmjerava na internu stranicu ili vanjski URL' HASBEENSETUP: 'Stranica za preusjeravanje nema postavljenog preusmjeravanja' @@ -139,9 +130,7 @@ hr: DESCRIPTION: 'Obična sadržajna stranica' DependtPageColumnLinkType: 'Tip linka' DependtPageColumnURL: Link - EDITANYONE: 'Svi koji se mogu prijaviti u CMS' EDITHEADER: 'Tko može uređivati unutar CMSa?' - EDITONLYTHESE: 'Samo slijedeći korisnici (odaberite s popisa)' EDITORGROUPS: 'Urednička grupa' EDIT_ALL_DESCRIPTION: 'Uredi bilo koju stranicu' EDIT_ALL_HELP: 'Mogućnost uređivanja bilo koje stranice, neovisno o postavkama na Pristup tabu. Zahtjeva "Pristup na ''Stranice'' sekciju" dozvolu' diff --git a/lang/hu.yml b/lang/hu.yml index 1c9384a8b1..d24dfbd465 100644 --- a/lang/hu.yml +++ b/lang/hu.yml @@ -53,21 +53,6 @@ hu: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'Írjon be egy URL szegmenst, vagy kattitson a "mégse" feliratra' HelpChars: 'A speciális karakterek automatikusan konvertálódnak vagy törlődnek.' - SilverStripe\CMS\Model\ErrorPage: - CODE: Hibakód - CODE_400: '400 - Hibás kérés' - CODE_401: '401 - Jogosulatlan kérés' - CODE_403: '403 - Tiltott hozzáférés' - CODE_404: '404 - Az oldal nem létezik' - CODE_405: '405 - Tiltott Művelet' - CODE_406: '406 - Elfogadhatatlan művelet' - CODE_407: '407 - Proxy azonosítás szükséges' - CODE_408: '408 - Időtullépés' - CODE_409: '409 - Konfliktus' - CODE_410: '410 - Kapcsolat bontva' - CODE_411: '411 - Hossz kötelező' - DEFAULTERRORPAGETITLE: 'Az oldal nem található' - DEFAULTSERVERERRORPAGETITLE: 'Szerver hiba' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Egy átirányító oldal került létrehozásra, anélkül hogy lenne hova átirányítania.' HEADER: 'Ez az oldal egy másik oldalra fogja írányítani a felhasználókat' @@ -97,9 +82,7 @@ hu: DEFAULTHOMETITLE: Kezdőlap DependtPageColumnLinkType: 'Hivatkozás típusa' DependtPageColumnURL: Link - EDITANYONE: 'Bárki, aki be tud jelentkezni a CMS-be' EDITHEADER: 'Ki szerkesztheti ezt a CMS-ben?' - EDITONLYTHESE: 'Csak ezek az emberek (válassz a listából)' EDITORGROUPS: 'Szerkesztők csoportja' EDIT_ALL_DESCRIPTION: 'Bármely oldal szerkesztése' Editors: 'Szerkesztők csoportja' diff --git a/lang/id.yml b/lang/id.yml index 1298412ce7..6059d1b634 100644 --- a/lang/id.yml +++ b/lang/id.yml @@ -59,35 +59,6 @@ id: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'Mohon isikan URL atau klik Batal' HelpChars: 'Karakter khusus akan dikonversi secara otomatis atau dihapus.' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Kode yang salah' - CODE_400: '400 - Permintaan buruk' - CODE_401: '401 - Tidak ada otorisasi' - CODE_404: '404 - Tidak Ditemukan' - CODE_405: '405 - Metode Tidak Diperbolehkan' - CODE_406: '406 - Tidak Dapat Diterima' - CODE_407: '407 - Pembuktian diperlukan' - CODE_408: '408 - Permintaan Timeout' - CODE_409: '409 - Konflik' - CODE_410: '410 - Hilang' - CODE_411: '411 - Kepanjangan Diperlukan' - CODE_412: '412 - Prakondisi Gagal' - CODE_413: '413 - Permintaan Entity Terlalu Besar' - CODE_414: '414 - Permintaan-URI Terlalu Panjang' - CODE_416: '416 - Lingkup Permintaan Tidak Dapat Dipuaskan' - CODE_417: '417 - Expectation Gagal' - CODE_422: '422 - Entitas Tidak Terproses' - CODE_429: '429 - Terlalu Banyak Permintaan' - CODE_500: '500 - Server Internal Error' - CODE_501: '501 - Tidak Diimplementasi' - CODE_502: '502 - Gateway Buruk' - CODE_503: '503 - Servis Tidak Tersedia' - CODE_504: '504 - Masa Tunggu Terlewat' - CODE_505: '505 - Versi HTTP Tidak Didukung' - DEFAULTERRORPAGECONTENT: '

Maaf, sepertinya anda berusaha mengakses laman yang tidak ada.

Mohon periksa ejaan URL yang ingin anda akses dan coba lagi.

' - DEFAULTERRORPAGETITLE: 'Laman tidak ditemukan' - DEFAULTSERVERERRORPAGECONTENT: '

Maaf, ada masalah dalam penanganan permintaan Anda.

' - DEFAULTSERVERERRORPAGETITLE: 'Server mengalami kesalahan' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Sebuah laman pengarah telah dibuat tanpa arah yang dituju.' HEADER: 'Laman ini akan mengarahkan pengguna ke laman lain' @@ -119,9 +90,7 @@ id: DEPENDENT_NOTE: 'Laman-laman berikut ini bergantung pada laman ini. Termasuk laman virtual, laman pengarah, dan laman-laman dengan tautan konten.' DependtPageColumnLinkType: 'Jenis tautan' DependtPageColumnURL: URL - EDITANYONE: 'Siapa saja yang dapat masuk ke dalam CMS' EDITHEADER: 'Siapa yang dapat mengedit laman ini?' - EDITONLYTHESE: 'Hanya orang ini saja (pilih dari daftar)' EDITORGROUPS: 'Kelompok Editor' EDIT_ALL_DESCRIPTION: 'Edit semua laman' EDIT_ALL_HELP: 'Bolehkan mengedit semua laman pada situs, terlepas dari pengaturan Akses. Memerlukan perijinan "Akses ke bagian ''Laman''".' diff --git a/lang/is.yml b/lang/is.yml index 91c111f7a6..fdfc404588 100644 --- a/lang/is.yml +++ b/lang/is.yml @@ -6,10 +6,6 @@ is: NOTLOGGEDIN: 'Ekki innskráður' PUBLISHEDSITE: 'Birt síða' VIEWPAGEIN: 'Skoða síðu í:' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Villu númer' - DEFAULTERRORPAGECONTENT: '

Afsakið, það virðist vera að þú ert að reyna opna síðu sem er ekki til.

Vinsamlegast athugaðu hvort að slóðin sé rétt skrifuð og prófaðu aftur

' - DEFAULTERRORPAGETITLE: 'Síða fannst ekki' SilverStripe\CMS\Model\RedirectorPage: HEADER: 'Þessi síða mun áframsenda notendur á aðra síðu' OTHERURL: 'Slóð á aðra heimasíðu' @@ -31,9 +27,7 @@ is: DEFAULTABOUTTITLE: 'Um okkur' DEFAULTCONTACTTITLE: 'Hafa samband' DEFAULTHOMETITLE: Heim - EDITANYONE: 'Allir þeir sem geta innskráð sig í kerfið' EDITHEADER: 'Hver getur breytt þessu í kerfinu?' - EDITONLYTHESE: 'Aðeins þetta fólk (veldu úr listanum)' HASBROKENLINKS: 'Þessi síða inniheldur óvirkann hlekk.' HTMLEDITORTITLE: Efni INHERIT: 'Erfa frá foreldra síðu' diff --git a/lang/it.yml b/lang/it.yml index f363df63a4..c904d017e4 100644 --- a/lang/it.yml +++ b/lang/it.yml @@ -141,43 +141,6 @@ it: Edit: Modifica HelpChars: 'I caratteri speciali sono automaticamente convertiti o eliminati.' OK: OK - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Codice di errore' - CODE_400: '400 - Richiesta errata' - CODE_401: '401 - Non Autorizzato' - CODE_403: '403 - Accesso Negato' - CODE_404: '404 - Non Trovato' - CODE_405: '405 - Metodo non permesso' - CODE_406: '406 - Non accettabile' - CODE_407: '407 - Autenticazione Proxy Necessaria' - CODE_408: '408 - Timeout Richiesta' - CODE_409: '409 - Conflitto' - CODE_410: '410 - Risorsa Scomparsa' - CODE_411: '411 - Lunghezza Necessaria' - CODE_412: '412 - Prerequisito Insoddisfatto' - CODE_413: '413 - Entità Richiesta Troppo Grande' - CODE_414: '414 - URI Richiesta Troppo Lungo' - CODE_415: '415 - Tipo Media non Supportato' - CODE_416: '416 - Intervallo Richiesta non Soddisfabile' - CODE_417: '417 - Aspettativa Fallita' - CODE_422: '422 - Entità non Elaborabile' - CODE_429: '429 - Troppe Richieste' - CODE_500: '500 - Errore Interno del Server' - CODE_501: '501 - Non Implementato' - CODE_502: '502 - Gateway Errato' - CODE_503: '503 - Servizio non Disponibile' - CODE_504: '504 - Timeout Gateway' - CODE_505: '505 - Versione HTTP non Supportata' - DEFAULTERRORPAGECONTENT: '

Spiacente, sembra che tu cercassi di accedere ad una pagina che non esiste.

Controlla che l''URL a cui stavi cercando di accedere sia corretto e prova di nuovo.

' - DEFAULTERRORPAGETITLE: 'Pagina non trovata' - DEFAULTSERVERERRORPAGECONTENT: '

Spiacenti, c''è stato un problema con la gestione della tua richiesta.

' - DEFAULTSERVERERRORPAGETITLE: 'Errore server' - DESCRIPTION: 'Contenuto personalizzato per i diversi casi d''errore (per esempio "Pagina non trovata")' - PLURALNAME: 'Pagine di errore' - PLURALS: - one: 'Una Pagina di Errore' - other: '{count} Pagine di Errore' - SINGULARNAME: 'Pagina di errore' SilverStripe\CMS\Model\RedirectorPage: DESCRIPTION: 'Reinoltra ad una pagina interna o una URL esterna' HASBEENSETUP: 'Una pagina di redirezione è stata configurata nonostante non vi sia alcun indirizzo a cui farla puntare' @@ -222,9 +185,7 @@ it: DESCRIPTION: 'Pagina di contenuto generico' DependtPageColumnLinkType: 'Tipo di link' DependtPageColumnURL: URL - EDITANYONE: 'Chiunque può autenticarsi al CMS' EDITHEADER: 'Chi può modificare questa pagina?' - EDITONLYTHESE: 'Solamente queste persone (scegli dalla lista)' EDITORGROUPS: 'Gruppi di editori' EDIT_ALL_DESCRIPTION: 'Modifica qualunque pagina' EDIT_ALL_HELP: 'Possibilità di modificare qualsiasi pagina nel sito, senza tenere conto delle impostazioni nella tab Access. Richiede i permessi di "Accesso ai contenuti del sito"' diff --git a/lang/ja.yml b/lang/ja.yml index ea10c6136a..fb23038ee0 100644 --- a/lang/ja.yml +++ b/lang/ja.yml @@ -60,37 +60,6 @@ ja: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'URLのセグメントを入力または中止をクリックする' HelpChars: 特殊文字は自動的に変換されたか取り除かれました - SilverStripe\CMS\Model\ErrorPage: - CODE: エラーコード - CODE_400: '400 - 不適格な要求です' - CODE_401: '401 - 許可されていません' - CODE_403: '403 - 禁止されています' - CODE_404: '404 - 見つかりません' - CODE_405: '405 - 禁じられた方法です' - CODE_406: '406 - 許容できません' - CODE_407: '407 - プロキシ認証が必要です' - CODE_408: '408 - 応答がありません' - CODE_409: '409 - 衝突が生じています' - CODE_410: '410 - 消失しました' - CODE_411: '411 - 冗長な要求です。' - CODE_412: '412 - 前提条件がありません' - CODE_413: '413 - リクエストされたものが長すぎます' - CODE_414: '414 - リクエストされたURIが長すぎます' - CODE_415: '415 - サポートされていないメディアです' - CODE_416: '416 - リクエストの長さが満たされていません' - CODE_417: '417 - 期待には沿えませんでした' - CODE_422: '422 - 処理できないエンティティ' - CODE_429: '429 - リクエスト過多' - CODE_500: '500 - 本質的なサーバーエラーです' - CODE_501: '501 - 実施できません' - CODE_502: '502 - Gatewayとして正しくありません' - CODE_503: '503 - サービスが利用できません' - CODE_504: '504 - Gatewayが時間切れです' - CODE_505: '505 - サポートされていないHTTPのバージョンです' - DEFAULTERRORPAGECONTENT: '

申し訳ありませんが、貴方の見ようとしているページは存在しません。

貴方が見ようとしているサイトのURLの綴りがあっているのか、再度確認してください。

' - DEFAULTERRORPAGETITLE: ページが見つかりません - DEFAULTSERVERERRORPAGECONTENT: '

申し訳ございません。あなたのリクエストを処理中に問題が起きました。

' - DEFAULTSERVERERRORPAGETITLE: サーバーエラー SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: '転送URLを含むページには、転送先がない状態で設定されています。' HEADER: このページをユーザーを変更して他のページにしますか？ @@ -123,9 +92,7 @@ ja: DEPENDENT_NOTE: 以下のページでは、このページに依存します。　これには仮想ページ、リダイレクタページ、コンテンツのリンクを持つページが含まれています。 DependtPageColumnLinkType: リンクの種類 DependtPageColumnURL: URL - EDITANYONE: 誰でもCMSにログインが可能 EDITHEADER: このページを編集できる人 - EDITONLYTHESE: 'この人達だけ (リストから選択してください)' EDITORGROUPS: '編集者グループ' EDIT_ALL_DESCRIPTION: すべてのページを編集 EDIT_ALL_HELP: 'アクセスタブの設定にかかわらず、このサイト上のページを編集するには、"''ページ''セクションへのアクセス"許可が必要です。' diff --git a/lang/ko.yml b/lang/ko.yml index 1280aed989..8d69133575 100644 --- a/lang/ko.yml +++ b/lang/ko.yml @@ -56,37 +56,6 @@ ko: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'URL 세그먼트를 입력 또는 중지를 클릭' HelpChars: '특수 문자는 자동으로 변환되었는지 제거되었습니다' - SilverStripe\CMS\Model\ErrorPage: - CODE: '오류 코드' - CODE_400: '400 - 올바르지 않은 요청입니다.' - CODE_401: '401 - 허용되지 않습니다' - CODE_403: '403 - 금지되어 있습니다' - CODE_404: '404 - 찾을 수 없습니다' - CODE_405: '405 - 금지된 방법입니다' - CODE_406: '406 - 허용할 수 없습니다' - CODE_407: '407 - 프록시 인증이 필요합니다' - CODE_408: '408 - 응답이 없습니다' - CODE_409: '409 - 충돌이 발생하고 있습니다' - CODE_410: '410 - 소실되었습니다' - CODE_411: '411 - 중복 요청입니다.' - CODE_412: '412 - 전제 조건이 없습니다' - CODE_413: '413 - 요청된 것이 너무 깁니다' - CODE_414: '414 - 요청된 URI가 너무 깁니다' - CODE_415: '415 - 지원되지 않는 미디어입니다' - CODE_416: '416 - 요청의 길이가 맞지 않습니다' - CODE_417: '417 - 기대한 것이 없습니다.' - CODE_422: '422 - 처리될 수 없는 엔터티' - CODE_429: '429 - 서버에 대한 과다한 요청' - CODE_500: '500 - 내부적인 서버 오류' - CODE_501: '501 - 실시할 수 없습니다' - CODE_502: '502 - 올바르지 않은 Gateway입니다.' - CODE_503: '503 - 서비스를 사용할 수 없습니다' - CODE_504: '504 - Gateway가 만료되었습니다.' - CODE_505: '505 - 지원되지 않는 HTTP 버전입니다' - DEFAULTERRORPAGECONTENT: '

죄송하지만 보려고하는 페이지가 존재하지 않습니다.

사이트의 URL을 확인 후 다시 시도해주세요.

' - DEFAULTERRORPAGETITLE: '페이지를 찾을 수 없습니다' - DEFAULTSERVERERRORPAGECONTENT: '

죄송합니다. 귀하의 요청을 처리하는 동안 문제가 발생했습니다.

' - DEFAULTSERVERERRORPAGETITLE: '서버 오류' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: '다른곳으로 리다이렉트되지않고 리다이렉터 페이지가 설치되었습니다.' HEADER: '이 페이지는 다른 페이지로 사용자들을 이동시킵니다.' @@ -118,9 +87,7 @@ ko: DEPENDENT_NOTE: '다음 페이지들은 이 페이지에 의존합니다. 여기에는 가상 페이지 리디렉터 페이지 콘텐츠 링크가있는 페이지가 포함되어 있습니다.' DependtPageColumnLinkType: '링크 종류' DependtPageColumnURL: URL - EDITANYONE: 'CMS로 로그인하는 사용자' EDITHEADER: '누가 이 페이지를 편집할 수 있습니까?' - EDITONLYTHESE: '이사람들만 (목록에서 선택하기)' EDITORGROUPS: '편집자 그룹' EDIT_ALL_DESCRIPTION: '모든 페이지를 편집' EDIT_ALL_HELP: '액세스 탭의 설정에 관계없이 이 사이트의 페이지를 편집하려면 "''페이지''섹션에 액세스"권한이 필요합니다.' diff --git a/lang/lt.yml b/lang/lt.yml index 5be4a10483..fb00b98bfe 100644 --- a/lang/lt.yml +++ b/lang/lt.yml @@ -65,37 +65,6 @@ lt: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'Prašome įvesti URL dalį arba spauskite atšaukti' HelpChars: 'Specialūs simboliai automatiškai pakeičiami arba pašalinami.' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Klaidos kodas' - CODE_400: '400 - Bloga užklausa' - CODE_401: '401 - Leidimas neduotas' - CODE_403: '403 - Uždrausta' - CODE_404: '404 - Puslapis nerastas' - CODE_405: '405 - Neleistinas būdas' - CODE_406: '406 - Nepriimtina' - CODE_407: '407 - Reikalinga proxy autentifikacija' - CODE_408: '408 - Baigėsi užklausai skirtas laikas' - CODE_409: '409 - Konfliktas' - CODE_410: '410 - Nebėra' - CODE_411: '411 - Reikalingas ilgis' - CODE_412: '412 - Išankstinė klaida' - CODE_413: '413 - Per didelė užklausa' - CODE_414: '414 - Per ilgas URL adresas' - CODE_415: '415 - Nežinomas media tipas' - CODE_416: '416 - Netinkamos užklausimo ribos' - CODE_417: '417 - Netikėtas atsakymas' - CODE_422: '422 - Nepavyko apdoroti' - CODE_429: '429 - Viršytas užklausų limitas' - CODE_500: '500 - Vidinė serverio klaida' - CODE_501: '501 - Neįgyvendinta' - CODE_502: '502 - Bloga tinklų sąsaja' - CODE_503: '503 - Servisas nepasiekiamas' - CODE_504: '504 - Viršytas laiko limitas' - CODE_505: '505 - Nepalaikoma HTTP versija' - DEFAULTERRORPAGECONTENT: "\t\n

Atsiprašome, atrodo, kad Jūs bandėte patekti į puslapį, kuris neegzistuoja.

Prašome patikrinti URL adresą ir pabandyti dar kartą.

\n" - DEFAULTERRORPAGETITLE: 'Puslapis nerastas' - DEFAULTSERVERERRORPAGECONTENT: '

Apgailestaujame, tačiau apdorojant užklausą įvyko klaida.

' - DEFAULTSERVERERRORPAGETITLE: 'Tarnybinės stoties klaida' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Nukreipimo puslapis neturintis nukreipimo.' HEADER: 'Šis puslapis nukreips lankytojus į kitą puslapį' @@ -130,9 +99,7 @@ lt: DEPENDENT_NOTE: 'Šiam puslapiui priklauso šie puslapiai. Tai gali būti virtualūs, nukreipiantys puslapiai, bei puslapiai, rodantys kitų puslapių turinį.' DependtPageColumnLinkType: 'Nuorodos tipas' DependtPageColumnURL: 'URL adresas' - EDITANYONE: 'Bet kuris prisijungęs prie TVS' EDITHEADER: 'Kas gali redaguoti šį puslapį?' - EDITONLYTHESE: 'Tik šie žmonės (pasirinkite iš sąrašo)' EDITORGROUPS: 'Redaktorių grupės' EDIT_ALL_DESCRIPTION: 'Gali redaguoti puslapį, apeinant puslapio redagavimo teises' EDIT_ALL_HELP: 'Galimybė redaguoti bet kurį puslapį, nepriklausomai nuo "Priėjimo/Leidimų" skyriaus nustatymų. Būtinas leidimas "Prieiti prie ''Puslapių''"' diff --git a/lang/lv.yml b/lang/lv.yml index 86c3ba5637..2bf30ab1f4 100644 --- a/lang/lv.yml +++ b/lang/lv.yml @@ -9,33 +9,6 @@ lv: NOTLOGGEDIN: 'Nav pieslēdzies' PUBLISHEDSITE: 'Publicētā vietne' VIEWPAGEIN: 'Skatīt lapu:' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Kļūdas kods' - CODE_400: '400 - Nekorekts pieprasījums' - CODE_401: '401 - Neautorizēts' - CODE_403: '403 - Aizliegts' - CODE_404: '404 - Resurss nav atrasts' - CODE_405: '405 - Šī metode ir aizliegta' - CODE_406: '406 - Nav atļauts' - CODE_407: '407 - Nepieciešama slūžu servera (proxy) autentifikācija' - CODE_408: '408 - Pieprasījuma laiks beidzies' - CODE_409: '409 - Konflikts' - CODE_410: '410 - Mainīts izvietojums' - CODE_411: '411 - Nepieciešams garums' - CODE_412: '412 - Sākotnējais nosacījums nav izpildīts.' - CODE_413: '413 - Pieprasījums ir pārāk liels' - CODE_414: '414 - Pieprasītais URI ir pārāk liels' - CODE_415: '415 - Neatbalstīts datņu formāts' - CODE_416: '416 - Neatbilstoš pieprasījuma diapozons' - CODE_417: '417 - Gaidīšana nav iespējama' - CODE_500: '500 - Servera iekšēja kļūda' - CODE_501: '501 - Šī metode netiek atbalstīta' - CODE_502: '502 - Nekorekta vārteja' - CODE_503: '503 - Serviss uz laiku nav pieejams' - CODE_504: '504 - Beidzies vārtejas pieprasījuma laiks' - CODE_505: '505 - Šī HTTP protokola versija netiek atbalstīta.' - DEFAULTERRORPAGECONTENT: '

Atvainojiet, šķiet, ka lapa kurai mēģinat piekļūt neeksistē.

Lūdzu pārliecinieties par pareizrakstību URL, kuram vēlaties piekļūt400.

' - DEFAULTERRORPAGETITLE: 'Lapa nav atrasta' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Novirzītājlapa ir uzstādīta bez norādes uz kurieni novirzīt.' HEADER: 'Šī lapa novirzīs lietotājus uz citu lapu ' @@ -60,9 +33,7 @@ lv: DEFAULTHOMETITLE: Sākums DEPENDENT_NOTE: 'Sekojošās lapas ir atkarīgas no šīs lapas. Tās var būt virtuālās lapas, novirzītājlapas, un lapas, kas satur saites.' DependtPageColumnLinkType: 'Saites tips' - EDITANYONE: 'Ikviens, kurš ir pieslēdzies CMS' EDITHEADER: 'Kurš drīkst labot šo lapu?' - EDITONLYTHESE: 'Tikai šie lietotāji (izvēlieties no saraksta)' EDITORGROUPS: 'Redaktoru grupas' EDIT_ALL_DESCRIPTION: 'Labot jebkuru lapu' EDIT_ALL_HELP: 'Iespēja labot jebkuru vietnes lapu, neskatoties uz uzstādijumiem Piekļuve cilnē' diff --git a/lang/mi.yml b/lang/mi.yml index 55b0333743..e0e5259d4f 100644 --- a/lang/mi.yml +++ b/lang/mi.yml @@ -55,35 +55,6 @@ mi: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'Tāurua he Wāhanga PRO, ka pāwhiri whakakore rānei' HelpChars: 'Ka tahuri aunoatia, ka tangohia rānei ngā pūāhua motuhake' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Waehere hapa' - CODE_400: '400 - Tono Kino' - CODE_401: '401 - Tē Whakamanatia' - CODE_403: '403 - Kua Rāhuitia' - CODE_404: '404 - Kāore i Kitea' - CODE_405: '405 - Tikanga Kāore e Whakaaetia' - CODE_406: '406 - Tē Whakaaetia' - CODE_407: '407 - Ka Hiahiatia te Motuhēhē Takawaenga' - CODE_408: '408 - Wāhiki Tono' - CODE_409: '409 - Papā' - CODE_410: '410 - Kua Haere' - CODE_411: '411 - Ka Hiahiatia te Roa' - CODE_412: '412 - I Rahua te Here o Mua' - CODE_413: '413 - Rahi Rawa te Hinonga Tono' - CODE_414: '414 - Roa Rawa te PRO-tono' - CODE_415: '415 - Momo Pāpāho Tē Tautokona' - CODE_416: '416 - Kāore e Tutuki te Awhe Tono' - CODE_417: '417 - I Rahua te Tūmanakohanga' - CODE_500: '500 - Hapa Tūmau ā-Roto' - CODE_501: '501 - Kīhai i whakatinanahia' - CODE_502: '502 - Tomokanga Kino' - CODE_503: '503 - Rātonga Tē Wātea' - CODE_504: '504 - Wāhiki Tomokanga' - CODE_505: '505 - Putanga HTTP Tē Tautokona' - DEFAULTERRORPAGECONTENT: '

Aroha noa, te āhua nei e ngana ana koe ki te uru ki tētahi whārangi kāore i reira.

Tirohia te takikupu o te PRO e ngana ana ki te uru, ka whakamātau anō.

' - DEFAULTERRORPAGETITLE: 'Kāore i kitea te whārangi' - DEFAULTSERVERERRORPAGECONTENT: '

Aroha noa,kua rarua te tuku i tō tono.

' - DEFAULTSERVERERRORPAGETITLE: 'Hapa tūmau' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Kua tatū he whārangi tuku anō me te kore whai wāhi hei tuku anō.' HEADER: 'Ka tuku anō tēnei whārangi i ngā kaiwhakamahi ki whārangi kē' @@ -115,9 +86,7 @@ mi: DEPENDENT_NOTE: 'Ka whakawhirinaki ngā whārangi e whai ana ki tēnei whārangi. Kei roto nei ngā whārangi matua, ngā whārangi tuku anō me ngā whārangi whai hono ihirangi.' DependtPageColumnLinkType: 'Momo hono' DependtPageColumnURL: PRO - EDITANYONE: 'Ngā tāngata e āhei ana te takiuru ki te CMS' EDITHEADER: 'Mā wai tēnei whārangi e whakatika?' - EDITONLYTHESE: 'Ko ēnei tāngata anake (kōwhiria i te rārangi)' EDITORGROUPS: 'Ngā Rōpū Kaiwhakatika' EDIT_ALL_DESCRIPTION: 'Whakatikatia tētahi whārangi' EDIT_ALL_HELP: 'Te āhei ki te whakatika i tētahi whārangi i te pae, ahakoa ngā tautuhinga kei te ripa Uru. Ka hiahiatia te whakaaetanga o te "wāhanga Urui ki ''Ngā Whārangi''"' diff --git a/lang/ms.yml b/lang/ms.yml index d32b2a3c56..ac1dccd8b7 100644 --- a/lang/ms.yml +++ b/lang/ms.yml @@ -1,9 +1,4 @@ ms: - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Kod kesilapan' - CODE_417: '417 - kegagalan expectation' - DEFAULTERRORPAGECONTENT: '

Minta maaf, rupa-rupanya anda ingin mencapai halaman yang tidak wujud

Sila semak ejaan URL yang anda ingin mencapai dan cuba semula

' - DEFAULTERRORPAGETITLE: 'Halaman tidak wujud' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Mukasurat pengalih destinasi dihasilkan tanpa menyatakan destinasi alihan.' HEADER: 'Mukasurat ini akan mengalih pengguna ke mukasurat lain' @@ -25,9 +20,7 @@ ms: DEFAULTABOUTTITLE: 'Tentang Kami' DEFAULTCONTACTTITLE: 'Hubungi Kami' DEFAULTHOMETITLE: Utama - EDITANYONE: 'Sesiapa sahaja yang boleh mendaftar masuk ke CMS' EDITHEADER: 'Siapa yang boleh melakukan penyuntingan menggunakan CMS?' - EDITONLYTHESE: 'Hanya pengguna berikut (pilih dari senarai)' HASBROKENLINKS: 'Mukasurat ini mengandungi pautan bermasalah.' HTMLEDITORTITLE: Kandungan MENUTITLE: 'Label navigasi' diff --git a/lang/nb.yml b/lang/nb.yml index eb2c84fca7..ef6c0c69ce 100644 --- a/lang/nb.yml +++ b/lang/nb.yml @@ -65,37 +65,6 @@ nb: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'Vennligst skriv inn adressesegment eller trykk avbryt.' HelpChars: 'Spesialtegn blir automatisk konvertert eller fjernet.' - SilverStripe\CMS\Model\ErrorPage: - CODE: Feilkode - CODE_400: '400 - Ugyldig sidespørring' - CODE_401: '401 - Uautorisert' - CODE_403: '403 - Forbudt' - CODE_404: '404 - Ikke funnet' - CODE_405: '405 - Metode ikke tillat' - CODE_406: '406 - Ikke akseptabel' - CODE_407: '407 - Proxy autentisering påkrevd' - CODE_408: '408 - Sidespørring timeout' - CODE_409: '409 - Konflikt' - CODE_410: '410 - Borte' - CODE_411: '411 - Lengde påkrevd' - CODE_412: '412 - Prekondisjon feilet' - CODE_413: '413 - Spørringsenhet for stor' - CODE_414: '414 - Spørrings-URI for lang' - CODE_415: '415 - Mediatype ikke støttet' - CODE_416: '416 - Spørringsspenne kan ikke tilfredstilles' - CODE_417: '417 - Forventning feilet' - CODE_422: '422 - Enheten kan ikke prosesseres' - CODE_429: '429 - for mange sideforespørsler' - CODE_500: '500 - Intern serverfeil' - CODE_501: '501 - Ikke implementert' - CODE_502: '502 - Dårlig gateway' - CODE_503: '503 - Service ikke tilgjengelig' - CODE_504: '504 - Gateway timeout' - CODE_505: '505 - HTTP versjon ikke støttet' - DEFAULTERRORPAGECONTENT: '

Beklager, det ser ut til at du prøver å nå en side som ikke finnes.

Sjekk at du har skrevet riktig adresse og prøv på nytt.

' - DEFAULTERRORPAGETITLE: 'Siden ble ikke funnet' - DEFAULTSERVERERRORPAGECONTENT: '

Beklager, det oppstod et problem under utføringen.

' - DEFAULTSERVERERRORPAGETITLE: Serverfeil SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'En omdirigeringssside har blitt satt opp uten et mål å omdirigere til.' HEADER: 'Denne siden vil omdirigere brukere til en annen side' @@ -130,9 +99,7 @@ nb: DEPENDENT_NOTE: 'De følgende sidene avhenger av denne siden. Dette inkluderer virtuelle sider, omdirigeringssider og sider med innholdslenker.' DependtPageColumnLinkType: Lenketype DependtPageColumnURL: URL - EDITANYONE: 'Alle som kan logge inn til kontrollpanelet' EDITHEADER: 'Hvem kan redigere dette i kontrollpanelet?' - EDITONLYTHESE: 'Bare disse personene' EDITORGROUPS: Redaktørgrupper EDIT_ALL_DESCRIPTION: 'Rediger hvilken som helst side' EDIT_ALL_HELP: 'Lar deg redigere hvilken som helst side på nettstedet, uavhengig av innstillingene på adgangsfanen. Krever at du har tilgang til sideseksjonen.' diff --git a/lang/nl.yml b/lang/nl.yml index 5ebfcdd04d..af54ccb56e 100644 --- a/lang/nl.yml +++ b/lang/nl.yml @@ -1,54 +1,112 @@ nl: + SilverStripe\CMS\BatchActions\CMSBatchAction_Archive: + RESULT: '%d pagina''s verwijderd van de concept/live site en gearchiveerd' + TITLE: 'Publicatie intrekken en archiveren' + SilverStripe\CMS\BatchActions\CMSBatchAction_Publish: + PUBLISHED_PAGES: '%d pagina''s gepubliceerd, %d mislukt' + PUBLISH_PAGES: Publiceren + SilverStripe\CMS\BatchActions\CMSBatchAction_Restore: + RESTORE: Herstellen + RESTORED_PAGES: '%d pagina''s hersteld' + SilverStripe\CMS\BatchActions\CMSBatchAction_Unpublish: + UNPUBLISHED_PAGES: 'Publicatie van %d pagina''s ingetrokken' + UNPUBLISH_PAGES: 'Publicatie intrekken' SilverStripe\CMS\Controllers\CMSMain: ACCESS: 'Toegang tot het ''{title}'' gedeelte' ACCESS_HELP: 'Bevoegdheid om paginastructuur en inhoud te bekijken. Bekijk- en bewerkingstoestemmingen kunnen worden toegekend met pagina-specifieke menu''s en het aparte "Inhoudsmachtigingen".' + APPLY_FILTER: Zoeken ARCHIVE: Archief + AddNew: 'Voeg nieuwe pagina toe' + AddNewButton: Nieuw... AddPageRestriction: 'Opmerking: Sommige paginatypes zijn niet toegestaan ​​voor deze selectie' + ArchiveWarning: 'Let op: de publicatie van deze pagina wordt ingetrokken voordat hij wordt gearchiveerd.\n\nWeet u zeker dat u wilt doorgaan?' + ArchiveWarningWithCampaigns: 'Let op: de publicatie van deze pagina wordt ingetrokken en de pagina wordt automatisch uit alle campagnes verwijderd voordat hij wordt gearchiveerd.\n\nWeet u zeker dat u wilt doorgaan?' + ArchiveWarningWithChildren: 'Let op: deze pagina en alle bijbehorende subpagina''s worden van de gepubliceerde site verwijderd voordat ze worden gearchiveerd.\n\nWeet u zeker dat u wilt doorgaan?' + ArchiveWarningWithChildrenAndCampaigns: 'Let op: deze pagina en alle bijbehorende subpagina''s worden automatisch van de gepubliceerde site én uit alle campagnes verwijderd, voordat ze worden gearchiveerd.\n\nWeet u zeker dat u wilt doorgaan?' + CANT_REORGANISE: 'U hebt onvoldoende rechten om pagina''s op het topniveau te wijzigen. Uw wijziging is niet opgeslagen.' + CLEAR_FILTER: Wissen Cancel: Annuleren ChoosePageParentMode: 'Kies waar u deze pagina wilt aanmaken' ChoosePageType: 'Kies een pagina type' Create: Aanmaken DUPLICATED: '''{title}'' met succes gedupliceerd' DUPLICATEDWITHCHILDREN: '''{title}'' en onderliggende items met succes gedupliceerd' + EMAIL: E-mail + ListFiltered: 'Zoekresultaten worden getoond.' NEWPAGE: 'Nieuwe {pagetype}' PAGENOTEXISTS: 'Deze pagina bestaat niet' + PAGES: 'Pagina status' PAGETYPEANYOPT: Elke + PAGETYPEOPT: Paginatype + PLEASESAVE: 'Sla de pagina eerst op: deze pagina kon niet worden bijgewerkt, omdat hij nog niet was opgeslagen.' PUBALLCONFIRM: 'Publiceer elke pagina van de site: dit kopieert de inhoud van de concept site naar de live site' PUBALLFUN: '"Publiceer alles" functionaliteit' + PUBALLFUN2: 'Deze knop doet hetzelfde als wanneer u naar elke pagina toe zou gaan om daar op ''Publiceren'' te klikken. Gebruik deze knop wanneer er op veel pagina''s wijzigingen zijn doorgevoerd, zoals bijvoorbeeld tijdens de eerste opzet van de website.' + PUBLISHED: 'Pagina ''{title}'' is gepubliceerd.' PUBPAGES: 'Gereed: {count} pagina''s gepubliceerd' PageAdded: 'Pagina met succes aangemaakt' REMOVEDPAGE: '''{title}'' is van de gepubliceerde site verwijderd' REMOVEDPAGEFROMDRAFT: '''{title}'' is verwijderd uit de concept site' + RESTORE: 'Concept herstellen' RESTORED: '''{title}'' is met succes hersteld' + RESTORE_DESC: 'Herstel de gearchiveerde versie naar concept.' + ROLLBACK: 'Terugdraaien naar deze versie' ROLLEDBACKPUBv2: 'Teruggedraaid naar gepubliceerde versie.' ROLLEDBACKVERSIONv2: 'Teruggedraaid naar versie #{version}.' + SAVED: '''{title}'' is opgeslagen.' SAVEDRAFT: 'Concept opslaan' + SHOW_AS_LIST: 'Als lijst tonen' + TOO_MANY_PAGES: 'Te veel pagina''s' + TabContent: Inhoud + TabHistory: Historie + TabSettings: Instellingen + TreeFiltered: 'Zoekresultaten worden getoond.' + TreeFilteredClear: Wissen + UNPUBLISH_AND_ARCHIVE: 'Publicatie intrekken en achiveren' SilverStripe\CMS\Controllers\CMSPageAddController: MENUTITLE: 'Pagina toevoegen' ParentMode_child: 'Onder een andere pagina' ParentMode_top: 'Hoogste niveau' + Title: 'Pagina toevoegen' SilverStripe\CMS\Controllers\CMSPageEditController: MENUTITLE: 'Bewerk pagina' SilverStripe\CMS\Controllers\CMSPageHistoryController: + AUTHOR: Auteur COMPAREMODE: 'Vergelijken (selecteer 2)' + NOTPUBLISHED: 'Niet gepubliceerd' REVERTTOTHISVERSION: 'Deze versie terugzetten' SHOWUNPUBLISHED: 'Toon nog niet gepubliceerde versies' + UNKNOWN: Onbekend VIEW: toon VIEWINGLATEST: 'U bekijkt nu de laatste versie.' VIEWINGVERSION: 'U bekijkt nu versie {version}.' SilverStripe\CMS\Controllers\CMSPageSettingsController: MENUTITLE: 'Bewerk pagina' SilverStripe\CMS\Controllers\CMSPagesController: + FILTER: Filter MENUTITLE: 'Pagina ''s' + SilverStripe\CMS\Controllers\CMSSIteTreeFilter_PublishedPages: + Title: 'Gepubliceerde pagina''s' + SilverStripe\CMS\Controllers\CMSSiteTreeFilter_ChangedPages: + Title: 'Gewijzigde pagina''s' + SilverStripe\CMS\Controllers\CMSSiteTreeFilter_DeletedPages: + Title: 'Alle pagina''s, ook de gearchiveerde' SilverStripe\CMS\Controllers\CMSSiteTreeFilter_Search: Title: 'Alle pagina''s' + SilverStripe\CMS\Controllers\CMSSiteTreeFilter_StatusDeletedPages: + Title: 'Gearchiveerde pagina''s' + SilverStripe\CMS\Controllers\CMSSiteTreeFilter_StatusDraftPages: + Title: 'Conceptpagina''s' SilverStripe\CMS\Controllers\ContentController: ARCHIVEDSITE: 'Voorbeeld van versie bekijken' ARCHIVEDSITEFROM: 'Gearchiveerde site van' CMS: CMS DRAFT: Concept DRAFTSITE: 'Concept site' + Email: E-mail INSTALL_SUCCESS: 'Installatie voltooid!' + InstallFilesDeleted: 'De installatiebestanden zijn verwijderd.' + InstallSuccessCongratulations: 'SilverStripe is met succes geïnstalleerd!' LOGGEDINAS: 'Ingelogd als' LOGIN: Inloggen LOGOUT: Uitloggen @@ -56,26 +114,34 @@ nl: NOTLOGGEDIN: 'Niet ingelogd' PUBLISHED: Gepubliceerd PUBLISHEDSITE: 'Gepubliceerde site' + Password: Wachtwoord VIEWPAGEIN: 'Bekijk pagina in:' SilverStripe\CMS\Controllers\SilverStripeNavigator: ARCHIVED: Gearchiveerd + SilverStripe\CMS\Forms\InternalLinkFormFactory: + ANCHORVALUE: Anker + LINKDESCR: 'Omschrijving van de koppeling' + LINKOPENNEWWIN: 'Open in een nieuw venster/tab' + SELECT_PAGE: 'Selecteer een pagina' SilverStripe\CMS\Forms\SiteTreeURLSegmentField: + Cancel: Annuleren EMPTY: 'Vul een URL segment in of klik op annuleren' + Edit: Bewerken HelpChars: 'Speciale tekens worden automatische omgezet of verwijderd.' - SilverStripe\CMS\Model\ErrorPage: - CODE: Foutcode - DEFAULTERRORPAGECONTENT: '

Helaas, de pagina die u zocht lijkt niet (meer) te bestaan.

Controleer of de juiste URL is gebruikt en probeer het opnieuw.

' - DEFAULTERRORPAGETITLE: 'Pagina niet gevonden' - DEFAULTSERVERERRORPAGECONTENT: '

Helaas, er was een probleem bij het verwerken van je verzoek.

' - DEFAULTSERVERERRORPAGETITLE: 'Probleem met de server' - SINGULARNAME: Foutpagina + OK: OK SilverStripe\CMS\Model\RedirectorPage: + DESCRIPTION: 'Stuurt door naar een interne pagina of een externe URL' HASBEENSETUP: 'Er is een verwijspagina opgezet zonder ergens naar te verwijzen.' HEADER: 'Deze pagina zal gebruikers naar een andere pagina doorsturen (redirect)' OTHERURL: 'Andere website URL' + PLURALNAME: 'Verwijzingspagina''s' + PLURALS: + one: 'een verwijzingspagina' + other: '{count} verwijzingspagina''s' REDIRECTTO: 'Doorverwijzen naar' REDIRECTTOEXTERNAL: 'Een andere website' REDIRECTTOPAGE: 'Een pagina op deze website' + SINGULARNAME: Verwijzingspagina YOURPAGE: 'Pagina op deze website' SilverStripe\CMS\Model\SiteTree: ACCESSANYONE: Iedereen @@ -85,8 +151,11 @@ nl: ADDEDTODRAFTHELP: 'Pagina is nog niet gepubliceerd' ADDEDTODRAFTSHORT: Concept APPEARSVIRTUALPAGES: 'Deze inhoud verschijnt ook op de virtuele pagina''s in de {title} gedeeltes.' + ARCHIVEDPAGEHELP: 'De pagina is verwijderd van de concept- en de live site' + ARCHIVEDPAGESHORT: Gearchiveerd BUTTONCANCELDRAFT: 'Annuleer veranderingen op dit concept' BUTTONCANCELDRAFTDESC: 'Verwijder het concept en zet de gepubliceerde pagina terug' + BUTTONDELETEDESC: 'Verwijderde concept/live versie en archiveer' BUTTONPUBLISHED: Gepubliceerd BUTTONSAVED: Opgeslagen BUTTONSAVEPUBLISH: 'Opslaan & publiceren' @@ -94,16 +163,18 @@ nl: BUTTONUNPUBLISHDESC: 'Deze pagina verwijderen uit de gepubliceerde site' Comments: Commentaar Content: Inhoud + DEFAULTABOUTCONTENT: '

Je kunt deze pagina vullen met nieuwe inhoud, of hem verwijderen en nieuwe pagina''s aanmaken.

' DEFAULTABOUTTITLE: 'Over Ons' + DEFAULTCONTACTCONTENT: '

Je kunt deze pagina vullen met nieuwe inhoud, of hem verwijderen en nieuwe pagina''s aanmaken.

' DEFAULTCONTACTTITLE: Contact DEFAULTHOMETITLE: Home DEPENDENT_NOTE: 'De volgende pagina''s zijn afhankelijk van deze pagina. Hieronder vallen virtuele pagina''s, verwijzingspagina''s en pagina''s met links in hun inhoud.' + DESCRIPTION: 'Algemene pagina' DependtPageColumnLinkType: Linktype DependtPageColumnURL: URL - EDITANYONE: 'Iedereen die kan inloggen in het CMS' EDITHEADER: 'Wie kan deze pagina wijzigen?' - EDITONLYTHESE: 'Alleen deze gebruikers (kies uit de lijst)' EDITORGROUPS: Redacteursgroepen + EDITOR_GROUPS_FIELD_DESC: 'Groepen die alles mogen bewerken: {groupList}' EDIT_ALL_DESCRIPTION: 'Kan elke pagina wijzigen' EDIT_ALL_HELP: 'Bevoegdheid om alle pagina''s op de site te wijzigen, onafhankelijk van de instellingen in het ''Toegang'' tabblad. Vereist "Toegang tot site inhoud" rechten' Editors: Redacteursgroepen @@ -111,8 +182,12 @@ nl: HASBROKENLINKS: 'Deze pagina heeft verbroken links.' HTMLEDITORTITLE: Inhoud INHERIT: 'Overnemen van de bovenliggende pagina' + LASTPUBLISHED: 'Laatst gepubliceerd' + LASTSAVED: 'Laatst opgeslagen' LASTUPDATED: 'Laatst bijgewerkt' LINKCHANGENOTE: 'Het veranderen van de link van deze pagina beïnvloedt de links van alle onderliggende pagina''s. ' + LINKSALREADYUNIQUE: '{url} is al uniek' + LINKSCHANGEDTO: ' gewijzigd: {url1} -> {url2}' MENUTITLE: 'Navigatie label' METADESC: 'Meta omschrijving' METADESCHELP: 'Zoekmachines gebruiken deze inhoud voor het weergeven van zoekresultaten (hoewel het hun ranking niet zal beïnvloeden).' @@ -122,7 +197,10 @@ nl: MODIFIEDONDRAFTSHORT: Aangepast MetadataToggle: Metadata MoreOptions: 'Meer opties' + NOTPUBLISHED: 'Niet gepubliceerd' OBSOLETECLASS: 'Deze pagina is van het type {type}. Dit type is niet meer in gebruik. Het opslaan van deze pagina zal het type wijzigen. Hierbij kan data verloren gaan.' + ONLIVEONLYSHORT: 'Alleen op de live site' + ONLIVEONLYSHORTHELP: 'De pagina is gepubliceerd, maar verwijderd van de concept site' PAGELOCATION: 'Pagina locatie' PAGETITLE: 'Pagina titel' PAGETYPE: 'Pagina type' @@ -132,6 +210,10 @@ nl: PARENTTYPE_SUBPAGE: 'Subpagina onder een bovenliggende pagina' PERMISSION_GRANTACCESS_DESCRIPTION: 'Beheer toegangsrechten voor inhoud' PERMISSION_GRANTACCESS_HELP: 'Bevoegdheid om pagina specifieke toegangsrechten in de "Pagina''s" sectie te wijzigen.' + PLURALNAME: 'Pagina''s' + PLURALS: + one: 'een pagina' + other: '{count} pagina''s' PageTypNotAllowedOnRoot: 'Paginatype "{type}" is niet toegestaan op het hoogste niveau' PageTypeNotAllowed: 'Pagina type "{type}" mag niet ondergeschikt zijn aan deze bovenliggende pagina' REMOVE_INSTALL_WARNING: 'Let op: Het is veiliger om het bestand install.php uit deze SilverStripe installatie te verwijderen' @@ -139,12 +221,14 @@ nl: REORGANISE_HELP: 'Pas de volgorde van de pagina''s aan door te verslepen.' SHOWINMENUS: 'Weergeven in menu''s?' SHOWINSEARCH: 'Weergeven in zoeken?' + SINGULARNAME: Pagina TABBEHAVIOUR: Gedrag TABCONTENT: Hoofdinhoud TABDEPENDENT: 'Afhankelijke pagina''s' TOPLEVEL: 'Site inhoud (hoogste niveau)' URLSegment: 'URL segment' VIEWERGROUPS: Bekijkersgroepen + VIEWER_GROUPS_FIELD_DESC: 'Groepen die alles mogen bekijken: {groupList}' VIEW_ALL_DESCRIPTION: 'Kan iedere pagina op de website bekijken, ongeacht de specifieke pagina instelling' VIEW_ALL_HELP: 'Bevoegdheid om alle pagina''s op de site te wijzigen, onafhankelijk van de instellingen in het ''Toegang'' tabblad. Vereist "Toegang tot site inhoud" rechten' VIEW_DRAFT_CONTENT: 'Bekijk concept inhoud' @@ -158,14 +242,22 @@ nl: many_many_BackLinkTracking: 'Backlinks traceren' many_many_ImageTracking: 'Afbeeldingen traceren' many_many_LinkTracking: 'Links traceren' + SilverStripe\CMS\Model\SiteTreeFileExtension: + PAGES: 'pagina(''s)' SilverStripe\CMS\Model\VirtualPage: CHOOSE: 'Gekoppelde pagina' + DESCRIPTION: 'Toont de inhoud van een andere pagina' EditLink: wijzigen HEADER: 'Dit is een virtuele pagina' HEADERWITHLINK: 'Dit is een virtuele pagina met de inhoud van "{title}" ({link})' PLURALNAME: 'Virtuele pagina''s' + PLURALS: + one: 'een virtuele pagina' + other: '{count} virtuele pagina''s' PageTypNotAllowedOnRoot: 'Voor deze virtuele pagina is het originele paginatype "{type}" niet toegestaan op het hoogste niveau.' SINGULARNAME: 'Virtuele pagina' + SilverStripe\CMS\Reports\BrokenFilesReport: + BROKENFILES: 'Pagina met verbroken afbeeldingskoppelingen' SilverStripe\CMS\Reports\BrokenLinksReport: Any: Alles BROKENLINKS: 'Rapport van verbroken links' @@ -188,9 +280,26 @@ nl: ReasonDropdownVPBROKENLINK: 'Virtuele pagina verwijst naar niet bestaande pagina' RedirectorNonExistent: 'verwijzingspagina wijst naar niet bestaande pagina' VirtualPageNonExistent: 'virtuele pagina verwijst naar niet bestaande pagina' + SilverStripe\CMS\Reports\BrokenRedirectorPagesReport: + BROKENREDIRECTORPAGES: 'Verwijzingspagina''s die verwijzen naar naar verwijderde pagina''s' + SilverStripe\CMS\Reports\BrokenVirtualPagesReport: + BROKENVIRTUALPAGES: 'Virtuele pagina''s die verwijzen naar verwijderde pagina''s' + SilverStripe\CMS\Reports\EmptyPagesReport: + EMPTYPAGES: 'Pagina''s zonder inhoud' + SilverStripe\CMS\Reports\RecentlyEditedReport: + LAST2WEEKS: 'Pagina''s die de laatste 2 weken zijn bewerkt' SilverStripe\CMS\Search\SearchForm: FILTERDATEFROM: Van FILTERDATETO: Tot + FILTERLABELTEXT: Zoeken GO: Zoeken + PAGEFILTERDATEHEADING: 'Laatst bijgewerkt' SEARCH: Zoeken SearchResults: Zoekresultaten + SilverStripe\CMS\Tasks\RemoveOrphanedPagesTask: + BUTTONRUN: Uitvoeren + CHOOSEOPERATION: 'Kies een actie' + DELETEWARNING: 'Waarschuwing: deze acties kunnen niet ongedaan gemaakt worden. Wees hier voorzichtig mee.' + NONEREMOVED: 'Niets verwijderd' + SELECTALL: 'Alles selecteren' + UNSELECTALL: 'Alles deselecteren' diff --git a/lang/pl.yml b/lang/pl.yml index 3a8fa68b95..ccec00bb76 100644 --- a/lang/pl.yml +++ b/lang/pl.yml @@ -60,37 +60,6 @@ pl: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'Proszę podać część adresu lub kliknąć anuluj' HelpChars: 'Znaki specjalne są automatycznie konwertowane lub usuwane.' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Kod błędu' - CODE_400: '400 - Nieprawidłowe zapytanie' - CODE_401: '401 - Nieautoryzowany dostęp' - CODE_403: '403 - Zabroniony' - CODE_404: '404 - Nie znaleziono' - CODE_405: '405 - Niedozwolona metoda' - CODE_406: '406 - Niedozwolone' - CODE_407: '407 - Wymagane Uwierzytelnienie do Serwera Proxy' - CODE_408: '408 - Koniec czasu oczekiwania na żądanie' - CODE_409: '409 - Konflikt' - CODE_410: '410 - Zniknął (usunięto)' - CODE_411: '411 - Wymagana Długość' - CODE_412: '412 - Warunek wstępny nie może być spełniony' - CODE_413: '413 - Encja zapytania zbyt długa' - CODE_414: '414 - Adres URI zapytania zbyt długi' - CODE_415: '415 - Nieznany sposób żądania' - CODE_416: '416 - Zakres bajtowy podany w zapytaniu nie do obsłużenia' - CODE_417: '417 - Oczekiwana wartość nie do zwrócenia' - CODE_422: '422 - Niewłaściwe dane' - CODE_429: '429 - Zbyt wiele żądań' - CODE_500: '500 - Wewnętrzny błąd serwera' - CODE_501: '501 - Nie zaimplementowano' - CODE_502: '502 - Błąd bramy' - CODE_503: '503 - Usługa niedostępna' - CODE_504: '504 - Przekroczony czas bramy' - CODE_505: '505 - Wersja HTTP nie obsługiwana' - DEFAULTERRORPAGECONTENT: '

Niestety, próbujesz wejść na stronę, która nie istnieje.

Sprawdź pisownię adresu URL i spróbuj ponownie.

' - DEFAULTERRORPAGETITLE: 'Nie znaleziono strony' - DEFAULTSERVERERRORPAGECONTENT: '

Wystąpił problem z obsługą Twojego żądania.

' - DEFAULTSERVERERRORPAGETITLE: 'Błąd serwera' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Strona przekierowująca została ustawiona bez celu, do którego ma przekierowywać.' HEADER: 'Ta strona przeniesie użytkowników na inną stronę' @@ -123,9 +92,7 @@ pl: DEPENDENT_NOTE: 'Poniższe strony są zależne od tej (łącznie z wirtualnymi stronami, stronami przekierowującymi oraz stronami z treścią).' DependtPageColumnLinkType: 'Typ linku' DependtPageColumnURL: 'Adres internetowy' - EDITANYONE: 'Każdy to jest zalogowany w systemie CMS' EDITHEADER: 'Kto może edytować wewnątrz systemu CMS?' - EDITONLYTHESE: 'Tylko Ci ludzi (wybierz z listy)' EDITORGROUPS: 'Grupy edytujących' EDIT_ALL_DESCRIPTION: 'Edytuj jakąkolwiek stronę' EDIT_ALL_HELP: 'Możliwość edycji jakiejkolwiek strony w witrynie, bez względu na ustawienia w zakładce Dostęp. Wymaga uprawnienia "Dostęp do edycji treści"' diff --git a/lang/pt.yml b/lang/pt.yml index e97958c8d8..4fb6d9fe4a 100644 --- a/lang/pt.yml +++ b/lang/pt.yml @@ -50,32 +50,6 @@ pt: VIEWPAGEIN: 'Ver página em:' SilverStripe\CMS\Forms\SiteTreeURLSegmentField: HelpChars: 'Os caracteres especiais são automaticamente convertido ou removidos.' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Código de erro' - CODE_401: '401 - Não Autorizado' - CODE_403: '403 - Proibido' - CODE_404: '404 - Não Encontrado' - CODE_405: '405 - Método não permitido' - CODE_406: '406 - Não aceite' - CODE_407: '407 - Autenticação Proxy Necessária' - CODE_408: '408 - Excedeu o tempo de resposta' - CODE_409: '409 - Conflicto' - CODE_410: '410 - Desaparecido' - CODE_411: '411 - Tamanho necessário' - CODE_412: '412 - Falha nas pré-condições' - CODE_413: '413 - Pedido demasiado grande' - CODE_414: '414 - Pedido de URL muito longa' - CODE_415: '415 - Tipo media não suportado' - CODE_416: '416 - Pedido solicitado não satisfatório' - CODE_417: '417 - Falha de expectativa' - CODE_500: '500 - Erro de Servidor' - CODE_501: '501 - Não implementado' - CODE_503: '503 - Serviço Indisponível' - CODE_505: '505 - Versão HTTP não suportada' - DEFAULTERRORPAGECONTENT: '

A página a que tentou aceder não existe.

Verifique se não existem erros no endereço a que tentou aceder e tente novamente.

' - DEFAULTERRORPAGETITLE: 'Página não encontrada' - DEFAULTSERVERERRORPAGECONTENT: '

Desculpe, ocorreu um problema no processamento do seu pedido

' - DEFAULTSERVERERRORPAGETITLE: '500 - Erro do servidor' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Uma página de redireccionamento foi criada sem nenhum destino.' HEADER: 'Esta página irá redireccionar os utilizadores para outra página' @@ -103,9 +77,7 @@ pt: DEFAULTHOMETITLE: 'Página Principal' DEPENDENT_NOTE: 'As páginas seguintes dependem desta página. Isto inclui páginas virtuais, páginas redireccionadas e páginas com links de conteúdo.' DependtPageColumnLinkType: 'Tipo de ligação' - EDITANYONE: 'Todos que possam efectuar a autenticação no CMS' EDITHEADER: 'Quem pode editar esta página no CMS?' - EDITONLYTHESE: 'Apenas estes (selecione da lista abaixo)' EDIT_ALL_DESCRIPTION: 'Editar qualquer página' EDIT_ALL_HELP: 'Capacidade de visualizar qualquer página do site, independentemente das configurações. Requer as permissões "Acesso ao conteúdo do site"' Editors: 'Grupos de Editores' diff --git a/lang/pt_BR.yml b/lang/pt_BR.yml index 79564b7a11..f68bbb37c4 100644 --- a/lang/pt_BR.yml +++ b/lang/pt_BR.yml @@ -6,33 +6,6 @@ pt_BR: REMOVEDPAGEFROMDRAFT: 'Removido ''{title}'' do site de rascunho' SilverStripe\CMS\Controllers\CMSPagesController: MENUTITLE: Páginas - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Código do erro' - CODE_400: '400 - Requisição Invalida' - CODE_401: '401 - Não autorizado' - CODE_403: '403 - Proibido' - CODE_404: '404 - Arquivo não encontrado' - CODE_405: '405 - Método não permitido' - CODE_406: '406 - Não aceitavel' - CODE_407: '407 - Requer autentificação do proxy' - CODE_408: '408 - tempo de requisição esgotado' - CODE_409: '409 - Conflito' - CODE_410: '410 - Finalizado' - CODE_411: '411 - Tamanho requisitado' - CODE_412: '412 - Condição prévia não atendida' - CODE_413: '413 - dados requisição muito grande' - CODE_414: '414 -URI requisitado muito grande' - CODE_415: '415 - tipo de arquivo não suportado' - CODE_416: '416 - Escala do pedido não satisfaz' - CODE_417: '417 - A expectativa falhou' - CODE_500: '500 - Erro interno do servidor' - CODE_501: '501 - Não implementado' - CODE_502: '502 - Conecção ruim' - CODE_503: '503 - Serviço não esta habilitado' - CODE_504: '504 - Tempo de conecção esgorado' - CODE_505: '505 - Versão do HTTP não suporado' - DEFAULTERRORPAGECONTENT: '

desculpe, mas parece que você esta tentando acessar uma página que não existe.

Por favor, verifique se você digitou a URL corretamente e tente novamente

' - DEFAULTERRORPAGETITLE: 'Página não encontrada' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Uma página de redireccionamento foi criada sem nenhum destino específicado' HEADER: 'Esta página redireccionará os utilizadores para outra página' @@ -55,9 +28,7 @@ pt_BR: DEFAULTABOUTTITLE: 'Sobre nós' DEFAULTCONTACTTITLE: Contato DEFAULTHOMETITLE: 'Página Inicial' - EDITANYONE: 'Qualquer pessoa que possa fazer log-in' EDITHEADER: 'Quem pode editar esta página?' - EDITONLYTHESE: 'Somente estas pessoas (escolha da lista)' Editors: 'Grupo de editores' HASBROKENLINKS: 'Esta página tem links quebrados.' HTMLEDITORTITLE: Conteúdo diff --git a/lang/ro.yml b/lang/ro.yml index f2a20ec232..4cd1088cec 100644 --- a/lang/ro.yml +++ b/lang/ro.yml @@ -55,34 +55,6 @@ ro: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'Vă rugăm introduceți un Segment URL sau apăsați anulează' HelpChars: 'Caracterele speciale sunt convertite automat sau șterse' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Cod de eroare' - CODE_400: '400 - Solicitare greșită' - CODE_401: '401 - Neautorizat' - CODE_403: '403 - Interzis' - CODE_404: '404 - Negăsită' - CODE_405: '405 - Funcție nepermisă' - CODE_406: '406 - Neacceptată' - CODE_407: '407 - Autentificare Proxy Necesară' - CODE_408: '408 - Solicitare expirată' - CODE_409: '409 - Conflict' - CODE_410: '410 - Dispărut' - CODE_411: '411 - Lungime necesară' - CODE_412: '412 - Precondiție eșuată ' - CODE_413: '413 - Entitatea solicitării prea mare' - CODE_414: '414 - URI-ul solicitării prea lung' - CODE_415: '415 - Tip media nesuportat' - CODE_416: '416 - Banda solicitării neindelinită' - CODE_417: '417 - Așteptare nereușită' - CODE_500: '500 - Versiune HTTP Nesuportată' - CODE_501: '501 - Neimplementat' - CODE_502: '502 - Gateway incorect' - CODE_503: '503 - Serviciu nedisponibil' - CODE_504: '504 - Timpul de Gateway expirat' - DEFAULTERRORPAGECONTENT: '

Ne pare rău, se pare că ați încercat să accesati o pagină inexistentă.

Vă rugăm verificați scrierea corectă a URL-ului dorit și încercați din nou.

' - DEFAULTERRORPAGETITLE: 'Pagină negasită' - DEFAULTSERVERERRORPAGECONTENT: '

Ne pare rău, s-a petrecut o problemă la procesarea solicitării dumeavoastre.

' - DEFAULTSERVERERRORPAGETITLE: 'Eroare de server' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'O pagină referitoare a fost creată fără a direcționa către ceva' HEADER: 'Pagina v-a redirecționa utilizatorii către altă pagină' @@ -114,9 +86,7 @@ ro: DEPENDENT_NOTE: 'Următoarele pagini depind de această pagină. Include și pagini virtuale, pagini redirecționate, și pagini cu link-uri către conținut.' DependtPageColumnLinkType: 'Tip referintă' DependtPageColumnURL: URL - EDITANYONE: 'Oricine se poate logina pe CMS' EDITHEADER: 'Cine poate edita pagina?' - EDITONLYTHESE: 'Doar aceste persoane (selectează din listă)' EDITORGROUPS: 'Grupuri Editor' EDIT_ALL_DESCRIPTION: 'Editează orice pagină' EDIT_ALL_HELP: 'Abilitatea de a edita orice pagină din site, indiferent de setările din tabul Acces. Necesită permisiunea de "Acces la secțiunea ''Pagini''"' diff --git a/lang/ru.yml b/lang/ru.yml index fb7bd545b6..89c4917a83 100644 --- a/lang/ru.yml +++ b/lang/ru.yml @@ -135,51 +135,17 @@ ru: VIEWPAGEIN: 'Просмотреть страницу в:' SilverStripe\CMS\Controllers\SilverStripeNavigator: ARCHIVED: 'Архивные' + SilverStripe\CMS\Forms\InternalLinkFormFactory: + ANCHORVALUE: Ярлык + LINKDESCR: 'Описание ссылки' + LINKOPENNEWWIN: 'Открывать в новом окне' + SELECT_PAGE: 'Выберите страницу' SilverStripe\CMS\Forms\SiteTreeURLSegmentField: Cancel: Отмена EMPTY: 'Задайте адрес страницы или нажмите "Отмена"' Edit: 'Редактировать' HelpChars: 'Спецсимволы автоматически конвертируются или удаляются.' OK: ОК - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Код ошибки' - CODE_400: '400 - Плохой запрос' - CODE_401: '401 - Неавторизован' - CODE_403: '403 - Запрещено' - CODE_404: '404 - Не найдено' - CODE_405: '405 - Метод не поддерживается' - CODE_406: '406 - Не приемлемо' - CODE_407: '407 - Необходима авторизация прокси' - CODE_408: '408 - Время ожидания истекло' - CODE_409: '409 - Конфликт' - CODE_410: '410 - Удален' - CODE_411: '411 - Необходима длина' - CODE_412: '412 - Условие «ложно»' - CODE_413: '413 - Запрашиваемые данные слишком большие' - CODE_414: '414 - Запрашиваемый URI слишком длинный' - CODE_415: '415 - Неподдерживаемый тип данных' - CODE_416: '416 - Запрашиваемый диапазон не достижим' - CODE_417: '417 - Ожидаемое ошибочно' - CODE_422: '422 - Необрабатываемый экземпляр' - CODE_429: '429 - Слишком много запросов' - CODE_500: '500 - Внутренняя ошибка сервера' - CODE_501: '501 - Невыполнимо' - CODE_502: '502 - Плохой шлюз' - CODE_503: '503 - Сервис недоступен' - CODE_504: '504 - Шлюз не отвечает' - CODE_505: '505 - Версия HTTP не поддерживается' - DEFAULTERRORPAGECONTENT: '

Извините, страница, к которой вы пытаетесь получить доступ, не существует.

Пожалуйста, проверьте правильность написания ссылки и попытайтесь снова.

' - DEFAULTERRORPAGETITLE: 'Страница не найдена' - DEFAULTSERVERERRORPAGECONTENT: '

Не удалось обработать запрос.

' - DEFAULTSERVERERRORPAGETITLE: 'Ошибка сервера' - DESCRIPTION: 'Пользовательские страницы ошибок (например, "Страница не найдена")' - PLURALNAME: 'Страницы ошибок' - PLURALS: - one: 'Страница ошибки' - few: '{count} страницы ошибок' - many: '{count} страниц ошибок' - other: '{count} страниц ошибок' - SINGULARNAME: 'Страница ошибки' SilverStripe\CMS\Model\RedirectorPage: DESCRIPTION: 'Перенаправление на другую внутреннюю или внешнюю страницу' HASBEENSETUP: 'Страница перенаправления установлена без указания места перенаправления.' @@ -226,10 +192,9 @@ ru: DESCRIPTION: 'Обычная страница' DependtPageColumnLinkType: 'Тип ссылки' DependtPageColumnURL: URL - EDITANYONE: 'Все, у кого есть доступ к системе (CMS)' EDITHEADER: 'Кто может редактировать эту страницу?' - EDITONLYTHESE: 'Только эти пользователи (выберите из списка)' EDITORGROUPS: 'Группы редактирования' + EDITOR_GROUPS_FIELD_DESC: 'Группы с правами редактирования: {groupList}' EDIT_ALL_DESCRIPTION: 'Редактирование любой страницы' EDIT_ALL_HELP: 'Возможность редактировать любую страницу на сайте независимо от настроек во вкладке "Доступ". Необходимо право доступа к разделу "Страницы".' Editors: 'Группы редактирования' @@ -285,6 +250,7 @@ ru: TOPLEVEL: 'Содержимое сайта (верхний уровень)' URLSegment: 'Адрес страницы' VIEWERGROUPS: 'Группы чтения' + VIEWER_GROUPS_FIELD_DESC: 'Группы с правами просмотра: {groupList}' VIEW_ALL_DESCRIPTION: 'Просмотр любой страницы' VIEW_ALL_HELP: 'Возможность просматривать любую страницу на сайте независимо от настроек во вкладке "Доступ". Необходимо право доступа к разделу "Страницы".' VIEW_DRAFT_CONTENT: 'Просмотр чернового содержимого' diff --git a/lang/si.yml b/lang/si.yml index 2467d3c445..34b8d7f0d5 100644 --- a/lang/si.yml +++ b/lang/si.yml @@ -4,20 +4,6 @@ si: PUBALLCONFIRM: 'අඩවියේ ඇති සියලු පිටු, වේදිකාවට පිටපත් කර ප්රසිද්ධ කරන්න' PUBALLFUN: 'සියලු ක්රම වේද ප්රසිද්ධ කරන ලදී' REMOVEDPAGEFROMDRAFT: 'කටු අඩවියෙන් ''{title}'' මකන ලදී' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'වැරදි කේතය' - CODE_400: '400 - දුර්වල ඉල්ළීමක්' - CODE_401: '401 - බල රහිත' - CODE_403: '403 - තහනම්' - CODE_404: '404 - නොලැබුණි' - CODE_405: '405 - ඉඩ නොදෙන ක්රමයකි' - CODE_406: '406 - භාරගත නොහැක' - CODE_407: '407 - Proxy යෙහි බලය අවශ්ය වේ' - CODE_408: '408 - ඉල්ලීමේ කාලය අවසන්' - CODE_409: '409 - ගැටුමකි' - CODE_410: '410 - නැති විය' - DEFAULTERRORPAGECONTENT: '

කණගාටුයි,ඔබ නොමැති පිටුවකට යාමට උත්සාහ කරයි.

ඔබට යාමට අවශ්ය URL එකෙහි අක්ෂර පරීක්ෂා කර නැවත උත්සාහ කරන්න.

' - DEFAULTERRORPAGETITLE: 'පිටුව නොලැබුනි' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'යොමු කිරීමේ පිටුව කිසිවකට යොමු නොකරයි' HEADER: 'මෙම පිටුව පරිබෝඡකයන් වෙනත් යොමු කරයි' @@ -38,9 +24,7 @@ si: Content: 'අන්තර්ගතය' DEFAULTABOUTTITLE: 'අපි ගැන' DEFAULTCONTACTTITLE: 'අප අමතන්න' - EDITANYONE: 'CMS ඵකට ඇතුල් විය හැකි සියල්ලන්ටම' EDITHEADER: 'CMS ඵක සංස්කරනය කල හැක්කේ කාහටද?' - EDITONLYTHESE: 'මෙම අයට පමනක් (ලැයිස්තුවෙන් තෝරන්න)' HASBROKENLINKS: 'මෙම පිටුවට කැඩුනු බැදීම් ඇත' HTMLEDITORTITLE: 'අන්තර්ගතය' MENUTITLE: 'සංක්රමන ලේබලය' diff --git a/lang/sk.yml b/lang/sk.yml index 9d0d9dc5d1..204e53575c 100644 --- a/lang/sk.yml +++ b/lang/sk.yml @@ -141,40 +141,6 @@ sk: Edit: Editovať HelpChars: 'Špeciálne znaky sú automaticky zkonvertované alebo ostránené.' OK: OK - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Chybový kód' - CODE_400: '400 - Neplatná požiadavka' - CODE_401: '401 - Neautorizovaný prístup' - CODE_403: '403 - Zamietnuté' - CODE_404: '404 - Stránka nenájdená' - CODE_405: '405 - Metóda nie je povolená' - CODE_406: '406 - Neprijaté' - CODE_407: '407 - Vyžadovaná autentifikácia Proxy' - CODE_408: '408 - Čaš na požiadavku vypršal' - CODE_409: '409 - Konflikt' - CODE_410: '410 - Stránka už viac neexistuje' - CODE_411: '411 - Požadovaná dĺžka' - CODE_412: '412 - Zlyhanie podmienky' - CODE_413: '413 - Požadovaný celok je príliš veľký' - CODE_414: '414 - Požadované URI je príliš dlhé' - CODE_415: '415 - Nepodporovaný typ média' - CODE_416: '416 - Rozsah požiadavky nie je dostačujúci' - CODE_417: '417 - Zlyhanie očakávania' - CODE_422: '422 - Nespracovateľná entita' - CODE_429: '429 - Príliš veľa požiadavkov' - CODE_500: '500 - Interná chyba serveru' - CODE_501: '501 - Nie je implementované' - CODE_502: '502 - Nesprávna brána' - CODE_503: '503 - Služba je nedostupná' - CODE_504: '504 - Čas na požiadavky vypršal - Brána' - CODE_505: '505 - HTTP verzia nie je podporovaná' - DEFAULTERRORPAGECONTENT: '

Prepáčte, vyzerá to tak, že sa snažíte otvoriť stránku, ktorá neexistuje.

Skontrolujte napísanú URL, prosím.

' - DEFAULTERRORPAGETITLE: 'Stránka nenájdená' - DEFAULTSERVERERRORPAGECONTENT: '

Prepáčte, nastal problém s manipuláciou vašej požiadavky.

' - DEFAULTSERVERERRORPAGETITLE: 'Chyba servera' - DESCRIPTION: 'Vlastný obsah pre rôzne prípady chýb (napr. "Stránka nenájdená")' - PLURALNAME: 'Chybové stránky' - SINGULARNAME: 'Chybová stránka' SilverStripe\CMS\Model\RedirectorPage: DESCRIPTION: 'Presmeruje na internú stránku alebo na externé URL' HASBEENSETUP: 'Stránka na presmerovanie bola nastavená bez cieľa.' @@ -216,9 +182,7 @@ sk: DESCRIPTION: 'Obyčajná stránka s vlastným obsahom.' DependtPageColumnLinkType: 'Typ odkazu' DependtPageColumnURL: URL - EDITANYONE: 'Ktokoľvek kto sa môže prihlásiť do CMS' EDITHEADER: 'Kto môže editovať túto stránku?' - EDITONLYTHESE: 'Iba títo ľudia (vyberte zo zoznamu)' EDITORGROUPS: 'Skupiny upravovateľov' EDIT_ALL_DESCRIPTION: 'Upraviť akúkoľvek stránku' EDIT_ALL_HELP: 'Schopnosť upravovať ktorúkoľvek stránku na webe, nedbajúc na nastavenia v záložke prístupov. Vyžaduje "Prístup k ''Stránkam'' sekcia" povolenie' diff --git a/lang/sl.yml b/lang/sl.yml index c45801a57b..eb50423ec3 100644 --- a/lang/sl.yml +++ b/lang/sl.yml @@ -63,14 +63,6 @@ sl: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'Prosim vnesite URL segment ali kliknite prekliči' HelpChars: 'Posebni znaki so samodejno spremenjeni ali odstranjeni.' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Napačna koda' - DEFAULTERRORPAGECONTENT: '

Morda ste zahtevali dostop do strani, ki ne obstaja?

Za vsak slučaj preverite vpisani URL-naslov in poskusite ponovno.

' - DEFAULTERRORPAGETITLE: 'Strani ni mogoče najti' - DEFAULTSERVERERRORPAGECONTENT: '

Oprostite, pri vaši zahtevi je prišlo do težave.

' - DEFAULTSERVERERRORPAGETITLE: 'Napaka na strežniku' - PLURALNAME: 'Strani z napakami' - SINGULARNAME: 'Stran z napako' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Nastavljena preusmeritev še nima določenega cilja.' HEADER: 'Ta stran bo preusmerila uporabnike na drugo stran' @@ -104,9 +96,7 @@ sl: DEPENDENT_NOTE: 'Naslednje strani so odvisne od vsebine tukaj (vključuje navidezne strani, preusmerjevalne strani in strani s povezavami v vsebini)' DependtPageColumnLinkType: 'Tip povezave' DependtPageColumnURL: URL - EDITANYONE: 'Vsakdo, ki se prijavi v CMS-vmesnik' EDITHEADER: 'Kdo lahko ureja to stran?' - EDITONLYTHESE: 'Samo ti uporabniki (izberite jih s seznama)' EDITORGROUPS: 'Skupine urednikov' EDIT_ALL_DESCRIPTION: 'Urejanje vseh strani' EDIT_ALL_HELP: 'Možnost urejanja katerekoli strani na spletnem mestu, ne glede na nastavitve v sklopu "Dostop". Zahteva dovoljenje za dostop do vsebine spletnega mesta.' diff --git a/lang/sr.yml b/lang/sr.yml index dab4b94479..219dd9d817 100644 --- a/lang/sr.yml +++ b/lang/sr.yml @@ -55,35 +55,6 @@ sr: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'Молимо Вас да унесете сегмент URL-а или кликните на Одустани' HelpChars: 'Специјални карактери су аутоматски конвертовани или уклоњени.' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Кôд грешке' - CODE_400: '400 - Лош захтев' - CODE_401: '401 - Неауторизовано' - CODE_403: '403 - Забрањено' - CODE_404: '404 - Није пронађено' - CODE_405: '405 - Метода није дозвољена' - CODE_406: '406 - није прихватљиво' - CODE_407: '407 - Потребна идентификација проксија' - CODE_408: '408 - Захтев истекао' - CODE_409: '409 - Конфликт' - CODE_410: '410 - Удаљено' - CODE_411: '411 - Потребна дужина' - CODE_412: '412 - Неуспешан предуслов' - CODE_413: '413 - Захтевани ентитет превелик' - CODE_414: '414 - Захтевани URI је предугачак' - CODE_415: '415 - Неподржан тип медија' - CODE_416: '416 - Тражени опсег није задовољив' - CODE_417: '417 - Неуспело очекивање' - CODE_500: '500 - Интерна грешка сервера' - CODE_501: '501 - Није имплементирано' - CODE_502: '502 - Погрешан мрежни пролаз' - CODE_503: '503 - Сервис није доступан' - CODE_504: '504 - Временски истек мрежног пролаза' - CODE_505: '505 - HTTP верзија није подржана' - DEFAULTERRORPAGECONTENT: '

Извињавамо се, изгледа да покушавате да приступите страници која не постоји.

Молимо Вас проверите URL којем покушавате да приступите и покушајте поново.

' - DEFAULTERRORPAGETITLE: 'Страница није пронађена' - DEFAULTSERVERERRORPAGECONTENT: '

Извињавамо се, постоји проблем при обради Вашег захтева.

' - DEFAULTSERVERERRORPAGETITLE: 'Грешка сервера' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Страници за преусмеравање није подешено одредиште на које преусмерава.' HEADER: 'Ова страница ће преусмерити кориснике на другу страницу' @@ -115,9 +86,7 @@ sr: DEPENDENT_NOTE: 'Следеће странице зависе од ове странице. Ово подразумева витруелне странице, странице за преусмеравање и странице са линковима на садржај.' DependtPageColumnLinkType: 'Тип линка' DependtPageColumnURL: URL - EDITANYONE: 'Свако ко може да се пријави на CMS' EDITHEADER: 'Ко може да измени ову страницу?' - EDITONLYTHESE: 'Само ове особе (изаберите са листе)' EDITORGROUPS: 'Групе за измене' EDIT_ALL_DESCRIPTION: 'Измена било које странице' EDIT_ALL_HELP: 'Могућност мењања било које странице на сајту, без обзира на подешавања на картици "Приступ". Захтева дозволу за приступ одељку "Странице".' diff --git a/lang/sr_RS@latin.yml b/lang/sr_RS@latin.yml index a6cd7ca653..02ea9aa218 100644 --- a/lang/sr_RS@latin.yml +++ b/lang/sr_RS@latin.yml @@ -55,35 +55,6 @@ sr_RS@latin: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'Molimo Vas da unesete segment URL-a ili kliknete na Odustani' HelpChars: 'Specijalni karakteri su automatski konvertovani ili uklonjeni.' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Kôd greške' - CODE_400: '400 - Loš zahtev' - CODE_401: '401 - Neautorizovano' - CODE_403: '403 - Zabranjeno' - CODE_404: '404 - Nije pronađeno' - CODE_405: '405 - Metoda nije dozvoljena' - CODE_406: '406 - Nije prihvatljivo' - CODE_407: '407 - Potrebna identifikacija proksija' - CODE_408: '408 - Zahtev istekao' - CODE_409: '409 - Konflikt' - CODE_410: '410 - Udaljeno' - CODE_411: '411 - Potrebna dužina' - CODE_412: '412 - Neuspešan preduslov' - CODE_413: '413 - Zahtevani entitet prevelik' - CODE_414: '414 - Zahtevani URI predugačak' - CODE_415: '415 - Nepodržan tip medija' - CODE_416: '416 - Traženi opseg nije zadovoljiv' - CODE_417: '417 - Neuspelo očekivanje' - CODE_500: '500 - Interna greška servera' - CODE_501: '501 - Nije implementirano' - CODE_502: '502 - Pogrešan mrežni prolaz' - CODE_503: '503 - Servis nije dostupan' - CODE_504: '504 - Vremenski istek mrežnog prolaza' - CODE_505: '505 - HTTP verzija nije podržana' - DEFAULTERRORPAGECONTENT: '

Izvinjavamo se, izgleda da pokušavate da pristupite stranici koja ne postoji.

Molimo Vas proverite URL kojem pokušavate da pristupite i pokušajte ponovo.

' - DEFAULTERRORPAGETITLE: 'Stranica nije pronađena' - DEFAULTSERVERERRORPAGECONTENT: '

Izvinjavamo se, postoji problem pri obradi Vašeg zahteva.

' - DEFAULTSERVERERRORPAGETITLE: 'Greška servera' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Stranici za preusmeravanje nije podešeno odredište na koje preusmerava.' HEADER: 'Ova stranica će preusmeriti korisnike na drugu stranicu' @@ -115,9 +86,7 @@ sr_RS@latin: DEPENDENT_NOTE: 'Sledeće stranice zavise od ove stranice. Ovo podrazumeva vitruelne stranice, stranice za preusmeravanje i stranice sa linkovima na sadržaj.' DependtPageColumnLinkType: 'Tip linka' DependtPageColumnURL: URL - EDITANYONE: 'Svako ko može da se prijavi na CMS' EDITHEADER: 'Ko može da izmeni ovu stranicu?' - EDITONLYTHESE: 'Samo ove osobe (izaberite sa liste)' EDITORGROUPS: 'Grupe za izmene' EDIT_ALL_DESCRIPTION: 'Izmena bilo koje stranice' EDIT_ALL_HELP: 'Mogućnost menjanja bilo koje stranice na sajtu, bez obzira na podešavanja na kartici "Pristup". Zahteva dozvolu za pristup odeljku "Stranice".' diff --git a/lang/sv.yml b/lang/sv.yml index d3df25d0bf..c94a57659e 100644 --- a/lang/sv.yml +++ b/lang/sv.yml @@ -89,15 +89,6 @@ sv: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: 'Ange ett URL-segment eller klicka på avbryt' HelpChars: 'Specialtecken konverteras eller tas bort' - SilverStripe\CMS\Model\ErrorPage: - CODE: Felkod - DEFAULTERRORPAGECONTENT: '

Det verkar som om du försökter komma åt en sida som inte finns.

Var god kontrollera stavningen på adressen som du försökte nå och försök igen.' - DEFAULTERRORPAGETITLE: 'Sidan hittades inte' - DEFAULTSERVERERRORPAGECONTENT: '

Ursäkta, ett fel uppstod vid hanteringen av din förfrågan.

' - DEFAULTSERVERERRORPAGETITLE: Serverfel - DESCRIPTION: 'Anpassat innehåll för olika felärenden (t.ex. "Sidan kan inte hittas")' - PLURALNAME: Felsidor - SINGULARNAME: Felsida SilverStripe\CMS\Model\RedirectorPage: DESCRIPTION: 'Omdirigerar till en annan intern eller extern sida' HASBEENSETUP: 'En omdirigeringssida har skapats utan att ha något mål.' @@ -139,9 +130,7 @@ sv: DESCRIPTION: 'Generisk innehållssida' DependtPageColumnLinkType: Länktyp DependtPageColumnURL: URL - EDITANYONE: 'Alla som kan logga in' EDITHEADER: 'Vem kan redigera den här sidan?' - EDITONLYTHESE: 'Bara de här (välj från listan)' EDITORGROUPS: Redaktörsgrupper EDIT_ALL_DESCRIPTION: 'Redigera alla sidor' EDIT_ALL_HELP: 'Möjlighet att redigera alla sidor på sajten, oavsett inställningarna under Åtkomstfliken. Kräver "Tillgång till ''Sidor''-delen"' diff --git a/lang/th.yml b/lang/th.yml index 9d9dce317f..efaf17f1ce 100644 --- a/lang/th.yml +++ b/lang/th.yml @@ -40,35 +40,6 @@ th: VIEWPAGEIN: 'เปิดดูหน้าเว็บใน:' SilverStripe\CMS\Forms\SiteTreeURLSegmentField: HelpChars: ตัวอักษรพิเศษได้ถูกแปลงค่าหรือลบออกโดยอัตโนมัติแล้ว - SilverStripe\CMS\Model\ErrorPage: - CODE: รหัสข้อผิดพลาด - CODE_400: '400 - ข้อความร้องขอที่ส่งมามีความผิดพลาดทางไวยากรณ์ หรือไม่สามารถทำตามการร้องขอนั้นได้' - CODE_401: '401 - ไม่สามารถยืนยันตัวบุคคลได้' - CODE_403: '403 - ไม่สามารถดำเนินการตามที่ร้องขอได้' - CODE_404: '404 - ไม่พบทรัพยากรที่ร้องขอบนเครื่องแม่ข่าย' - CODE_405: '405 - ไม่อนุญาตให้ใช้รูปแบบวิธีการดังกล่าวได้' - CODE_406: '406 - ไม่สามารถยอมรับให้ดำเนินการตามที่ร้องขอได้' - CODE_407: '407 - จำเป็นต้องมีการพิสูจน์ตัวจริงบนพร็อกซีก่อน' - CODE_408: '408 - เครื่องให้บริการรอรับข้อความร้องขอจนหมดเวลา' - CODE_409: '409 - การร้องขอนั้นไม่สามารถประมวลผลได้ เนื่องจากเกิดข้อขัดแย้งในข้อความร้องขอ' - CODE_410: '410 - ทรัพยากรที่ร้องขอไม่มีอยู่ และจะไม่กลับมามีอีกต่อไป' - CODE_411: '411 - ข้อความร้องขอไม่ได้ระบุขนาดของเนื้อหามาในส่วนหัว ' - CODE_412: '412 - เครื่องแม่ข่ายไม่สามารถทำตามเงื่อนไขอย่างใดอย่างหนึ่งที่ให้ไว้โดยผู้ทำการร้องขอได้' - CODE_413: '413 - ทรัพยากรที่ร้องขอใหญ่เกินกว่าที่จะส่งด้วยโพรโทคอลปัจจุบันได้' - CODE_414: '414 - ตัวระบุแหล่งทรัพยากรสากลยาวเกินกว่าที่เครื่องให้บริการจะประมวลผล' - CODE_415: '415 - ข้อความร้องขอไม่ได้ระบุแบบชนิดสื่ออินเทอร์เน็ตที่เครื่องแม่ข่ายหรือทรัพยากรนั้นรองรับ' - CODE_416: '416 - เครื่องลูกข่ายร้องขอเนื้อหาบางส่วนของไฟล์ แต่เครื่องแม่ข่ายไม่สามารถจัดหาช่วงข้อมูลนั้นได้ ' - CODE_417: '417 - ส่วนหัว Expect ที่ส่งมาจากเครื่องลูกข่าย ยังไม่เพียงพอต่อความต้องการของเครื่องให้บริการ' - CODE_500: '500 - พบข้อผิดพลาดภายในเซิร์ฟเวอร์' - CODE_501: '501 - ยังไม่ได้ดำเนินการ' - CODE_502: '502 - เครื่องแม่ข่ายกำลังทำหน้าที่เป็นเกตเวย์หรือพร็อกซี และได้รับข้อความตอบรับที่ผิดพลาดจากเครื่องให้บริการเบื้องหลัง' - CODE_503: '503 - เครื่องแม่ข่ายยังไม่ให้บริการในปัจจุบัน ' - CODE_504: '504 - หมดเวลารอรับข้อมูลจากเครื่องแม่ข่ายที่กำลังทำหน้าที่เป็นเกตเวย์หรือพร็อกซี่' - CODE_505: '505 - เครื่องแม่ข่ายไม่รองรับรุ่นของเอชทีทีพีที่ใช้ในข้อความร้องขอ' - DEFAULTERRORPAGECONTENT: '

ขออภัย, แต่คุณดูเหมือนกำลังพยายามที่จะเข้าถึงหน้าเว็บที่ไม่มีอยู่ในระบบ.

กรุณาตรวจสอบการสะกดคำของ URL ของหน้าเว็บที่คุณพยายามจะเข้าถึงแล้วลองใหม่อีกครั้ง.

' - DEFAULTERRORPAGETITLE: ไม่พบหน้าที่ต้องการ - DEFAULTSERVERERRORPAGECONTENT: '

ขออภัย, เกิดข้อผิดพลาดบางประการในการจัดการตามคำร้องขอของคุณ

' - DEFAULTSERVERERRORPAGETITLE: เซิร์ฟเวอร์เกิดข้อผิดพลาด SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: หน้าเว็บที่มีการเปลี่ยนเส้นทางซึ่งได้รับการตั้งค่าโดยปราศจากตำแหน่งปลายทางที่ต้องการเปลี่ยนเส้นทางไป HEADER: หน้าเว็บนี้จะเปลี่ยนเส้นทางผู้ใช้งานไปยังหน้าเว็บอื่นๆ @@ -96,9 +67,7 @@ th: DEFAULTHOMETITLE: หน้าแรก DEPENDENT_NOTE: 'หน้าเว็บต่อไปนี้อาศัยหน้าเว็บนี้เป็นตัวอ้างอิง ซึ่งได้แก่หน้าเว็บจำลอง, หน้าเว็บที่เปลี่ยนเส้นทาง, และหน้าเว็บที่มีลิงก์เนื้อหาอยู่ด้วย' DependtPageColumnLinkType: ชนิดของลิงค์ - EDITANYONE: 'ทุกคนสามารถเข้าสู่ระบบของ CMS ได้ทั้งหมด' EDITHEADER: 'ใครสามารถแก้ไขหน้านี้ได้บ้าง?' - EDITONLYTHESE: 'เฉพาะบุคคลเหล่านี้เท่านั้น (เลือกจากรายการ)' EDITORGROUPS: กลุ่มของบรรณาธิการ EDIT_ALL_DESCRIPTION: แก้ไขหน้าเว็บใดก็ได้ EDIT_ALL_HELP: 'ความสามารถในการแก้ไขหน้าเว็บใดๆในเว็บไซต์, โดยไม่ต้องคำนึงถึงการตั้งค่าที่อยู่ในส่วนของแท็บการเข้าถึง, จำเป็นต้องได้รับสิทธิ์อนุญาติ "เข้าถึงส่วนของ''หน้าเว็บ''"' diff --git a/lang/tr.yml b/lang/tr.yml index f789a8f86f..a347daf60d 100644 --- a/lang/tr.yml +++ b/lang/tr.yml @@ -16,33 +16,6 @@ tr: INSTALL_SUCCESS: 'Kurulum Başarılı!' LOGOUT: 'Çıkış Yap' NOTEWONTBESHOWN: 'Not: Bu mesaj ziyaretçilerinize gösterilmeyecektir.' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Hata kodu' - CODE_400: '400 - Hatalı İstek' - CODE_401: '401 - Erişim Engellenmiş' - CODE_403: '403 - Yasak' - CODE_404: '404 - Bulunamadı' - CODE_405: '405 - Bilinmeyen Metod' - CODE_406: '406 - İstemciye Uygun Cevap Bulunamadı' - CODE_407: '407 - Yetkili Sunucu Erişim Hatası' - CODE_408: '408 - İstek Zaman Aşımı Hatası' - CODE_409: '409 - Çakışma' - CODE_410: '410 - En Saçma HTTP Hatası' - CODE_411: '411 - Uzunluk Belirtilmemiş' - CODE_412: '412 - Önşart Hatası' - CODE_413: '413 - İstek Çok Büyük' - CODE_414: '414 - İstek-URI Çok Uzun' - CODE_415: '415 - Desteklenmeyen Medya Tipi' - CODE_416: '416 - İstek Aralığı Tatmin Edici Değil' - CODE_417: '417 - Beklenti Hatası' - CODE_500: '500 - Dahili Sunucu Hatası' - CODE_501: '501 - Uygulanmamış' - CODE_502: '502 - Hatalı Arayapı' - CODE_503: '503 - Servis Mevcut Değil' - CODE_504: '504 - Arayapı Zaman Aşımı' - CODE_505: '505 - HTTP Versiyonu Desteklenmiyor' - DEFAULTERRORPAGECONTENT: '

Varolmayan bir sayfaya ulaşmaya çalışıyorsunuz.

Lütfen ulaşmak istediğiniz URL''i kontrol edip tekrar deneyiniz.

' - DEFAULTERRORPAGETITLE: 'Sayfa bulunamadı' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Yönlendirilecek yeri olmayan bir yönlendirme sayfası ayarlandı.' HEADER: 'Bu sayfa, kullanıcıları başka bir sayfaya yönlendirir' @@ -67,9 +40,7 @@ tr: DEFAULTCONTACTTITLE: İletişim DEFAULTHOMETITLE: Anasayfa DependtPageColumnLinkType: 'Link tipi' - EDITANYONE: 'CMS''e giriş yapabilen herkes' EDITHEADER: 'Bu sayfayı kimler düzenleyebilir?' - EDITONLYTHESE: 'Sadece bu kişiler (listeden seçiniz)' Editors: 'Editör Grupları' HASBROKENLINKS: 'Bu sayfada hatalı linkler var.' HTMLEDITORTITLE: İçerik diff --git a/lang/uk.yml b/lang/uk.yml index 1be15540d8..81335b954b 100644 --- a/lang/uk.yml +++ b/lang/uk.yml @@ -35,12 +35,6 @@ uk: VIEWPAGEIN: 'Переглянути сторінку в:' SilverStripe\CMS\Forms\SiteTreeURLSegmentField: HelpChars: 'Спеціальні символи автоматично перетворені або видалені.' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Код помилки' - DEFAULTERRORPAGECONTENT: '

Вибачте, але такої сторінки не існує.

Перевірте, будь-ласка, правильність URL та спробуйте ще раз.

' - DEFAULTERRORPAGETITLE: 'Сторінку не знайдено' - DEFAULTSERVERERRORPAGECONTENT: '

Вибачте, під час опрацювання вашого запиту сталася помилка.

' - DEFAULTSERVERERRORPAGETITLE: 'Помилка сервера' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Сторінка перенаправлення була встановлена без указання цілі перенаправлення' HEADER: 'Ця сторінка перенаправляє користувачів на іншу сторінку' @@ -68,9 +62,7 @@ uk: DEFAULTHOMETITLE: Домівка DEPENDENT_NOTE: 'Наступні сторінки залежать від цієї сторінки. Вони включають віртуальні сторінки, сторінки переадресації і сторінки з посиланням у змісті' DependtPageColumnLinkType: 'Тип посилання' - EDITANYONE: 'Будь-хто, хто може увійти до системи' EDITHEADER: 'Хто може змінювати цю сторінку?' - EDITONLYTHESE: 'Тільки ці люди (виберіть зі списку)' EDITORGROUPS: 'Групи редакторів' EDIT_ALL_DESCRIPTION: 'Редагувати будь-яку сторінку' EDIT_ALL_HELP: 'Можливість редагувати будь-яку сторінку сайту, незалежно від налаштувань на вкладці Доступ. Потрібен дозвіл "Доступ до розділу "Сторінки "' diff --git a/lang/vi_VN.yml b/lang/vi_VN.yml index 6ba27304bb..710854d4dd 100644 --- a/lang/vi_VN.yml +++ b/lang/vi_VN.yml @@ -1,10 +1,6 @@ vi_VN: SilverStripe\CMS\Controllers\CMSMain: PAGENOTEXISTS: 'Không tìm thấy trang này.' - SilverStripe\CMS\Model\ErrorPage: - CODE: 'Mã lỗi' - DEFAULTERRORPAGECONTENT: '

Bạn truy cập vào một trang không tồn tại

Xin vui lòng kiểm tra lại đường dẩn hoặc quay lại trang chủ

' - DEFAULTERRORPAGETITLE: 'Không tìm thấy' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 'Một trang di chuyển chưa cấu hình đích di chuyển đến.' HEADER: 'Trang này sẽ di chuyển người dùng đến một trang khác' @@ -25,9 +21,7 @@ vi_VN: DEFAULTABOUTTITLE: 'Giới thiệu' DEFAULTCONTACTTITLE: 'Liên hệ' DEFAULTHOMETITLE: 'Trang chủ' - EDITANYONE: 'Bất cứ ai có thể đăng nhập vào phần quản lý' EDITHEADER: 'Ai có thể thay đổi trang này ?' - EDITONLYTHESE: 'Chỉ những người sau đây (chọn từ danh sách)' HASBROKENLINKS: 'Trang này có liên kết hỏng.' HTMLEDITORTITLE: 'Nội dung' MENUTITLE: Nhãn diff --git a/lang/zh.yml b/lang/zh.yml index f374c6fb95..78afefa9cb 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -55,35 +55,6 @@ zh: SilverStripe\CMS\Forms\SiteTreeURLSegmentField: EMPTY: '请输入一个URL分类或点击“取消”' HelpChars: '特殊字符已自动转换或删除。' - SilverStripe\CMS\Model\ErrorPage: - CODE: '错误代码' - CODE_400: '400 - 错误请求' - CODE_401: '401 - 未授权' - CODE_403: '403 - 禁止' - CODE_404: '404 - 未找到' - CODE_405: '405 - 不允许使用该方法' - CODE_406: '406 - 不接受' - CODE_407: '407 - 要求代理身份验证' - CODE_408: '408 - 请求超时' - CODE_409: '409 - 冲突' - CODE_410: '410 - 已失效' - CODE_411: '411 - 需要内容长度' - CODE_412: '412 - 前提条件失败' - CODE_413: '413 - 请求实体太大' - CODE_414: '414 - 请求的URI太长' - CODE_415: '415 - 不支持的媒体类型' - CODE_416: '416 - 请求的范围无法满足' - CODE_417: '417 - 预期失败' - CODE_500: '500 - 服务器内部错误' - CODE_501: '501 - 未实现' - CODE_502: '502 - 网关错误' - CODE_503: '503 - 服务不可用' - CODE_504: '504 - 网关超时' - CODE_505: '505 - HTTP版本不支持' - DEFAULTERRORPAGECONTENT: '

对不起，您正在尝试访问不存在的页面。

请检查您想要访问的URL的拼写并再试一次。

' - DEFAULTERRORPAGETITLE: 未发现页面 - DEFAULTSERVERERRORPAGECONTENT: '

对不起，处理您的请求时发生错误。

' - DEFAULTSERVERERRORPAGETITLE: 服务器错误 SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: '建立了一个没有任何跳转目标的重定向页。' HEADER: 该页面将会使用户转向另外一个页面 @@ -115,9 +86,7 @@ zh: DEPENDENT_NOTE: '以下页面依赖该页。包括虚拟页面，重定向页，以及有内容链接的页面。' DependtPageColumnLinkType: 链接类型 DependtPageColumnURL: URL - EDITANYONE: '任何人都可以登录到内容管理系统' EDITHEADER: 谁可以修改该页面？ - EDITONLYTHESE: '仅这些人（从列表中选择）' EDITORGROUPS: 编辑分组 EDIT_ALL_DESCRIPTION: 编辑任何页面 EDIT_ALL_HELP: 可以编辑站点上的任何页面，忽略“访问”选项卡上的设置。需要“访问’页面‘部分”权限 diff --git a/lang/zh_CN.yml b/lang/zh_CN.yml index 9a57bc0cd4..d0278c9f34 100644 --- a/lang/zh_CN.yml +++ b/lang/zh_CN.yml @@ -4,8 +4,6 @@ zh_CN: PUBALLCONFIRM: '请发布该站的每一网页，这样，预备发布站上的内容就会复制到正式发布站上' PUBALLFUN: '“全部发布“功能' REMOVEDPAGEFROMDRAFT: '已从测试站点删除 ''{title}''' - SilverStripe\CMS\Model\ErrorPage: - CODE: '错误代码' SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: 重导网页被生成，却没有什么地方由它来重导。 HEADER: 该页会将用户重新导向另一网页 @@ -24,9 +22,7 @@ zh_CN: BUTTONUNPUBLISH: 撤消发布 BUTTONUNPUBLISHDESC: '将此页从正式发布站删除' DEFAULTABOUTTITLE: '关于我们' - EDITANYONE: 任何可以登录CMS的人 EDITHEADER: 谁能在CMS中编辑此页？ - EDITONLYTHESE: '只有这些人（请从下列清单中选择）' HASBROKENLINKS: 该页有失效链接。 HTMLEDITORTITLE: '内容' INHERIT: 从父页面继承 diff --git a/lang/zh_TW.yml b/lang/zh_TW.yml index b5a24b85df..472c8a632a 100644 --- a/lang/zh_TW.yml +++ b/lang/zh_TW.yml @@ -14,12 +14,6 @@ zh_TW: Title: '所有網頁' SilverStripe\CMS\Controllers\ContentController: NOTEWONTBESHOWN: '備註: 此訊息將不會顯示給您的訪客看' - SilverStripe\CMS\Model\ErrorPage: - CODE: 錯誤代碼 - DEFAULTERRORPAGECONTENT: '

抱歉, 看來您正再嘗試存取一個不存在的網頁

請檢查您正在嘗試存取網址的拼寫並再試一次.

' - DEFAULTERRORPAGETITLE: '未發現網頁' - DEFAULTSERVERERRORPAGECONTENT: '

抱歉, 處裡您的要求發生一個問題

' - DEFAULTSERVERERRORPAGETITLE: 伺服器錯誤 SilverStripe\CMS\Model\RedirectorPage: HASBEENSETUP: '沒有任何地方被重新導向的一個重新導向網頁已被設定.' HEADER: '本網頁將重新導向用戶至別的網頁' @@ -45,9 +39,7 @@ zh_TW: DEPENDENT_NOTE: '以下的網頁是依附在本網頁的. 這包含了虛擬網頁, 重新導向網頁, 以及有內容鏈結的網頁.' DependtPageColumnLinkType: 鏈結類型 DependtPageColumnURL: 網址 - EDITANYONE: '所有可以登入CMS的人' EDITHEADER: '誰可以編輯這頁？' - EDITONLYTHESE: '只有這些人(從清單選擇)' EDITORGROUPS: '編輯者群組' EDIT_ALL_DESCRIPTION: '編輯任何網頁' EDIT_ALL_HELP: '不管在存取Tab上的設定值, 在網站上有能力去編輯任何網頁. 需要 "到''網頁''部分的存取"許可' From 2c54e33106ae1dfa2eb4d873769c2f17edd406ff Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Wed, 9 Aug 2017 10:56:08 +1200 Subject: [PATCH 07/11] API Virtual pages now respect cascade_deletes on source page --- code/Model/SiteTree.php | 6 +- code/Model/VirtualPage.php | 2 +- tests/model/SiteTreeBrokenLinksTest.php | 100 ++++++++++-------------- tests/model/VirtualPageTest.php | 97 +++++++---------------- 4 files changed, 74 insertions(+), 131 deletions(-) diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php index 754899f4f8..18da07a96b 100755 --- a/code/Model/SiteTree.php +++ b/code/Model/SiteTree.php @@ -193,13 +193,17 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi ); private static $has_many = array( - "VirtualPages" => "SilverStripe\\CMS\\Model\\VirtualPage.CopyContentFrom" + "VirtualPages" => VirtualPage::class . '.CopyContentFrom' ); private static $owned_by = array( "VirtualPages" ); + private static $cascade_deletes = [ + 'VirtualPages', + ]; + private static $casting = array( "Breadcrumbs" => "HTMLFragment", "LastEdited" => "Datetime", diff --git a/code/Model/VirtualPage.php b/code/Model/VirtualPage.php index fc47d9299b..2154610ee0 100644 --- a/code/Model/VirtualPage.php +++ b/code/Model/VirtualPage.php @@ -66,7 +66,7 @@ class VirtualPage extends Page ); private static $has_one = array( - "CopyContentFrom" => "SilverStripe\\CMS\\Model\\SiteTree", + "CopyContentFrom" => SiteTree::class, ); private static $owns = array( diff --git a/tests/model/SiteTreeBrokenLinksTest.php b/tests/model/SiteTreeBrokenLinksTest.php index 6e12d46cc0..179b3a92ef 100644 --- a/tests/model/SiteTreeBrokenLinksTest.php +++ b/tests/model/SiteTreeBrokenLinksTest.php @@ -37,6 +37,7 @@ public function tearDown() public function testBrokenLinksBetweenPages() { + /** @var Page $obj */ $obj = $this->objFromFixture('Page', 'content'); $obj->Content = 'this is a broken link'; @@ -50,6 +51,7 @@ public function testBrokenLinksBetweenPages() public function testBrokenAnchorBetweenPages() { + /** @var Page $obj */ $obj = $this->objFromFixture('Page', 'content'); $target = $this->objFromFixture('Page', 'about'); @@ -141,7 +143,6 @@ public function testDeletingMarksBackLinkedPagesAsBroken() $this->assertEquals(0, (int)$linkSrc->HasBrokenLink); // Delete page from draft - $linkDestID = $linkDest->ID; $linkDest->delete(); // Confirm draft has broken link @@ -156,10 +157,12 @@ public function testPublishingSourceBeforeDestHasBrokenLink() $this->logInWithPermission('ADMIN'); // Set up two draft pages with a link from content -> about + /** @var Page $linkDest */ $linkDest = $this->objFromFixture('Page', 'about'); // Ensure that it's not on the published site $linkDest->doUnpublish(); + /** @var Page $linkSrc */ $linkSrc = $this->objFromFixture('Page', 'content'); $linkSrc->Content = "

ID]\">about us

"; $linkSrc->write(); @@ -191,11 +194,6 @@ public function testRestoreFixesBrokenLinks() $p2->write(); $this->assertTrue($p2->publishRecursive()); - // Virtual pages are another - $vp = new VirtualPage(); - $vp->CopyContentFromID = $p->ID; - $vp->write(); - // Redirector links are a third $rp = new RedirectorPage(); $rp->Title = "redirector"; @@ -206,7 +204,6 @@ public function testRestoreFixesBrokenLinks() // Confirm that there are no broken links to begin with $this->assertFalse($p2->HasBrokenLink); - $this->assertFalse($vp->HasBrokenLink); $this->assertFalse($rp->HasBrokenLink); // Unpublishing doesn't affect broken state on live (draft is source of truth) @@ -218,14 +215,11 @@ public function testRestoreFixesBrokenLinks() // Delete the source page, confirm that the VP, RP and page 2 have broken links on draft $p->delete(); - $vp->flushCache(); - $vp = DataObject::get_by_id(SiteTree::class, $vp->ID); $p2->flushCache(); $p2 = DataObject::get_by_id(SiteTree::class, $p2->ID); $rp->flushCache(); $rp = DataObject::get_by_id(SiteTree::class, $rp->ID); $this->assertEquals(1, $p2->HasBrokenLink); - $this->assertEquals(1, $vp->HasBrokenLink); $this->assertEquals(1, $rp->HasBrokenLink); // Restore the page to stage, confirm that this fixes the links @@ -235,12 +229,9 @@ public function testRestoreFixesBrokenLinks() $p2->flushCache(); $p2 = DataObject::get_by_id(SiteTree::class, $p2->ID); - $vp->flushCache(); - $vp = DataObject::get_by_id(SiteTree::class, $vp->ID); $rp->flushCache(); $rp = DataObject::get_by_id(SiteTree::class, $rp->ID); $this->assertFalse((bool)$p2->HasBrokenLink); - $this->assertFalse((bool)$vp->HasBrokenLink); $this->assertFalse((bool)$rp->HasBrokenLink); // Publish and confirm that the p2 and RP broken links are fixed on published @@ -254,68 +245,57 @@ public function testRestoreFixesBrokenLinks() public function testRevertToLiveFixesBrokenLinks() { // Create page and virutal page - $p = new Page(); - $p->Title = "source"; - $p->write(); - $pageID = $p->ID; - $this->assertTrue($p->publishRecursive()); + $page = new Page(); + $page->Title = "source"; + $page->write(); + $pageID = $page->ID; + $this->assertTrue($page->publishRecursive()); // Content links are one kind of link to pages - $p2 = new Page(); - $p2->Title = "regular link"; - $p2->Content = "ID]\">test"; - $p2->write(); - $this->assertTrue($p2->publishRecursive()); - - // Virtual pages are another - $vp = new VirtualPage(); - $vp->CopyContentFromID = $p->ID; - $vp->write(); + $page2 = new Page(); + $page2->Title = "regular link"; + $page2->Content = "test"; + $page2->write(); + $this->assertTrue($page2->publishRecursive()); // Redirector links are a third - $rp = new RedirectorPage(); - $rp->Title = "redirector"; - $rp->LinkType = 'Internal'; - $rp->LinkToID = $p->ID; - $rp->write(); - $this->assertTrue($rp->publishRecursive()); + $redirectorPage = new RedirectorPage(); + $redirectorPage->Title = "redirector"; + $redirectorPage->LinkType = 'Internal'; + $redirectorPage->LinkToID = $page->ID; + $redirectorPage->write(); + $this->assertTrue($redirectorPage->publishRecursive()); // Confirm that there are no broken links to begin with - $this->assertFalse($p2->HasBrokenLink); - $this->assertFalse($vp->HasBrokenLink); - $this->assertFalse($rp->HasBrokenLink); + $this->assertFalse($page2->HasBrokenLink); + $this->assertFalse($redirectorPage->HasBrokenLink); // Delete from draft and confirm that broken links are marked - $pID = $p->ID; - $p->delete(); + $page->delete(); - $vp->flushCache(); - $vp = DataObject::get_by_id(SiteTree::class, $vp->ID); - $p2->flushCache(); - $p2 = DataObject::get_by_id(SiteTree::class, $p2->ID); - $rp->flushCache(); - $rp = DataObject::get_by_id(SiteTree::class, $rp->ID); - $this->assertEquals(1, $p2->HasBrokenLink); - $this->assertEquals(1, $vp->HasBrokenLink); - $this->assertEquals(1, $rp->HasBrokenLink); + $page2->flushCache(); + $page2 = DataObject::get_by_id(SiteTree::class, $page2->ID); + $redirectorPage->flushCache(); + $redirectorPage = DataObject::get_by_id(SiteTree::class, $redirectorPage->ID); + $this->assertEquals(1, $page2->HasBrokenLink); + $this->assertEquals(1, $redirectorPage->HasBrokenLink); // Call doRevertToLive and confirm that broken links are restored - $pLive = Versioned::get_one_by_stage(SiteTree::class, 'Live', '"SiteTree"."ID" = ' . $pID); - $pLive->doRevertToLive(); - - $p2->flushCache(); - $p2 = DataObject::get_by_id(SiteTree::class, $p2->ID); - $vp->flushCache(); - $vp = DataObject::get_by_id(SiteTree::class, $vp->ID); - $rp->flushCache(); - $rp = DataObject::get_by_id(SiteTree::class, $rp->ID); - $this->assertFalse((bool)$p2->HasBrokenLink); - $this->assertFalse((bool)$vp->HasBrokenLink); - $this->assertFalse((bool)$rp->HasBrokenLink); + /** @var Page $pageLive */ + $pageLive = Versioned::get_one_by_stage(SiteTree::class, 'Live', '"SiteTree"."ID" = ' . $pageID); + $pageLive->doRevertToLive(); + + $page2->flushCache(); + $page2 = DataObject::get_by_id(SiteTree::class, $page2->ID); + $redirectorPage->flushCache(); + $redirectorPage = DataObject::get_by_id(SiteTree::class, $redirectorPage->ID); + $this->assertFalse((bool)$page2->HasBrokenLink); + $this->assertFalse((bool)$redirectorPage->HasBrokenLink); } public function testBrokenAnchorLinksInAPage() { + /** @var Page $obj */ $obj = $this->objFromFixture('Page', 'content'); $origContent = $obj->Content; diff --git a/tests/model/VirtualPageTest.php b/tests/model/VirtualPageTest.php index 300d0d2879..9b7c325301 100644 --- a/tests/model/VirtualPageTest.php +++ b/tests/model/VirtualPageTest.php @@ -1,18 +1,16 @@ assertTrue($vp->canPublish()); } - public function testCanDeleteOrphanedVirtualPagesFromLive() - { - // An unpublished source page - $p = new Page(); - $p->Content = "test content"; - $p->write(); - $p->publishRecursive(); - $pID = $p->ID; - - $vp = new VirtualPage(); - $vp->CopyContentFromID = $p->ID; - $vp->write(); - $this->assertTrue($vp->canPublish()); - $this->assertTrue($vp->publishRecursive()); - - // Delete the source page semi-manually, without triggering - // the cascade publish back to the virtual page. - Versioned::set_stage(Versioned::LIVE); - $livePage = Versioned::get_by_stage(SiteTree::class, Versioned::LIVE)->byID($pID); - $livePage->delete(); - Versioned::set_stage(Versioned::DRAFT); - - // Confirm that we can unpublish, but not publish - $this->assertFalse($p->IsPublished(), 'Copied page has orphaned the virtual page on live'); - $this->assertTrue($vp->isPublished(), 'Virtual page remains on live'); - $this->assertTrue($vp->canUnpublish()); - $this->assertFalse($vp->canPublish()); - - // Confirm that the action really works - $this->assertTrue($vp->doUnpublish()); - $this->assertEquals( - 0, - DB::prepared_query( - "SELECT count(*) FROM \"SiteTree_Live\" WHERE \"ID\" = ?", - array($vp->ID) - )->value() - ); - } - public function testCanEdit() { $parentPage = $this->objFromFixture('Page', 'master3'); $virtualPage = $this->objFromFixture(VirtualPage::class, 'vp3'); - $bob = $this->objFromFixture('SilverStripe\\Security\\Member', 'bob'); - $andrew = $this->objFromFixture('SilverStripe\\Security\\Member', 'andrew'); + $bob = $this->objFromFixture(Member::class, 'bob'); + $andrew = $this->objFromFixture(Member::class, 'andrew'); // Bob can edit the mirrored page, but he shouldn't be able to edit the virtual page. $this->logInAs($bob); @@ -259,12 +218,13 @@ public function testCanEdit() public function testCanView() { + /** @var Page $parentPage */ $parentPage = $this->objFromFixture('Page', 'master3'); $parentPage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE); $virtualPage = $this->objFromFixture(VirtualPage::class, 'vp3'); $virtualPage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE); - $cindy = $this->objFromFixture('SilverStripe\\Security\\Member', 'cindy'); - $alice = $this->objFromFixture('SilverStripe\\Security\\Member', 'alice'); + $cindy = $this->objFromFixture(Member::class, 'cindy'); + $alice = $this->objFromFixture(Member::class, 'alice'); // Cindy can see both pages $this->logInAs($cindy); @@ -336,6 +296,7 @@ public function testUnpublishingSourcePageOfAVirtualPageAlsoUnpublishesVirtualPa $vp = new VirtualPage(); $vp->CopyContentFromID = $p->ID; $vp->write(); + $vpID = $vp->ID; $this->assertTrue($vp->publishRecursive()); // All is fine, the virtual page doesn't have a broken link @@ -346,17 +307,17 @@ public function testUnpublishingSourcePageOfAVirtualPageAlsoUnpublishesVirtualPa // The draft VP still has the CopyContentFromID link $vp->flushCache(); - $vp = DataObject::get_by_id(SiteTree::class, $vp->ID); + $vp = DataObject::get_by_id(SiteTree::class, $vpID); $this->assertEquals($p->ID, $vp->CopyContentFromID); - $vpLive = Versioned::get_one_by_stage(SiteTree::class, Versioned::LIVE, '"SiteTree"."ID" = ' . $vp->ID); + $vpLive = Versioned::get_one_by_stage(SiteTree::class, Versioned::LIVE, '"SiteTree"."ID" = ' . $vpID); $this->assertNull($vpLive); - // Delete from draft, confirm that the virtual page has a broken link on the draft site + // Delete from draft, ensure virtual page deletion cascades $p->delete(); $vp->flushCache(); - $vp = DataObject::get_by_id(SiteTree::class, $vp->ID); - $this->assertEquals(1, $vp->HasBrokenLink); + $vp = DataObject::get_by_id(SiteTree::class, $vpID); + $this->assertNull($vp); } public function testDeletingFromLiveSourcePageOfAVirtualPageAlsoUnpublishesVirtualPage() @@ -369,29 +330,27 @@ public function testDeletingFromLiveSourcePageOfAVirtualPageAlsoUnpublishesVirtu $vp = new VirtualPage(); $vp->CopyContentFromID = $p->ID; $vp->write(); + $vpID = $vp->ID; $this->assertTrue($vp->publishRecursive()); // All is fine, the virtual page doesn't have a broken link $this->assertFalse($vp->HasBrokenLink); - // Delete the source page from draft, confirm that this creates a broken link + // Delete the source page from draft, cascades to virtual page $pID = $p->ID; $p->delete(); $vp->flushCache(); - $vp = DataObject::get_by_id(SiteTree::class, $vp->ID); - $this->assertEquals(1, $vp->HasBrokenLink); + $vpDraft = Versioned::get_by_stage(SiteTree::class, Versioned::DRAFT) + ->byID($pID); + $this->assertNull($vpDraft); // Delete the source page form live, confirm that the virtual page has also been unpublished - $pLive = Versioned::get_one_by_stage(SiteTree::class, Versioned::LIVE, '"SiteTree"."ID" = ' . $pID); + $pLive = Versioned::get_by_stage(SiteTree::class, Versioned::LIVE) + ->byID($pID); $this->assertTrue($pLive->doUnpublish()); - $vpLive = Versioned::get_one_by_stage(SiteTree::class, Versioned::LIVE, '"SiteTree"."ID" = ' . $vp->ID); + $vpLive = Versioned::get_by_stage(SiteTree::class, Versioned::LIVE) + ->byID($vpID); $this->assertNull($vpLive); - - // Delete from draft, confirm that the virtual page has a broken link on the draft site - $pLive->delete(); - $vp->flushCache(); - $vp = DataObject::get_by_id(SiteTree::class, $vp->ID); - $this->assertEquals(1, $vp->HasBrokenLink); } /** From 6cb20778786e92ba8fa606ab866cffc19175c064 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Wed, 9 Aug 2017 13:22:56 +1200 Subject: [PATCH 08/11] Move files to new location --- tests/{controller => php/Controllers}/CMSBatchActionsTest.php | 0 tests/{controller => php/Controllers}/CMSBatchActionsTest.yml | 0 tests/{controller => php/Controllers}/CMSMainTest.php | 0 tests/{controller => php/Controllers}/CMSMainTest.yml | 0 tests/{controller => php/Controllers}/CMSMainTest_ClassA.php | 0 tests/{controller => php/Controllers}/CMSMainTest_ClassB.php | 0 tests/{controller => php/Controllers}/CMSMainTest_HiddenClass.php | 0 tests/{controller => php/Controllers}/CMSMainTest_NotRoot.php | 0 .../Controllers}/CMSPageHistoryControllerTest.php | 0 .../Controllers}/CMSPageHistoryControllerTest.yml | 0 tests/{controller => php/Controllers}/CMSSiteTreeFilterTest.php | 0 tests/{controller => php/Controllers}/CMSSiteTreeFilterTest.yml | 0 tests/{controller => php/Controllers}/CMSTreeTest.php | 0 tests/{controller => php/Controllers}/CMSTreeTest.yml | 0 .../Controllers}/ContentControllerPermissionsTest.php | 0 .../Controllers}/ContentControllerSearchExtensionTest.php | 0 tests/{controller => php/Controllers}/ContentControllerTest.php | 0 tests/{controller => php/Controllers}/ContentControllerTest.yml | 0 .../{controller => php/Controllers}/ContentControllerTestPage.php | 0 .../Controllers}/ContentControllerTestPageController.php | 0 .../Controllers}/ContentControllerTestPageWithoutController.php | 0 .../Controllers}/ContentControllerTest_Page.php | 0 .../Controllers}/ContentControllerTest_PageController.php | 0 tests/{controller => php/Controllers}/ModelAsControllerTest.php | 0 tests/{controller => php/Controllers}/RootURLControllerTest.php | 0 tests/{controller => php/Controllers}/RootURLControllerTest.yml | 0 .../{controller => php/Controllers}/SilverStripeNavigatorTest.php | 0 .../Controllers}/SilverStripeNavigatorTest_ProtectedTestItem.php | 0 .../Controllers}/SilverStripeNavigatorTest_TestItem.php | 0 .../templates/ContentControllerTestPageWithoutController.ss | 0 .../controllertest/templates/ContentControllerTestPage_test.ss | 0 .../Controllers}/themes/controllertest/templates/Controller.ss | 0 .../Controllers}/themes/controllertest/templates/Layout/Page.ss | 0 .../Controllers}/themes/controllertest/templates/Page.ss | 0 tests/{model => php/Model}/FileLinkTrackingTest.php | 0 tests/{model => php/Model}/FileLinkTrackingTest.yml | 0 tests/{model => php/Model}/RedirectorPageTest.php | 0 tests/{model => php/Model}/RedirectorPageTest.yml | 0 .../{model => php/Model}/RedirectorPageTest_RedirectExtension.php | 0 tests/{model => php/Model}/SiteTreeActionsTest.php | 0 tests/{model => php/Model}/SiteTreeActionsTest.yml | 0 tests/{model => php/Model}/SiteTreeActionsTest_Page.php | 0 tests/{model => php/Model}/SiteTreeBacklinksTest.php | 0 tests/{model => php/Model}/SiteTreeBacklinksTest.yml | 0 tests/{model => php/Model}/SiteTreeBacklinksTest_DOD.php | 0 tests/{model => php/Model}/SiteTreeBrokenLinksTest.php | 0 tests/{model => php/Model}/SiteTreeBrokenLinksTest.yml | 0 tests/{model => php/Model}/SiteTreeHTMLEditorFieldTest.php | 0 tests/{model => php/Model}/SiteTreeHTMLEditorFieldTest.yml | 0 tests/{model => php/Model}/SiteTreeLinkTrackingTest.php | 0 tests/{model => php/Model}/SiteTreePermissionsTest.php | 0 tests/{model => php/Model}/SiteTreePermissionsTest.yml | 0 tests/{model => php/Model}/SiteTreeTest.php | 0 tests/{model => php/Model}/SiteTreeTest.yml | 0 tests/{model => php/Model}/SiteTreeTest_AdminDenied.php | 0 tests/{model => php/Model}/SiteTreeTest_AdminDeniedExtension.php | 0 tests/{model => php/Model}/SiteTreeTest_ClassA.php | 0 tests/{model => php/Model}/SiteTreeTest_ClassB.php | 0 tests/{model => php/Model}/SiteTreeTest_ClassC.php | 0 tests/{model => php/Model}/SiteTreeTest_ClassCext.php | 0 tests/{model => php/Model}/SiteTreeTest_ClassD.php | 0 tests/{model => php/Model}/SiteTreeTest_ClassE.php | 0 tests/{model => php/Model}/SiteTreeTest_Conflicted.php | 0 tests/{model => php/Model}/SiteTreeTest_ConflictedController.php | 0 tests/{model => php/Model}/SiteTreeTest_DataObject.php | 0 tests/{model => php/Model}/SiteTreeTest_Extension.php | 0 tests/{model => php/Model}/SiteTreeTest_ExtensionA.php | 0 tests/{model => php/Model}/SiteTreeTest_ExtensionB.php | 0 tests/{model => php/Model}/SiteTreeTest_LegacyControllerName.php | 0 .../Model}/SiteTreeTest_LegacyControllerName_Controller.php | 0 tests/{model => php/Model}/SiteTreeTest_NotRoot.php | 0 tests/{model => php/Model}/SiteTreeTest_NullHtmlCleaner.php | 0 tests/{model => php/Model}/SiteTreeTest_PageNode.php | 0 tests/{model => php/Model}/SiteTreeTest_PageNodeController.php | 0 tests/{model => php/Model}/SiteTreeTest_StageStatusInherit.php | 0 tests/{model => php/Model}/VirtualPageTest.php | 0 tests/{model => php/Model}/VirtualPageTest.yml | 0 tests/{model => php/Model}/VirtualPageTest_ClassA.php | 0 tests/{model => php/Model}/VirtualPageTest_ClassAController.php | 0 tests/{model => php/Model}/VirtualPageTest_ClassB.php | 0 tests/{model => php/Model}/VirtualPageTest_ClassC.php | 0 tests/{model => php/Model}/VirtualPageTest_NotRoot.php | 0 tests/{model => php/Model}/VirtualPageTest_PageExtension.php | 0 .../Model}/VirtualPageTest_PageWithAllowedChildren.php | 0 tests/{model => php/Model}/VirtualPageTest_TestDBField.php | 0 tests/{model => php/Model}/VirtualPageTest_VirtualPageSub.php | 0 .../{model => php/Model}/themes/virtualpagetest/templates/Page.ss | 0 .../themes/virtualpagetest/templates/VirtualPageTest_ClassA.ss | 0 tests/{reports => php/Reports}/CmsReportsTest.php | 0 tests/{reports => php/Reports}/CmsReportsTest.yml | 0 tests/{search => php/Search}/CMSMainSearchFormTest.php | 0 tests/{search => php/Search}/SearchFormTest.php | 0 tests/{search => php/Search}/SearchFormTest.yml | 0 tests/{tasks => php/Tasks}/MigrateSiteTreeLinkingTaskTest.php | 0 tests/{tasks => php/Tasks}/MigrateSiteTreeLinkingTaskTest.yml | 0 tests/{tasks => php/Tasks}/RemoveOrphanedPagesTaskTest.php | 0 tests/{tasks => php/Tasks}/RemoveOrphanedPagesTaskTest.yml | 0 97 files changed, 0 insertions(+), 0 deletions(-) rename tests/{controller => php/Controllers}/CMSBatchActionsTest.php (100%) rename tests/{controller => php/Controllers}/CMSBatchActionsTest.yml (100%) rename tests/{controller => php/Controllers}/CMSMainTest.php (100%) rename tests/{controller => php/Controllers}/CMSMainTest.yml (100%) rename tests/{controller => php/Controllers}/CMSMainTest_ClassA.php (100%) rename tests/{controller => php/Controllers}/CMSMainTest_ClassB.php (100%) rename tests/{controller => php/Controllers}/CMSMainTest_HiddenClass.php (100%) rename tests/{controller => php/Controllers}/CMSMainTest_NotRoot.php (100%) rename tests/{controller => php/Controllers}/CMSPageHistoryControllerTest.php (100%) rename tests/{controller => php/Controllers}/CMSPageHistoryControllerTest.yml (100%) rename tests/{controller => php/Controllers}/CMSSiteTreeFilterTest.php (100%) rename tests/{controller => php/Controllers}/CMSSiteTreeFilterTest.yml (100%) rename tests/{controller => php/Controllers}/CMSTreeTest.php (100%) rename tests/{controller => php/Controllers}/CMSTreeTest.yml (100%) rename tests/{controller => php/Controllers}/ContentControllerPermissionsTest.php (100%) rename tests/{controller => php/Controllers}/ContentControllerSearchExtensionTest.php (100%) rename tests/{controller => php/Controllers}/ContentControllerTest.php (100%) rename tests/{controller => php/Controllers}/ContentControllerTest.yml (100%) rename tests/{controller => php/Controllers}/ContentControllerTestPage.php (100%) rename tests/{controller => php/Controllers}/ContentControllerTestPageController.php (100%) rename tests/{controller => php/Controllers}/ContentControllerTestPageWithoutController.php (100%) rename tests/{controller => php/Controllers}/ContentControllerTest_Page.php (100%) rename tests/{controller => php/Controllers}/ContentControllerTest_PageController.php (100%) rename tests/{controller => php/Controllers}/ModelAsControllerTest.php (100%) rename tests/{controller => php/Controllers}/RootURLControllerTest.php (100%) rename tests/{controller => php/Controllers}/RootURLControllerTest.yml (100%) rename tests/{controller => php/Controllers}/SilverStripeNavigatorTest.php (100%) rename tests/{controller => php/Controllers}/SilverStripeNavigatorTest_ProtectedTestItem.php (100%) rename tests/{controller => php/Controllers}/SilverStripeNavigatorTest_TestItem.php (100%) rename tests/{controller => php/Controllers}/themes/controllertest/templates/ContentControllerTestPageWithoutController.ss (100%) rename tests/{controller => php/Controllers}/themes/controllertest/templates/ContentControllerTestPage_test.ss (100%) rename tests/{controller => php/Controllers}/themes/controllertest/templates/Controller.ss (100%) rename tests/{controller => php/Controllers}/themes/controllertest/templates/Layout/Page.ss (100%) rename tests/{controller => php/Controllers}/themes/controllertest/templates/Page.ss (100%) rename tests/{model => php/Model}/FileLinkTrackingTest.php (100%) rename tests/{model => php/Model}/FileLinkTrackingTest.yml (100%) rename tests/{model => php/Model}/RedirectorPageTest.php (100%) rename tests/{model => php/Model}/RedirectorPageTest.yml (100%) rename tests/{model => php/Model}/RedirectorPageTest_RedirectExtension.php (100%) rename tests/{model => php/Model}/SiteTreeActionsTest.php (100%) rename tests/{model => php/Model}/SiteTreeActionsTest.yml (100%) rename tests/{model => php/Model}/SiteTreeActionsTest_Page.php (100%) rename tests/{model => php/Model}/SiteTreeBacklinksTest.php (100%) rename tests/{model => php/Model}/SiteTreeBacklinksTest.yml (100%) rename tests/{model => php/Model}/SiteTreeBacklinksTest_DOD.php (100%) rename tests/{model => php/Model}/SiteTreeBrokenLinksTest.php (100%) rename tests/{model => php/Model}/SiteTreeBrokenLinksTest.yml (100%) rename tests/{model => php/Model}/SiteTreeHTMLEditorFieldTest.php (100%) rename tests/{model => php/Model}/SiteTreeHTMLEditorFieldTest.yml (100%) rename tests/{model => php/Model}/SiteTreeLinkTrackingTest.php (100%) rename tests/{model => php/Model}/SiteTreePermissionsTest.php (100%) rename tests/{model => php/Model}/SiteTreePermissionsTest.yml (100%) rename tests/{model => php/Model}/SiteTreeTest.php (100%) rename tests/{model => php/Model}/SiteTreeTest.yml (100%) rename tests/{model => php/Model}/SiteTreeTest_AdminDenied.php (100%) rename tests/{model => php/Model}/SiteTreeTest_AdminDeniedExtension.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ClassA.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ClassB.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ClassC.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ClassCext.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ClassD.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ClassE.php (100%) rename tests/{model => php/Model}/SiteTreeTest_Conflicted.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ConflictedController.php (100%) rename tests/{model => php/Model}/SiteTreeTest_DataObject.php (100%) rename tests/{model => php/Model}/SiteTreeTest_Extension.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ExtensionA.php (100%) rename tests/{model => php/Model}/SiteTreeTest_ExtensionB.php (100%) rename tests/{model => php/Model}/SiteTreeTest_LegacyControllerName.php (100%) rename tests/{model => php/Model}/SiteTreeTest_LegacyControllerName_Controller.php (100%) rename tests/{model => php/Model}/SiteTreeTest_NotRoot.php (100%) rename tests/{model => php/Model}/SiteTreeTest_NullHtmlCleaner.php (100%) rename tests/{model => php/Model}/SiteTreeTest_PageNode.php (100%) rename tests/{model => php/Model}/SiteTreeTest_PageNodeController.php (100%) rename tests/{model => php/Model}/SiteTreeTest_StageStatusInherit.php (100%) rename tests/{model => php/Model}/VirtualPageTest.php (100%) rename tests/{model => php/Model}/VirtualPageTest.yml (100%) rename tests/{model => php/Model}/VirtualPageTest_ClassA.php (100%) rename tests/{model => php/Model}/VirtualPageTest_ClassAController.php (100%) rename tests/{model => php/Model}/VirtualPageTest_ClassB.php (100%) rename tests/{model => php/Model}/VirtualPageTest_ClassC.php (100%) rename tests/{model => php/Model}/VirtualPageTest_NotRoot.php (100%) rename tests/{model => php/Model}/VirtualPageTest_PageExtension.php (100%) rename tests/{model => php/Model}/VirtualPageTest_PageWithAllowedChildren.php (100%) rename tests/{model => php/Model}/VirtualPageTest_TestDBField.php (100%) rename tests/{model => php/Model}/VirtualPageTest_VirtualPageSub.php (100%) rename tests/{model => php/Model}/themes/virtualpagetest/templates/Page.ss (100%) rename tests/{model => php/Model}/themes/virtualpagetest/templates/VirtualPageTest_ClassA.ss (100%) rename tests/{reports => php/Reports}/CmsReportsTest.php (100%) rename tests/{reports => php/Reports}/CmsReportsTest.yml (100%) rename tests/{search => php/Search}/CMSMainSearchFormTest.php (100%) rename tests/{search => php/Search}/SearchFormTest.php (100%) rename tests/{search => php/Search}/SearchFormTest.yml (100%) rename tests/{tasks => php/Tasks}/MigrateSiteTreeLinkingTaskTest.php (100%) rename tests/{tasks => php/Tasks}/MigrateSiteTreeLinkingTaskTest.yml (100%) rename tests/{tasks => php/Tasks}/RemoveOrphanedPagesTaskTest.php (100%) rename tests/{tasks => php/Tasks}/RemoveOrphanedPagesTaskTest.yml (100%) diff --git a/tests/controller/CMSBatchActionsTest.php b/tests/php/Controllers/CMSBatchActionsTest.php similarity index 100% rename from tests/controller/CMSBatchActionsTest.php rename to tests/php/Controllers/CMSBatchActionsTest.php diff --git a/tests/controller/CMSBatchActionsTest.yml b/tests/php/Controllers/CMSBatchActionsTest.yml similarity index 100% rename from tests/controller/CMSBatchActionsTest.yml rename to tests/php/Controllers/CMSBatchActionsTest.yml diff --git a/tests/controller/CMSMainTest.php b/tests/php/Controllers/CMSMainTest.php similarity index 100% rename from tests/controller/CMSMainTest.php rename to tests/php/Controllers/CMSMainTest.php diff --git a/tests/controller/CMSMainTest.yml b/tests/php/Controllers/CMSMainTest.yml similarity index 100% rename from tests/controller/CMSMainTest.yml rename to tests/php/Controllers/CMSMainTest.yml diff --git a/tests/controller/CMSMainTest_ClassA.php b/tests/php/Controllers/CMSMainTest_ClassA.php similarity index 100% rename from tests/controller/CMSMainTest_ClassA.php rename to tests/php/Controllers/CMSMainTest_ClassA.php diff --git a/tests/controller/CMSMainTest_ClassB.php b/tests/php/Controllers/CMSMainTest_ClassB.php similarity index 100% rename from tests/controller/CMSMainTest_ClassB.php rename to tests/php/Controllers/CMSMainTest_ClassB.php diff --git a/tests/controller/CMSMainTest_HiddenClass.php b/tests/php/Controllers/CMSMainTest_HiddenClass.php similarity index 100% rename from tests/controller/CMSMainTest_HiddenClass.php rename to tests/php/Controllers/CMSMainTest_HiddenClass.php diff --git a/tests/controller/CMSMainTest_NotRoot.php b/tests/php/Controllers/CMSMainTest_NotRoot.php similarity index 100% rename from tests/controller/CMSMainTest_NotRoot.php rename to tests/php/Controllers/CMSMainTest_NotRoot.php diff --git a/tests/controller/CMSPageHistoryControllerTest.php b/tests/php/Controllers/CMSPageHistoryControllerTest.php similarity index 100% rename from tests/controller/CMSPageHistoryControllerTest.php rename to tests/php/Controllers/CMSPageHistoryControllerTest.php diff --git a/tests/controller/CMSPageHistoryControllerTest.yml b/tests/php/Controllers/CMSPageHistoryControllerTest.yml similarity index 100% rename from tests/controller/CMSPageHistoryControllerTest.yml rename to tests/php/Controllers/CMSPageHistoryControllerTest.yml diff --git a/tests/controller/CMSSiteTreeFilterTest.php b/tests/php/Controllers/CMSSiteTreeFilterTest.php similarity index 100% rename from tests/controller/CMSSiteTreeFilterTest.php rename to tests/php/Controllers/CMSSiteTreeFilterTest.php diff --git a/tests/controller/CMSSiteTreeFilterTest.yml b/tests/php/Controllers/CMSSiteTreeFilterTest.yml similarity index 100% rename from tests/controller/CMSSiteTreeFilterTest.yml rename to tests/php/Controllers/CMSSiteTreeFilterTest.yml diff --git a/tests/controller/CMSTreeTest.php b/tests/php/Controllers/CMSTreeTest.php similarity index 100% rename from tests/controller/CMSTreeTest.php rename to tests/php/Controllers/CMSTreeTest.php diff --git a/tests/controller/CMSTreeTest.yml b/tests/php/Controllers/CMSTreeTest.yml similarity index 100% rename from tests/controller/CMSTreeTest.yml rename to tests/php/Controllers/CMSTreeTest.yml diff --git a/tests/controller/ContentControllerPermissionsTest.php b/tests/php/Controllers/ContentControllerPermissionsTest.php similarity index 100% rename from tests/controller/ContentControllerPermissionsTest.php rename to tests/php/Controllers/ContentControllerPermissionsTest.php diff --git a/tests/controller/ContentControllerSearchExtensionTest.php b/tests/php/Controllers/ContentControllerSearchExtensionTest.php similarity index 100% rename from tests/controller/ContentControllerSearchExtensionTest.php rename to tests/php/Controllers/ContentControllerSearchExtensionTest.php diff --git a/tests/controller/ContentControllerTest.php b/tests/php/Controllers/ContentControllerTest.php similarity index 100% rename from tests/controller/ContentControllerTest.php rename to tests/php/Controllers/ContentControllerTest.php diff --git a/tests/controller/ContentControllerTest.yml b/tests/php/Controllers/ContentControllerTest.yml similarity index 100% rename from tests/controller/ContentControllerTest.yml rename to tests/php/Controllers/ContentControllerTest.yml diff --git a/tests/controller/ContentControllerTestPage.php b/tests/php/Controllers/ContentControllerTestPage.php similarity index 100% rename from tests/controller/ContentControllerTestPage.php rename to tests/php/Controllers/ContentControllerTestPage.php diff --git a/tests/controller/ContentControllerTestPageController.php b/tests/php/Controllers/ContentControllerTestPageController.php similarity index 100% rename from tests/controller/ContentControllerTestPageController.php rename to tests/php/Controllers/ContentControllerTestPageController.php diff --git a/tests/controller/ContentControllerTestPageWithoutController.php b/tests/php/Controllers/ContentControllerTestPageWithoutController.php similarity index 100% rename from tests/controller/ContentControllerTestPageWithoutController.php rename to tests/php/Controllers/ContentControllerTestPageWithoutController.php diff --git a/tests/controller/ContentControllerTest_Page.php b/tests/php/Controllers/ContentControllerTest_Page.php similarity index 100% rename from tests/controller/ContentControllerTest_Page.php rename to tests/php/Controllers/ContentControllerTest_Page.php diff --git a/tests/controller/ContentControllerTest_PageController.php b/tests/php/Controllers/ContentControllerTest_PageController.php similarity index 100% rename from tests/controller/ContentControllerTest_PageController.php rename to tests/php/Controllers/ContentControllerTest_PageController.php diff --git a/tests/controller/ModelAsControllerTest.php b/tests/php/Controllers/ModelAsControllerTest.php similarity index 100% rename from tests/controller/ModelAsControllerTest.php rename to tests/php/Controllers/ModelAsControllerTest.php diff --git a/tests/controller/RootURLControllerTest.php b/tests/php/Controllers/RootURLControllerTest.php similarity index 100% rename from tests/controller/RootURLControllerTest.php rename to tests/php/Controllers/RootURLControllerTest.php diff --git a/tests/controller/RootURLControllerTest.yml b/tests/php/Controllers/RootURLControllerTest.yml similarity index 100% rename from tests/controller/RootURLControllerTest.yml rename to tests/php/Controllers/RootURLControllerTest.yml diff --git a/tests/controller/SilverStripeNavigatorTest.php b/tests/php/Controllers/SilverStripeNavigatorTest.php similarity index 100% rename from tests/controller/SilverStripeNavigatorTest.php rename to tests/php/Controllers/SilverStripeNavigatorTest.php diff --git a/tests/controller/SilverStripeNavigatorTest_ProtectedTestItem.php b/tests/php/Controllers/SilverStripeNavigatorTest_ProtectedTestItem.php similarity index 100% rename from tests/controller/SilverStripeNavigatorTest_ProtectedTestItem.php rename to tests/php/Controllers/SilverStripeNavigatorTest_ProtectedTestItem.php diff --git a/tests/controller/SilverStripeNavigatorTest_TestItem.php b/tests/php/Controllers/SilverStripeNavigatorTest_TestItem.php similarity index 100% rename from tests/controller/SilverStripeNavigatorTest_TestItem.php rename to tests/php/Controllers/SilverStripeNavigatorTest_TestItem.php diff --git a/tests/controller/themes/controllertest/templates/ContentControllerTestPageWithoutController.ss b/tests/php/Controllers/themes/controllertest/templates/ContentControllerTestPageWithoutController.ss similarity index 100% rename from tests/controller/themes/controllertest/templates/ContentControllerTestPageWithoutController.ss rename to tests/php/Controllers/themes/controllertest/templates/ContentControllerTestPageWithoutController.ss diff --git a/tests/controller/themes/controllertest/templates/ContentControllerTestPage_test.ss b/tests/php/Controllers/themes/controllertest/templates/ContentControllerTestPage_test.ss similarity index 100% rename from tests/controller/themes/controllertest/templates/ContentControllerTestPage_test.ss rename to tests/php/Controllers/themes/controllertest/templates/ContentControllerTestPage_test.ss diff --git a/tests/controller/themes/controllertest/templates/Controller.ss b/tests/php/Controllers/themes/controllertest/templates/Controller.ss similarity index 100% rename from tests/controller/themes/controllertest/templates/Controller.ss rename to tests/php/Controllers/themes/controllertest/templates/Controller.ss diff --git a/tests/controller/themes/controllertest/templates/Layout/Page.ss b/tests/php/Controllers/themes/controllertest/templates/Layout/Page.ss similarity index 100% rename from tests/controller/themes/controllertest/templates/Layout/Page.ss rename to tests/php/Controllers/themes/controllertest/templates/Layout/Page.ss diff --git a/tests/controller/themes/controllertest/templates/Page.ss b/tests/php/Controllers/themes/controllertest/templates/Page.ss similarity index 100% rename from tests/controller/themes/controllertest/templates/Page.ss rename to tests/php/Controllers/themes/controllertest/templates/Page.ss diff --git a/tests/model/FileLinkTrackingTest.php b/tests/php/Model/FileLinkTrackingTest.php similarity index 100% rename from tests/model/FileLinkTrackingTest.php rename to tests/php/Model/FileLinkTrackingTest.php diff --git a/tests/model/FileLinkTrackingTest.yml b/tests/php/Model/FileLinkTrackingTest.yml similarity index 100% rename from tests/model/FileLinkTrackingTest.yml rename to tests/php/Model/FileLinkTrackingTest.yml diff --git a/tests/model/RedirectorPageTest.php b/tests/php/Model/RedirectorPageTest.php similarity index 100% rename from tests/model/RedirectorPageTest.php rename to tests/php/Model/RedirectorPageTest.php diff --git a/tests/model/RedirectorPageTest.yml b/tests/php/Model/RedirectorPageTest.yml similarity index 100% rename from tests/model/RedirectorPageTest.yml rename to tests/php/Model/RedirectorPageTest.yml diff --git a/tests/model/RedirectorPageTest_RedirectExtension.php b/tests/php/Model/RedirectorPageTest_RedirectExtension.php similarity index 100% rename from tests/model/RedirectorPageTest_RedirectExtension.php rename to tests/php/Model/RedirectorPageTest_RedirectExtension.php diff --git a/tests/model/SiteTreeActionsTest.php b/tests/php/Model/SiteTreeActionsTest.php similarity index 100% rename from tests/model/SiteTreeActionsTest.php rename to tests/php/Model/SiteTreeActionsTest.php diff --git a/tests/model/SiteTreeActionsTest.yml b/tests/php/Model/SiteTreeActionsTest.yml similarity index 100% rename from tests/model/SiteTreeActionsTest.yml rename to tests/php/Model/SiteTreeActionsTest.yml diff --git a/tests/model/SiteTreeActionsTest_Page.php b/tests/php/Model/SiteTreeActionsTest_Page.php similarity index 100% rename from tests/model/SiteTreeActionsTest_Page.php rename to tests/php/Model/SiteTreeActionsTest_Page.php diff --git a/tests/model/SiteTreeBacklinksTest.php b/tests/php/Model/SiteTreeBacklinksTest.php similarity index 100% rename from tests/model/SiteTreeBacklinksTest.php rename to tests/php/Model/SiteTreeBacklinksTest.php diff --git a/tests/model/SiteTreeBacklinksTest.yml b/tests/php/Model/SiteTreeBacklinksTest.yml similarity index 100% rename from tests/model/SiteTreeBacklinksTest.yml rename to tests/php/Model/SiteTreeBacklinksTest.yml diff --git a/tests/model/SiteTreeBacklinksTest_DOD.php b/tests/php/Model/SiteTreeBacklinksTest_DOD.php similarity index 100% rename from tests/model/SiteTreeBacklinksTest_DOD.php rename to tests/php/Model/SiteTreeBacklinksTest_DOD.php diff --git a/tests/model/SiteTreeBrokenLinksTest.php b/tests/php/Model/SiteTreeBrokenLinksTest.php similarity index 100% rename from tests/model/SiteTreeBrokenLinksTest.php rename to tests/php/Model/SiteTreeBrokenLinksTest.php diff --git a/tests/model/SiteTreeBrokenLinksTest.yml b/tests/php/Model/SiteTreeBrokenLinksTest.yml similarity index 100% rename from tests/model/SiteTreeBrokenLinksTest.yml rename to tests/php/Model/SiteTreeBrokenLinksTest.yml diff --git a/tests/model/SiteTreeHTMLEditorFieldTest.php b/tests/php/Model/SiteTreeHTMLEditorFieldTest.php similarity index 100% rename from tests/model/SiteTreeHTMLEditorFieldTest.php rename to tests/php/Model/SiteTreeHTMLEditorFieldTest.php diff --git a/tests/model/SiteTreeHTMLEditorFieldTest.yml b/tests/php/Model/SiteTreeHTMLEditorFieldTest.yml similarity index 100% rename from tests/model/SiteTreeHTMLEditorFieldTest.yml rename to tests/php/Model/SiteTreeHTMLEditorFieldTest.yml diff --git a/tests/model/SiteTreeLinkTrackingTest.php b/tests/php/Model/SiteTreeLinkTrackingTest.php similarity index 100% rename from tests/model/SiteTreeLinkTrackingTest.php rename to tests/php/Model/SiteTreeLinkTrackingTest.php diff --git a/tests/model/SiteTreePermissionsTest.php b/tests/php/Model/SiteTreePermissionsTest.php similarity index 100% rename from tests/model/SiteTreePermissionsTest.php rename to tests/php/Model/SiteTreePermissionsTest.php diff --git a/tests/model/SiteTreePermissionsTest.yml b/tests/php/Model/SiteTreePermissionsTest.yml similarity index 100% rename from tests/model/SiteTreePermissionsTest.yml rename to tests/php/Model/SiteTreePermissionsTest.yml diff --git a/tests/model/SiteTreeTest.php b/tests/php/Model/SiteTreeTest.php similarity index 100% rename from tests/model/SiteTreeTest.php rename to tests/php/Model/SiteTreeTest.php diff --git a/tests/model/SiteTreeTest.yml b/tests/php/Model/SiteTreeTest.yml similarity index 100% rename from tests/model/SiteTreeTest.yml rename to tests/php/Model/SiteTreeTest.yml diff --git a/tests/model/SiteTreeTest_AdminDenied.php b/tests/php/Model/SiteTreeTest_AdminDenied.php similarity index 100% rename from tests/model/SiteTreeTest_AdminDenied.php rename to tests/php/Model/SiteTreeTest_AdminDenied.php diff --git a/tests/model/SiteTreeTest_AdminDeniedExtension.php b/tests/php/Model/SiteTreeTest_AdminDeniedExtension.php similarity index 100% rename from tests/model/SiteTreeTest_AdminDeniedExtension.php rename to tests/php/Model/SiteTreeTest_AdminDeniedExtension.php diff --git a/tests/model/SiteTreeTest_ClassA.php b/tests/php/Model/SiteTreeTest_ClassA.php similarity index 100% rename from tests/model/SiteTreeTest_ClassA.php rename to tests/php/Model/SiteTreeTest_ClassA.php diff --git a/tests/model/SiteTreeTest_ClassB.php b/tests/php/Model/SiteTreeTest_ClassB.php similarity index 100% rename from tests/model/SiteTreeTest_ClassB.php rename to tests/php/Model/SiteTreeTest_ClassB.php diff --git a/tests/model/SiteTreeTest_ClassC.php b/tests/php/Model/SiteTreeTest_ClassC.php similarity index 100% rename from tests/model/SiteTreeTest_ClassC.php rename to tests/php/Model/SiteTreeTest_ClassC.php diff --git a/tests/model/SiteTreeTest_ClassCext.php b/tests/php/Model/SiteTreeTest_ClassCext.php similarity index 100% rename from tests/model/SiteTreeTest_ClassCext.php rename to tests/php/Model/SiteTreeTest_ClassCext.php diff --git a/tests/model/SiteTreeTest_ClassD.php b/tests/php/Model/SiteTreeTest_ClassD.php similarity index 100% rename from tests/model/SiteTreeTest_ClassD.php rename to tests/php/Model/SiteTreeTest_ClassD.php diff --git a/tests/model/SiteTreeTest_ClassE.php b/tests/php/Model/SiteTreeTest_ClassE.php similarity index 100% rename from tests/model/SiteTreeTest_ClassE.php rename to tests/php/Model/SiteTreeTest_ClassE.php diff --git a/tests/model/SiteTreeTest_Conflicted.php b/tests/php/Model/SiteTreeTest_Conflicted.php similarity index 100% rename from tests/model/SiteTreeTest_Conflicted.php rename to tests/php/Model/SiteTreeTest_Conflicted.php diff --git a/tests/model/SiteTreeTest_ConflictedController.php b/tests/php/Model/SiteTreeTest_ConflictedController.php similarity index 100% rename from tests/model/SiteTreeTest_ConflictedController.php rename to tests/php/Model/SiteTreeTest_ConflictedController.php diff --git a/tests/model/SiteTreeTest_DataObject.php b/tests/php/Model/SiteTreeTest_DataObject.php similarity index 100% rename from tests/model/SiteTreeTest_DataObject.php rename to tests/php/Model/SiteTreeTest_DataObject.php diff --git a/tests/model/SiteTreeTest_Extension.php b/tests/php/Model/SiteTreeTest_Extension.php similarity index 100% rename from tests/model/SiteTreeTest_Extension.php rename to tests/php/Model/SiteTreeTest_Extension.php diff --git a/tests/model/SiteTreeTest_ExtensionA.php b/tests/php/Model/SiteTreeTest_ExtensionA.php similarity index 100% rename from tests/model/SiteTreeTest_ExtensionA.php rename to tests/php/Model/SiteTreeTest_ExtensionA.php diff --git a/tests/model/SiteTreeTest_ExtensionB.php b/tests/php/Model/SiteTreeTest_ExtensionB.php similarity index 100% rename from tests/model/SiteTreeTest_ExtensionB.php rename to tests/php/Model/SiteTreeTest_ExtensionB.php diff --git a/tests/model/SiteTreeTest_LegacyControllerName.php b/tests/php/Model/SiteTreeTest_LegacyControllerName.php similarity index 100% rename from tests/model/SiteTreeTest_LegacyControllerName.php rename to tests/php/Model/SiteTreeTest_LegacyControllerName.php diff --git a/tests/model/SiteTreeTest_LegacyControllerName_Controller.php b/tests/php/Model/SiteTreeTest_LegacyControllerName_Controller.php similarity index 100% rename from tests/model/SiteTreeTest_LegacyControllerName_Controller.php rename to tests/php/Model/SiteTreeTest_LegacyControllerName_Controller.php diff --git a/tests/model/SiteTreeTest_NotRoot.php b/tests/php/Model/SiteTreeTest_NotRoot.php similarity index 100% rename from tests/model/SiteTreeTest_NotRoot.php rename to tests/php/Model/SiteTreeTest_NotRoot.php diff --git a/tests/model/SiteTreeTest_NullHtmlCleaner.php b/tests/php/Model/SiteTreeTest_NullHtmlCleaner.php similarity index 100% rename from tests/model/SiteTreeTest_NullHtmlCleaner.php rename to tests/php/Model/SiteTreeTest_NullHtmlCleaner.php diff --git a/tests/model/SiteTreeTest_PageNode.php b/tests/php/Model/SiteTreeTest_PageNode.php similarity index 100% rename from tests/model/SiteTreeTest_PageNode.php rename to tests/php/Model/SiteTreeTest_PageNode.php diff --git a/tests/model/SiteTreeTest_PageNodeController.php b/tests/php/Model/SiteTreeTest_PageNodeController.php similarity index 100% rename from tests/model/SiteTreeTest_PageNodeController.php rename to tests/php/Model/SiteTreeTest_PageNodeController.php diff --git a/tests/model/SiteTreeTest_StageStatusInherit.php b/tests/php/Model/SiteTreeTest_StageStatusInherit.php similarity index 100% rename from tests/model/SiteTreeTest_StageStatusInherit.php rename to tests/php/Model/SiteTreeTest_StageStatusInherit.php diff --git a/tests/model/VirtualPageTest.php b/tests/php/Model/VirtualPageTest.php similarity index 100% rename from tests/model/VirtualPageTest.php rename to tests/php/Model/VirtualPageTest.php diff --git a/tests/model/VirtualPageTest.yml b/tests/php/Model/VirtualPageTest.yml similarity index 100% rename from tests/model/VirtualPageTest.yml rename to tests/php/Model/VirtualPageTest.yml diff --git a/tests/model/VirtualPageTest_ClassA.php b/tests/php/Model/VirtualPageTest_ClassA.php similarity index 100% rename from tests/model/VirtualPageTest_ClassA.php rename to tests/php/Model/VirtualPageTest_ClassA.php diff --git a/tests/model/VirtualPageTest_ClassAController.php b/tests/php/Model/VirtualPageTest_ClassAController.php similarity index 100% rename from tests/model/VirtualPageTest_ClassAController.php rename to tests/php/Model/VirtualPageTest_ClassAController.php diff --git a/tests/model/VirtualPageTest_ClassB.php b/tests/php/Model/VirtualPageTest_ClassB.php similarity index 100% rename from tests/model/VirtualPageTest_ClassB.php rename to tests/php/Model/VirtualPageTest_ClassB.php diff --git a/tests/model/VirtualPageTest_ClassC.php b/tests/php/Model/VirtualPageTest_ClassC.php similarity index 100% rename from tests/model/VirtualPageTest_ClassC.php rename to tests/php/Model/VirtualPageTest_ClassC.php diff --git a/tests/model/VirtualPageTest_NotRoot.php b/tests/php/Model/VirtualPageTest_NotRoot.php similarity index 100% rename from tests/model/VirtualPageTest_NotRoot.php rename to tests/php/Model/VirtualPageTest_NotRoot.php diff --git a/tests/model/VirtualPageTest_PageExtension.php b/tests/php/Model/VirtualPageTest_PageExtension.php similarity index 100% rename from tests/model/VirtualPageTest_PageExtension.php rename to tests/php/Model/VirtualPageTest_PageExtension.php diff --git a/tests/model/VirtualPageTest_PageWithAllowedChildren.php b/tests/php/Model/VirtualPageTest_PageWithAllowedChildren.php similarity index 100% rename from tests/model/VirtualPageTest_PageWithAllowedChildren.php rename to tests/php/Model/VirtualPageTest_PageWithAllowedChildren.php diff --git a/tests/model/VirtualPageTest_TestDBField.php b/tests/php/Model/VirtualPageTest_TestDBField.php similarity index 100% rename from tests/model/VirtualPageTest_TestDBField.php rename to tests/php/Model/VirtualPageTest_TestDBField.php diff --git a/tests/model/VirtualPageTest_VirtualPageSub.php b/tests/php/Model/VirtualPageTest_VirtualPageSub.php similarity index 100% rename from tests/model/VirtualPageTest_VirtualPageSub.php rename to tests/php/Model/VirtualPageTest_VirtualPageSub.php diff --git a/tests/model/themes/virtualpagetest/templates/Page.ss b/tests/php/Model/themes/virtualpagetest/templates/Page.ss similarity index 100% rename from tests/model/themes/virtualpagetest/templates/Page.ss rename to tests/php/Model/themes/virtualpagetest/templates/Page.ss diff --git a/tests/model/themes/virtualpagetest/templates/VirtualPageTest_ClassA.ss b/tests/php/Model/themes/virtualpagetest/templates/VirtualPageTest_ClassA.ss similarity index 100% rename from tests/model/themes/virtualpagetest/templates/VirtualPageTest_ClassA.ss rename to tests/php/Model/themes/virtualpagetest/templates/VirtualPageTest_ClassA.ss diff --git a/tests/reports/CmsReportsTest.php b/tests/php/Reports/CmsReportsTest.php similarity index 100% rename from tests/reports/CmsReportsTest.php rename to tests/php/Reports/CmsReportsTest.php diff --git a/tests/reports/CmsReportsTest.yml b/tests/php/Reports/CmsReportsTest.yml similarity index 100% rename from tests/reports/CmsReportsTest.yml rename to tests/php/Reports/CmsReportsTest.yml diff --git a/tests/search/CMSMainSearchFormTest.php b/tests/php/Search/CMSMainSearchFormTest.php similarity index 100% rename from tests/search/CMSMainSearchFormTest.php rename to tests/php/Search/CMSMainSearchFormTest.php diff --git a/tests/search/SearchFormTest.php b/tests/php/Search/SearchFormTest.php similarity index 100% rename from tests/search/SearchFormTest.php rename to tests/php/Search/SearchFormTest.php diff --git a/tests/search/SearchFormTest.yml b/tests/php/Search/SearchFormTest.yml similarity index 100% rename from tests/search/SearchFormTest.yml rename to tests/php/Search/SearchFormTest.yml diff --git a/tests/tasks/MigrateSiteTreeLinkingTaskTest.php b/tests/php/Tasks/MigrateSiteTreeLinkingTaskTest.php similarity index 100% rename from tests/tasks/MigrateSiteTreeLinkingTaskTest.php rename to tests/php/Tasks/MigrateSiteTreeLinkingTaskTest.php diff --git a/tests/tasks/MigrateSiteTreeLinkingTaskTest.yml b/tests/php/Tasks/MigrateSiteTreeLinkingTaskTest.yml similarity index 100% rename from tests/tasks/MigrateSiteTreeLinkingTaskTest.yml rename to tests/php/Tasks/MigrateSiteTreeLinkingTaskTest.yml diff --git a/tests/tasks/RemoveOrphanedPagesTaskTest.php b/tests/php/Tasks/RemoveOrphanedPagesTaskTest.php similarity index 100% rename from tests/tasks/RemoveOrphanedPagesTaskTest.php rename to tests/php/Tasks/RemoveOrphanedPagesTaskTest.php diff --git a/tests/tasks/RemoveOrphanedPagesTaskTest.yml b/tests/php/Tasks/RemoveOrphanedPagesTaskTest.yml similarity index 100% rename from tests/tasks/RemoveOrphanedPagesTaskTest.yml rename to tests/php/Tasks/RemoveOrphanedPagesTaskTest.yml From 9f268a18b5b11bbcb8463c06b64fb04ceff6b1a2 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Wed, 9 Aug 2017 13:25:12 +1200 Subject: [PATCH 09/11] Run add-namespace command --- .upgrade.yml | 70 +++++++++++++++++++ tests/php/Controllers/CMSBatchActionsTest.php | 5 ++ tests/php/Controllers/CMSMainTest.php | 5 ++ tests/php/Controllers/CMSMainTest_ClassA.php | 5 ++ tests/php/Controllers/CMSMainTest_ClassB.php | 5 ++ .../Controllers/CMSMainTest_HiddenClass.php | 5 ++ tests/php/Controllers/CMSMainTest_NotRoot.php | 5 ++ .../CMSPageHistoryControllerTest.php | 5 ++ .../php/Controllers/CMSSiteTreeFilterTest.php | 5 ++ tests/php/Controllers/CMSTreeTest.php | 5 ++ .../ContentControllerPermissionsTest.php | 5 ++ .../ContentControllerSearchExtensionTest.php | 5 ++ .../php/Controllers/ContentControllerTest.php | 5 ++ .../Controllers/ContentControllerTestPage.php | 5 ++ .../ContentControllerTestPageController.php | 5 ++ ...entControllerTestPageWithoutController.php | 5 ++ .../ContentControllerTest_Page.php | 5 ++ .../ContentControllerTest_PageController.php | 5 ++ .../php/Controllers/ModelAsControllerTest.php | 5 ++ .../php/Controllers/RootURLControllerTest.php | 5 ++ .../Controllers/SilverStripeNavigatorTest.php | 5 ++ ...rStripeNavigatorTest_ProtectedTestItem.php | 5 ++ .../SilverStripeNavigatorTest_TestItem.php | 5 ++ tests/php/Model/FileLinkTrackingTest.php | 5 ++ tests/php/Model/RedirectorPageTest.php | 5 ++ .../RedirectorPageTest_RedirectExtension.php | 5 ++ tests/php/Model/SiteTreeActionsTest.php | 5 ++ tests/php/Model/SiteTreeActionsTest_Page.php | 5 ++ tests/php/Model/SiteTreeBacklinksTest.php | 5 ++ tests/php/Model/SiteTreeBacklinksTest_DOD.php | 5 ++ tests/php/Model/SiteTreeBrokenLinksTest.php | 5 ++ .../php/Model/SiteTreeHTMLEditorFieldTest.php | 5 ++ tests/php/Model/SiteTreeLinkTrackingTest.php | 5 ++ tests/php/Model/SiteTreePermissionsTest.php | 5 ++ tests/php/Model/SiteTreeTest.php | 6 ++ tests/php/Model/SiteTreeTest_AdminDenied.php | 5 ++ .../SiteTreeTest_AdminDeniedExtension.php | 5 ++ tests/php/Model/SiteTreeTest_ClassA.php | 5 ++ tests/php/Model/SiteTreeTest_ClassB.php | 5 ++ tests/php/Model/SiteTreeTest_ClassC.php | 5 ++ tests/php/Model/SiteTreeTest_ClassCext.php | 5 ++ tests/php/Model/SiteTreeTest_ClassD.php | 5 ++ tests/php/Model/SiteTreeTest_ClassE.php | 5 ++ tests/php/Model/SiteTreeTest_Conflicted.php | 5 ++ .../SiteTreeTest_ConflictedController.php | 5 ++ tests/php/Model/SiteTreeTest_DataObject.php | 5 ++ tests/php/Model/SiteTreeTest_Extension.php | 5 ++ tests/php/Model/SiteTreeTest_ExtensionA.php | 5 ++ tests/php/Model/SiteTreeTest_ExtensionB.php | 5 ++ .../SiteTreeTest_LegacyControllerName.php | 5 ++ ...eeTest_LegacyControllerName_Controller.php | 5 ++ tests/php/Model/SiteTreeTest_NotRoot.php | 5 ++ .../Model/SiteTreeTest_NullHtmlCleaner.php | 5 ++ tests/php/Model/SiteTreeTest_PageNode.php | 5 ++ .../Model/SiteTreeTest_PageNodeController.php | 5 ++ .../Model/SiteTreeTest_StageStatusInherit.php | 5 ++ tests/php/Model/VirtualPageTest.php | 5 +- tests/php/Model/VirtualPageTest_ClassA.php | 5 ++ .../VirtualPageTest_ClassAController.php | 5 ++ tests/php/Model/VirtualPageTest_ClassB.php | 5 ++ tests/php/Model/VirtualPageTest_ClassC.php | 5 ++ tests/php/Model/VirtualPageTest_NotRoot.php | 5 ++ .../Model/VirtualPageTest_PageExtension.php | 5 ++ ...irtualPageTest_PageWithAllowedChildren.php | 5 ++ .../php/Model/VirtualPageTest_TestDBField.php | 5 ++ .../Model/VirtualPageTest_VirtualPageSub.php | 5 ++ tests/php/Reports/CmsReportsTest.php | 5 ++ tests/php/Search/CMSMainSearchFormTest.php | 5 ++ tests/php/Search/SearchFormTest.php | 5 ++ .../Tasks/MigrateSiteTreeLinkingTaskTest.php | 5 ++ .../php/Tasks/RemoveOrphanedPagesTaskTest.php | 5 ++ 71 files changed, 419 insertions(+), 2 deletions(-) diff --git a/.upgrade.yml b/.upgrade.yml index e9039eb2b2..4038b207af 100644 --- a/.upgrade.yml +++ b/.upgrade.yml @@ -76,5 +76,75 @@ mappings: URLSegmentField: SilverStripe\CMS\Forms\SiteTreeURLSegmentField CMSPagesController_Tools_ss: SilverStripe\CMS\Controllers\CMSPagesController LeftAndMain: SilverStripe\Admin\LeftAndMain + CMSBatchActionsTest: SilverStripe\CMS\Tests\CMSBatchActionsTest + CMSMainTest: SilverStripe\CMS\Tests\CMSMainTest + CMSMainTest_ClassA: SilverStripe\CMS\Tests\CMSMainTest_ClassA + CMSMainTest_ClassB: SilverStripe\CMS\Tests\CMSMainTest_ClassB + CMSMainTest_HiddenClass: SilverStripe\CMS\Tests\CMSMainTest_HiddenClass + CMSMainTest_NotRoot: SilverStripe\CMS\Tests\CMSMainTest_NotRoot + CMSPageHistoryControllerTest: SilverStripe\CMS\Tests\CMSPageHistoryControllerTest + CMSSiteTreeFilterTest: SilverStripe\CMS\Tests\CMSSiteTreeFilterTest + CMSTreeTest: SilverStripe\CMS\Tests\CMSTreeTest + ContentControllerPermissionsTest: SilverStripe\CMS\Tests\ContentControllerPermissionsTest + ContentControllerSearchExtensionTest: SilverStripe\CMS\Tests\ContentControllerSearchExtensionTest + ContentControllerTest: SilverStripe\CMS\Tests\ContentControllerTest + ContentControllerTest_Page: SilverStripe\CMS\Tests\ContentControllerTest_Page + ContentControllerTest_PageController: SilverStripe\CMS\Tests\ContentControllerTest_PageController + ContentControllerTestPage: SilverStripe\CMS\Tests\ContentControllerTestPage + ContentControllerTestPageController: SilverStripe\CMS\Tests\ContentControllerTestPageController + ContentControllerTestPageWithoutController: SilverStripe\CMS\Tests\ContentControllerTestPageWithoutController + ModelAsControllerTest: SilverStripe\CMS\Tests\ModelAsControllerTest + RootURLControllerTest: SilverStripe\CMS\Tests\RootURLControllerTest + SilverStripeNavigatorTest: SilverStripe\CMS\Tests\SilverStripeNavigatorTest + SilverStripeNavigatorTest_ProtectedTestItem: SilverStripe\CMS\Tests\SilverStripeNavigatorTest_ProtectedTestItem + SilverStripeNavigatorTest_TestItem: SilverStripe\CMS\Tests\SilverStripeNavigatorTest_TestItem + FileLinkTrackingTest: SilverStripe\CMS\Tests\FileLinkTrackingTest + RedirectorPageTest: SilverStripe\CMS\Tests\RedirectorPageTest + RedirectorPageTest_RedirectExtension: SilverStripe\CMS\Tests\RedirectorPageTest_RedirectExtension + SiteTreeActionsTest: SilverStripe\CMS\Tests\SiteTreeActionsTest + SiteTreeActionsTest_Page: SilverStripe\CMS\Tests\SiteTreeActionsTest_Page + SiteTreeBacklinksTest: SilverStripe\CMS\Tests\SiteTreeBacklinksTest + SiteTreeBacklinksTest_DOD: SilverStripe\CMS\Tests\SiteTreeBacklinksTest_DOD + SiteTreeBrokenLinksTest: SilverStripe\CMS\Tests\SiteTreeBrokenLinksTest + SiteTreeHTMLEditorFieldTest: SilverStripe\CMS\Tests\SiteTreeHTMLEditorFieldTest + SiteTreeLinkTrackingTest: SilverStripe\CMS\Tests\SiteTreeLinkTrackingTest + SiteTreePermissionsTest: SilverStripe\CMS\Tests\SiteTreePermissionsTest + SiteTreeTest: SilverStripe\CMS\Tests\SiteTreeTest + SiteTreeTest_AdminDenied: SilverStripe\CMS\Tests\SiteTreeTest_AdminDenied + SiteTreeTest_AdminDeniedExtension: SilverStripe\CMS\Tests\SiteTreeTest_AdminDeniedExtension + SiteTreeTest_ClassA: SilverStripe\CMS\Tests\SiteTreeTest_ClassA + SiteTreeTest_ClassB: SilverStripe\CMS\Tests\SiteTreeTest_ClassB + SiteTreeTest_ClassC: SilverStripe\CMS\Tests\SiteTreeTest_ClassC + SiteTreeTest_ClassCext: SilverStripe\CMS\Tests\SiteTreeTest_ClassCext + SiteTreeTest_ClassD: SilverStripe\CMS\Tests\SiteTreeTest_ClassD + SiteTreeTest_ClassE: SilverStripe\CMS\Tests\SiteTreeTest_ClassE + SiteTreeTest_Conflicted: SilverStripe\CMS\Tests\SiteTreeTest_Conflicted + SiteTreeTest_ConflictedController: SilverStripe\CMS\Tests\SiteTreeTest_ConflictedController + SiteTreeTest_DataObject: SilverStripe\CMS\Tests\SiteTreeTest_DataObject + SiteTreeTest_Extension: SilverStripe\CMS\Tests\SiteTreeTest_Extension + SiteTreeTest_ExtensionA: SilverStripe\CMS\Tests\SiteTreeTest_ExtensionA + SiteTreeTest_ExtensionB: SilverStripe\CMS\Tests\SiteTreeTest_ExtensionB + SiteTreeTest_LegacyControllerName: SilverStripe\CMS\Tests\SiteTreeTest_LegacyControllerName + SiteTreeTest_LegacyControllerName_Controller: SilverStripe\CMS\Tests\SiteTreeTest_LegacyControllerName_Controller + SiteTreeTest_NotRoot: SilverStripe\CMS\Tests\SiteTreeTest_NotRoot + SiteTreeTest_NullHtmlCleaner: SilverStripe\CMS\Tests\SiteTreeTest_NullHtmlCleaner + SiteTreeTest_PageNode: SilverStripe\CMS\Tests\SiteTreeTest_PageNode + SiteTreeTest_PageNodeController: SilverStripe\CMS\Tests\SiteTreeTest_PageNodeController + SiteTreeTest_StageStatusInherit: SilverStripe\CMS\Tests\SiteTreeTest_StageStatusInherit + VirtualPageTest: SilverStripe\CMS\Tests\VirtualPageTest + VirtualPageTest_ClassA: SilverStripe\CMS\Tests\VirtualPageTest_ClassA + VirtualPageTest_ClassAController: SilverStripe\CMS\Tests\VirtualPageTest_ClassAController + VirtualPageTest_ClassB: SilverStripe\CMS\Tests\VirtualPageTest_ClassB + VirtualPageTest_ClassC: SilverStripe\CMS\Tests\VirtualPageTest_ClassC + VirtualPageTest_NotRoot: SilverStripe\CMS\Tests\VirtualPageTest_NotRoot + VirtualPageTest_PageExtension: SilverStripe\CMS\Tests\VirtualPageTest_PageExtension + VirtualPageTest_PageWithAllowedChildren: SilverStripe\CMS\Tests\VirtualPageTest_PageWithAllowedChildren + VirtualPageTest_TestDBField: SilverStripe\CMS\Tests\VirtualPageTest_TestDBField + VirtualPageTest_VirtualPageSub: SilverStripe\CMS\Tests\VirtualPageTest_VirtualPageSub + CmsReportsTest: SilverStripe\CMS\Tests\CmsReportsTest + CMSMainSearchFormTest: SilverStripe\CMS\Tests\CMSMainSearchFormTest + ZZZSearchFormTest: SilverStripe\CMS\Tests\ZZZSearchFormTest + MigrateSiteTreeLinkingTaskTest: SilverStripe\CMS\Tests\MigrateSiteTreeLinkingTaskTest + RemoveOrphanedPagesTaskTest: SilverStripe\CMS\Tests\RemoveOrphanedPagesTaskTest excludedPaths: - '*/_config/legacy.yml' diff --git a/tests/php/Controllers/CMSBatchActionsTest.php b/tests/php/Controllers/CMSBatchActionsTest.php index 8196f18bb4..eb4ef5701d 100644 --- a/tests/php/Controllers/CMSBatchActionsTest.php +++ b/tests/php/Controllers/CMSBatchActionsTest.php @@ -1,5 +1,8 @@ Fixture tree * From 4f6af36369826f79e8411863a41b49136507d6cf Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Wed, 9 Aug 2017 14:53:38 +1200 Subject: [PATCH 10/11] Manual fixes to automatic namespacing --- .travis.yml | 2 +- composer.json | 6 +- phpcs.xml.dist | 4 - tests/php/Controllers/CMSBatchActionsTest.php | 5 +- tests/php/Controllers/CMSMainTest.php | 50 +++++------ tests/php/Controllers/CMSMainTest_ClassA.php | 8 +- tests/php/Controllers/CMSMainTest_ClassB.php | 6 +- .../Controllers/CMSMainTest_HiddenClass.php | 4 +- tests/php/Controllers/CMSMainTest_NotRoot.php | 6 +- .../CMSPageHistoryControllerTest.php | 8 +- .../php/Controllers/CMSSiteTreeFilterTest.php | 11 +-- tests/php/Controllers/CMSTreeTest.php | 5 +- .../ContentControllerPermissionsTest.php | 9 +- .../ContentControllerSearchExtensionTest.php | 4 +- .../php/Controllers/ContentControllerTest.php | 43 +++++----- .../php/Controllers/ContentControllerTest.yml | 8 +- .../Controllers/ContentControllerTestPage.php | 6 +- .../ContentControllerTestPageController.php | 4 +- ...entControllerTestPageWithoutController.php | 4 +- .../ContentControllerTest_Page.php | 6 +- .../ContentControllerTest_PageController.php | 4 +- .../php/Controllers/ModelAsControllerTest.php | 9 +- .../php/Controllers/RootURLControllerTest.php | 9 +- .../Controllers/SilverStripeNavigatorTest.php | 25 ++---- ...rStripeNavigatorTest_ProtectedTestItem.php | 4 +- .../SilverStripeNavigatorTest_TestItem.php | 5 +- ...tentControllerTestPageWithoutController.ss | 0 .../ContentControllerTestPage_test.ss | 0 tests/php/Model/FileLinkTrackingTest.php | 7 +- tests/php/Model/RedirectorPageTest.php | 11 +-- .../RedirectorPageTest_RedirectExtension.php | 6 +- tests/php/Model/SiteTreeActionsTest.php | 17 ++-- tests/php/Model/SiteTreeActionsTest_Page.php | 4 +- tests/php/Model/SiteTreeBacklinksTest.php | 13 +-- tests/php/Model/SiteTreeBacklinksTest_DOD.php | 5 +- tests/php/Model/SiteTreeBrokenLinksTest.php | 7 +- .../php/Model/SiteTreeHTMLEditorFieldTest.php | 17 ++-- tests/php/Model/SiteTreeLinkTrackingTest.php | 4 +- tests/php/Model/SiteTreePermissionsTest.php | 17 ++-- tests/php/Model/SiteTreeTest.php | 55 +++++------- tests/php/Model/SiteTreeTest.yml | 6 +- tests/php/Model/SiteTreeTest_AdminDenied.php | 12 +-- .../SiteTreeTest_AdminDeniedExtension.php | 5 +- tests/php/Model/SiteTreeTest_ClassA.php | 6 +- tests/php/Model/SiteTreeTest_ClassB.php | 10 ++- tests/php/Model/SiteTreeTest_ClassC.php | 6 +- tests/php/Model/SiteTreeTest_ClassCext.php | 11 +-- tests/php/Model/SiteTreeTest_ClassD.php | 14 ++-- tests/php/Model/SiteTreeTest_ClassE.php | 6 +- tests/php/Model/SiteTreeTest_Conflicted.php | 6 +- .../SiteTreeTest_ConflictedController.php | 5 +- tests/php/Model/SiteTreeTest_DataObject.php | 7 +- tests/php/Model/SiteTreeTest_Extension.php | 5 +- tests/php/Model/SiteTreeTest_ExtensionA.php | 5 +- tests/php/Model/SiteTreeTest_ExtensionB.php | 5 +- .../SiteTreeTest_LegacyControllerName.php | 6 +- ...eeTest_LegacyControllerName_Controller.php | 4 +- tests/php/Model/SiteTreeTest_NotRoot.php | 6 +- .../Model/SiteTreeTest_NullHtmlCleaner.php | 5 +- tests/php/Model/SiteTreeTest_PageNode.php | 6 +- .../Model/SiteTreeTest_PageNodeController.php | 4 +- .../Model/SiteTreeTest_StageStatusInherit.php | 7 +- tests/php/Model/VirtualPageTest.php | 84 ++++++++++++------- tests/php/Model/VirtualPageTest.yml | 4 +- tests/php/Model/VirtualPageTest_ClassA.php | 12 +-- .../VirtualPageTest_ClassAController.php | 4 +- tests/php/Model/VirtualPageTest_ClassB.php | 10 ++- tests/php/Model/VirtualPageTest_ClassC.php | 6 +- tests/php/Model/VirtualPageTest_NotRoot.php | 6 +- .../Model/VirtualPageTest_PageExtension.php | 5 +- ...irtualPageTest_PageWithAllowedChildren.php | 6 +- .../php/Model/VirtualPageTest_TestDBField.php | 5 +- .../Model/VirtualPageTest_VirtualPageSub.php | 7 +- .../Tests/Model}/VirtualPageTest_ClassA.ss | 0 tests/php/Reports/CmsReportsTest.php | 16 +--- tests/php/Search/CMSMainSearchFormTest.php | 11 +-- tests/php/Search/SearchFormTest.php | 23 ++--- .../Tasks/MigrateSiteTreeLinkingTaskTest.php | 33 +++----- .../php/Tasks/RemoveOrphanedPagesTaskTest.php | 9 +- 79 files changed, 313 insertions(+), 493 deletions(-) rename tests/php/Controllers/themes/controllertest/templates/{ => SilverStripe/CMS/Tests/Controllers}/ContentControllerTestPageWithoutController.ss (100%) rename tests/php/Controllers/themes/controllertest/templates/{ => SilverStripe/CMS/Tests/Controllers}/ContentControllerTestPage_test.ss (100%) rename tests/php/Model/themes/virtualpagetest/templates/{ => SilverStripe/CMS/Tests/Model}/VirtualPageTest_ClassA.ss (100%) diff --git a/.travis.yml b/.travis.yml index c39d558d35..9c43f4ba80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ before_script: - if [[ $BEHAT_TEST ]]; then (vendor/bin/serve --bootstrap-file tests/behat/serve-bootstrap.php &> artifacts/serve.log &); fi script: - - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit tests flush=1; fi + - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit tests/php/ flush=1; fi - if [[ $BEHAT_TEST ]]; then vendor/bin/behat @cms; fi - if [[ $NPM_TEST ]]; then git diff-files --quiet -w --relative=client; fi - if [[ $NPM_TEST ]]; then git diff -w --no-color --relative=client; fi diff --git a/composer.json b/composer.json index 9a7a0cf338..a964d82ddf 100644 --- a/composer.json +++ b/composer.json @@ -40,14 +40,16 @@ } }, "scripts": { - "lint": "phpcs -s code/ tests/" + "lint": "phpcs -s code/ tests/php/ tests/behat/src/", + "lint-clean": "phpcbf code/ tests/php/ tests/behat/src/" }, "autoload": { "psr-4": { "SilverStripe\\CMS\\": "code/", + "SilverStripe\\CMS\\Tests\\": "code/php/", "SilverStripe\\CMS\\Tests\\Behaviour\\": "tests/behat/src/" } }, "prefer-stable": true, "minimum-stability": "dev" -} \ No newline at end of file +} diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 7ea013abd4..0238f0512b 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -9,10 +9,6 @@ - - - - diff --git a/tests/php/Controllers/CMSBatchActionsTest.php b/tests/php/Controllers/CMSBatchActionsTest.php index eb4ef5701d..9a8a8363c8 100644 --- a/tests/php/Controllers/CMSBatchActionsTest.php +++ b/tests/php/Controllers/CMSBatchActionsTest.php @@ -1,7 +1,6 @@ get(CacheInterface::class . '.CMSMain_SiteTreeHints'); // Login as user with root creation privileges - $user = $this->objFromFixture('SilverStripe\\Security\\Member', 'rootedituser'); + $user = $this->objFromFixture(Member::class, 'rootedituser'); Security::setCurrentUser($user); $cache->clear(); - $rawHints = singleton('SilverStripe\\CMS\\Controllers\\CMSMain')->SiteTreeHints(); + $rawHints = singleton(CMSMain::class)->SiteTreeHints(); $this->assertNotNull($rawHints); $rawHints = preg_replace('/^"(.*)"$/', '$1', Convert::xml2raw($rawHints)); @@ -70,25 +62,25 @@ public function testSiteTreeHints() $this->assertArrayHasKey('All', $hints); $this->assertArrayHasKey( - 'CMSMainTest_ClassA', + CMSMainTest_ClassA::class, $hints['All'], 'Global list shows allowed classes' ); $this->assertArrayNotHasKey( - 'CMSMainTest_HiddenClass', + CMSMainTest_HiddenClass::class, $hints['All'], 'Global list does not list hidden classes' ); $this->assertNotContains( - 'CMSMainTest_ClassA', + CMSMainTest_ClassA::class, $hints['Root']['disallowedChildren'], 'Limits root classes' ); $this->assertContains( - 'CMSMainTest_NotRoot', + CMSMainTest_NotRoot::class, $hints['Root']['disallowedChildren'], 'Limits root classes' ); @@ -118,7 +110,7 @@ public function testChildFilter() // But it can create a ClassB $this->assertNotContains( - 'CMSMainTest_ClassB', + CMSMainTest_ClassB::class, $children, 'Limited parent omits explicitly allowed classes in disallowedChildren' ); @@ -131,7 +123,7 @@ public function testPublish() { $page1 = $this->objFromFixture(Page::class, "page1"); $page2 = $this->objFromFixture(Page::class, "page2"); - $this->session()->set('loggedInAs', $this->idFromFixture('SilverStripe\\Security\\Member', 'admin')); + $this->session()->set('loggedInAs', $this->idFromFixture(Member::class, 'admin')); $response = $this->get('admin/pages/publishall?confirm=1'); $this->assertContains( @@ -283,8 +275,8 @@ public function testCreationOfTopLevelPage() $origFollow = $this->autoFollowRedirection; $this->autoFollowRedirection = false; - $cmsUser = $this->objFromFixture('SilverStripe\\Security\\Member', 'allcmssectionsuser'); - $rootEditUser = $this->objFromFixture('SilverStripe\\Security\\Member', 'rootedituser'); + $cmsUser = $this->objFromFixture(Member::class, 'allcmssectionsuser'); + $rootEditUser = $this->objFromFixture(Member::class, 'rootedituser'); // with insufficient permissions Security::setCurrentUser($cmsUser); @@ -337,7 +329,7 @@ public function testCreationOfRestrictedPage() $origFollow = $this->autoFollowRedirection; $this->autoFollowRedirection = false; - $adminUser = $this->objFromFixture('SilverStripe\\Security\\Member', 'admin'); + $adminUser = $this->objFromFixture(Member::class, 'admin'); Security::setCurrentUser($adminUser); // Create toplevel page @@ -346,7 +338,7 @@ public function testCreationOfRestrictedPage() 'admin/pages/add/AddForm', array( 'ParentID' => '0', - 'PageType' => 'CMSMainTest_ClassA', + 'PageType' => CMSMainTest_ClassA::class, 'Locale' => 'en_US', 'action_doAdd' => 1, 'ajax' => 1 @@ -366,7 +358,7 @@ public function testCreationOfRestrictedPage() 'admin/pages/add/AddForm', array( 'ParentID' => $newPageId, - 'PageType' => 'CMSMainTest_ClassB', + 'PageType' => CMSMainTest_ClassB::class, 'Locale' => 'en_US', 'action_doAdd' => 1, 'ajax' => 1 @@ -412,7 +404,7 @@ public function testBreadcrumbs() { $page3 = $this->objFromFixture(Page::class, 'page3'); $page31 = $this->objFromFixture(Page::class, 'page31'); - $adminuser = $this->objFromFixture('SilverStripe\\Security\\Member', 'admin'); + $adminuser = $this->objFromFixture(Member::class, 'admin'); Security::setCurrentUser($adminuser); $response = $this->get('admin/pages/edit/show/' . $page31->ID); @@ -572,17 +564,17 @@ public function testChangeClass() $page->write(); $form = $cms->getEditForm($page->ID); - $form->loadDataFrom(['ClassName' => 'CMSMainTest_ClassB']); + $form->loadDataFrom(['ClassName' => CMSMainTest_ClassB::class]); $result = $cms->save([ 'ID' => $page->ID, - 'ClassName' => 'CMSMainTest_ClassB' + 'ClassName' => CMSMainTest_ClassB::class ], $form); $this->assertEquals(200, $result->getStatusCode()); $newPage = SiteTree::get()->byID($page->ID); - $this->assertInstanceOf('CMSMainTest_ClassB', $newPage); - $this->assertEquals('CMSMainTest_ClassB', $newPage->ClassName); + $this->assertInstanceOf(CMSMainTest_ClassB::class, $newPage); + $this->assertEquals(CMSMainTest_ClassB::class, $newPage->ClassName); $this->assertEquals('Class A', $newPage->Title); } } diff --git a/tests/php/Controllers/CMSMainTest_ClassA.php b/tests/php/Controllers/CMSMainTest_ClassA.php index b575155749..9f50773992 100644 --- a/tests/php/Controllers/CMSMainTest_ClassA.php +++ b/tests/php/Controllers/CMSMainTest_ClassA.php @@ -1,16 +1,16 @@ ID; $deletedPage->delete(); $deletedPage = Versioned::get_one_by_stage( - 'SilverStripe\\CMS\\Model\\SiteTree', + SiteTree::class, 'Live', array('"SiteTree_Live"."ID"' => $deletedPageID) ); @@ -130,7 +127,7 @@ public function testStatusDraftPagesFilter() { $draftPage = $this->objFromFixture('Page', 'page4'); $draftPage = Versioned::get_one_by_stage( - 'SilverStripe\\CMS\\Model\\SiteTree', + SiteTree::class, 'Stage', sprintf('"SiteTree"."ID" = %d', $draftPage->ID) ); @@ -168,7 +165,7 @@ public function testStatusRemovedFromDraftFilter() $removedDraftPage->publishRecursive(); $removedDraftPage->deleteFromStage('Stage'); $removedDraftPage = Versioned::get_one_by_stage( - 'SilverStripe\\CMS\\Model\\SiteTree', + SiteTree::class, 'Live', sprintf('"SiteTree"."ID" = %d', $removedDraftPage->ID) ); diff --git a/tests/php/Controllers/CMSTreeTest.php b/tests/php/Controllers/CMSTreeTest.php index 477e55f570..7462e82d61 100644 --- a/tests/php/Controllers/CMSTreeTest.php +++ b/tests/php/Controllers/CMSTreeTest.php @@ -1,14 +1,11 @@ ParentID = $parentID; - $page->Title = "Page Level $i"; + $page->Title = "Page Level $i"; $page->URLSegment = "level-$i"; $page->write(); @@ -159,13 +152,11 @@ public function testLinkShortcodes() /** * Tests that {@link ContentController::getViewer()} chooses the correct templates. * - * @covers SilverStripe\CMS\Controllers\ContentController::getViewer() - **/ + * @covers \SilverStripe\CMS\Controllers\ContentController::getViewer() + **/ public function testGetViewer() { - - $self = $this; - $this->useTestTheme(dirname(__FILE__), 'controllertest', function () use ($self) { + $this->useTestTheme(__DIR__, 'controllertest', function () { // Test a page without a controller (ContentControllerTest_PageWithoutController.ss) $page = new ContentControllerTestPageWithoutController(); @@ -173,8 +164,8 @@ public function testGetViewer() $page->write(); $page->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE); - $response = $self->get($page->RelativeLink()); - $self->assertEquals("ContentControllerTestPageWithoutController", trim($response->getBody())); + $response = $this->get($page->RelativeLink()); + $this->assertEquals("ContentControllerTestPageWithoutController", trim($response->getBody())); // // This should fall over to user Page.ss $page = new ContentControllerTestPage(); @@ -182,8 +173,8 @@ public function testGetViewer() $page->write(); $page->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE); - $response = $self->get($page->RelativeLink()); - $self->assertEquals("Page", trim($response->getBody())); + $response = $this->get($page->RelativeLink()); + $this->assertEquals("Page", trim($response->getBody())); // Test that the action template is rendered. @@ -192,20 +183,24 @@ public function testGetViewer() $page->write(); $page->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE); - $response = $self->get($page->RelativeLink("test")); - $self->assertEquals("ContentControllerTestPage_test", trim($response->getBody())); + $response = $this->get($page->RelativeLink("test")); + $this->assertEquals("ContentControllerTestPage_test", trim($response->getBody())); // Test that an action without a template will default to the index template, which is // to say the default Page.ss template - $response = $self->get($page->RelativeLink("testwithouttemplate")); - $self->assertEquals("Page", trim($response->getBody())); + $response = $this->get($page->RelativeLink("testwithouttemplate")); + $this->assertEquals("Page", trim($response->getBody())); // Test that an action with a template will render the both action template *and* the // correct parent template $controller = new ContentController($page); $viewer = $controller->getViewer('test'); - $templateList = array('ContentControllerTestPage_test', 'Page'); - $self->assertEquals(dirname(__FILE__).'/themes/controllertest/templates/ContentControllerTestPage_test.ss', $viewer->templates()['main']); + $this->assertEquals( + __DIR__ + . '/themes/controllertest/templates/SilverStripe/CMS/Tests/Controllers/' + . 'ContentControllerTestPage_test.ss', + $viewer->templates()['main'] + ); }); } } diff --git a/tests/php/Controllers/ContentControllerTest.yml b/tests/php/Controllers/ContentControllerTest.yml index dd65c4c3d2..d317dc76d7 100644 --- a/tests/php/Controllers/ContentControllerTest.yml +++ b/tests/php/Controllers/ContentControllerTest.yml @@ -21,22 +21,22 @@ SilverStripe\Security\Member: Surname: Administrator Groups: =>SilverStripe\Security\Group.admins -ContentControllerTest_Page: +SilverStripe\CMS\Tests\Controllers\ContentControllerTest_Page: root_page: Title: Home Page URLSegment: home second_level_page: Title: Second Level Page URLSegment: second-level - Parent: =>ContentControllerTest_Page.root_page + Parent: =>SilverStripe\CMS\Tests\Controllers\ContentControllerTest_Page.root_page third_level_page: Title: Third Level Page URLSegment: third-level - Parent: =>ContentControllerTest_Page.second_level_page + Parent: =>SilverStripe\CMS\Tests\Controllers\ContentControllerTest_Page.second_level_page third_level_page_2: Title: Third Level Page Two URLSegment: third-level-2 - Parent: =>ContentControllerTest_Page.second_level_page + Parent: =>SilverStripe\CMS\Tests\Controllers\ContentControllerTest_Page.second_level_page contact_page: Title: Contact Page URLSegment: contact diff --git a/tests/php/Controllers/ContentControllerTestPage.php b/tests/php/Controllers/ContentControllerTestPage.php index 70b28c7506..0c67a3b750 100644 --- a/tests/php/Controllers/ContentControllerTestPage.php +++ b/tests/php/Controllers/ContentControllerTestPage.php @@ -1,13 +1,11 @@ assertContains( - 'SilverStripeNavigatorTest_TestItem', + SilverStripeNavigatorTest_TestItem::class, $classes, 'Autodiscovers new classes' ); @@ -54,11 +41,11 @@ public function testCanView() $this->logInWithPermission('CMS_ACCESS_CMSMain'); $items = $navigator->getItems(); $classes = array_map('get_class', $items->toArray()); - $this->assertNotContains('SilverStripeNavigatorTest_ProtectedTestItem', $classes); + $this->assertNotContains(SilverStripeNavigatorTest_ProtectedTestItem::class, $classes); $this->logInWithPermission('ADMIN'); $items = $navigator->getItems(); $classes = array_map('get_class', $items->toArray()); - $this->assertContains('SilverStripeNavigatorTest_ProtectedTestItem', $classes); + $this->assertContains(SilverStripeNavigatorTest_ProtectedTestItem::class, $classes); } } diff --git a/tests/php/Controllers/SilverStripeNavigatorTest_ProtectedTestItem.php b/tests/php/Controllers/SilverStripeNavigatorTest_ProtectedTestItem.php index a95d407ac4..0343a1019d 100644 --- a/tests/php/Controllers/SilverStripeNavigatorTest_ProtectedTestItem.php +++ b/tests/php/Controllers/SilverStripeNavigatorTest_ProtectedTestItem.php @@ -1,14 +1,12 @@ objFromFixture(RedirectorPage::class, 'goodinternal'); - RedirectorPageController::add_extension('RedirectorPageTest_RedirectExtension'); + RedirectorPageController::add_extension(RedirectorPageTest_RedirectExtension::class); $response = $this->get($page->regularLink()); $this->assertEquals(302, $response->getStatusCode()); $this->assertEquals('http://www.mysite.com/foo', $response->getHeader('Location')); - RedirectorPageController::remove_extension('RedirectorPageTest_RedirectExtension'); + RedirectorPageController::remove_extension(RedirectorPageTest_RedirectExtension::class); } public function testNoJSLinksAllowed() diff --git a/tests/php/Model/RedirectorPageTest_RedirectExtension.php b/tests/php/Model/RedirectorPageTest_RedirectExtension.php index c2bb79ce20..6af5e2af23 100644 --- a/tests/php/Model/RedirectorPageTest_RedirectExtension.php +++ b/tests/php/Model/RedirectorPageTest_RedirectExtension.php @@ -1,16 +1,12 @@ owner->redirect('/foo'); diff --git a/tests/php/Model/SiteTreeActionsTest.php b/tests/php/Model/SiteTreeActionsTest.php index 8484f2518b..08aa185ce5 100644 --- a/tests/php/Model/SiteTreeActionsTest.php +++ b/tests/php/Model/SiteTreeActionsTest.php @@ -1,18 +1,14 @@ objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'home'); + $sitetree = $this->objFromFixture(SiteTree::class, 'home'); $editor = new HTMLEditorField('Content'); - $aboutID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'about'); - $contactID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'contact'); + $aboutID = $this->idFromFixture(SiteTree::class, 'about'); + $contactID = $this->idFromFixture(SiteTree::class, 'contact'); $editor->setValue("Example Link"); $editor->saveInto($sitetree); @@ -82,7 +79,7 @@ public function testLinkTracking() public function testFileLinkTracking() { - $sitetree = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'home'); + $sitetree = $this->objFromFixture(SiteTree::class, 'home'); $editor = new HTMLEditorField('Content'); $fileID = $this->idFromFixture('SilverStripe\\Assets\\File', 'example_file'); @@ -143,7 +140,7 @@ public function testImageInsertion() public function testImageTracking() { - $sitetree = $this->objFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'home'); + $sitetree = $this->objFromFixture(SiteTree::class, 'home'); $editor = new HTMLEditorField('Content'); $file = $this->objFromFixture('SilverStripe\\Assets\\Image', 'example_image'); @@ -180,7 +177,7 @@ public function testBrokenSiteTreeLinkTracking() $editor->setValue(sprintf( '

Working Link

', - $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'home') + $this->idFromFixture(SiteTree::class, 'home') )); $sitetree->HasBrokenLink = false; $editor->saveInto($sitetree); diff --git a/tests/php/Model/SiteTreeLinkTrackingTest.php b/tests/php/Model/SiteTreeLinkTrackingTest.php index 5eeb34c0e0..8363af5229 100644 --- a/tests/php/Model/SiteTreeLinkTrackingTest.php +++ b/tests/php/Model/SiteTreeLinkTrackingTest.php @@ -1,7 +1,6 @@ setParent($parent); - $this->assertInstanceOf('SiteTreeTest_PageNode', $child->Parent); + $this->assertInstanceOf(SiteTreeTest_PageNode::class, $child->Parent); } /** @@ -641,7 +628,7 @@ public function testCreatePermissions() $this->assertTrue(singleton(SiteTree::class)->canCreate(null, array('Parent' => singleton(SiteTree::class)))); //Test we don't check for allowedChildren on parent context if it's not SiteTree instance - $this->assertTrue(singleton(SiteTree::class)->canCreate(null, ['Parent' => $this->objFromFixture('SiteTreeTest_DataObject', 'relations')])); + $this->assertTrue(singleton(SiteTree::class)->canCreate(null, ['Parent' => $this->objFromFixture(SiteTreeTest_DataObject::class, 'relations')])); } public function testEditPermissionsOnDraftVsLive() @@ -696,7 +683,7 @@ public function testCompareVersions() { // Necessary to avoid $oldCleanerClass = Diff::$html_cleaner_class; - Diff::$html_cleaner_class = 'SiteTreeTest_NullHtmlCleaner'; + Diff::$html_cleaner_class = SiteTreeTest_NullHtmlCleaner::class; $page = new Page(); $page->write(); @@ -953,7 +940,7 @@ public function testValidURLSegmentControllerConflicts() Config::modify()->set(SiteTree::class, 'nested_urls', true); $sitetree = new SiteTree(); - $sitetree->ParentID = $this->idFromFixture('SiteTreeTest_Conflicted', 'parent'); + $sitetree->ParentID = $this->idFromFixture(SiteTreeTest_Conflicted::class, 'parent'); $sitetree->URLSegment = 'index'; $this->assertFalse($sitetree->validURLSegment(), 'index is not a valid URLSegment'); @@ -974,11 +961,11 @@ public function testURLSegmentPrioritizesExtensionVotes() $sitetree->URLSegment = 'unique-segment'; $this->assertTrue($sitetree->validURLSegment()); - SiteTree::add_extension('SiteTreeTest_Extension'); + SiteTree::add_extension(SiteTreeTest_Extension::class); $sitetree = new SiteTree(); $sitetree->URLSegment = 'unique-segment'; $this->assertFalse($sitetree->validURLSegment()); - SiteTree::remove_extension('SiteTreeTest_Extension'); + SiteTree::remove_extension(SiteTreeTest_Extension::class); } public function testURLSegmentMultiByte() @@ -1430,6 +1417,6 @@ public function testGetControllerName() public function testGetControllerNameWithUnderscoresIsSupported() { $class = new SiteTreeTest_LegacyControllerName; - $this->assertSame('SiteTreeTest_LegacyControllerName_Controller', $class->getControllerName()); + $this->assertEquals(SiteTreeTest_LegacyControllerName_Controller::class, $class->getControllerName()); } } diff --git a/tests/php/Model/SiteTreeTest.yml b/tests/php/Model/SiteTreeTest.yml index 68a4fff6d7..3b570f3bb8 100755 --- a/tests/php/Model/SiteTreeTest.yml +++ b/tests/php/Model/SiteTreeTest.yml @@ -113,7 +113,7 @@ Page: Title: 'Breadcrumbs 5' Parent: =>Page.breadcrumbs4 -SiteTreeTest_Conflicted: +SilverStripe\CMS\Tests\Model\SiteTreeTest_Conflicted: parent: Title: Parent @@ -124,7 +124,7 @@ SilverStripe\CMS\Model\RedirectorPage: RedirectionType: External ExternalURL: "http://www.google.com?a&b" -SiteTreeTest_DataObject: +SilverStripe\CMS\Tests\Model\SiteTreeTest_DataObject: relations: Title: 'Linked DataObject' - Pages: =>Page.home,=>Page.about,=>Page.staff \ No newline at end of file + Pages: =>Page.home,=>Page.about,=>Page.staff diff --git a/tests/php/Model/SiteTreeTest_AdminDenied.php b/tests/php/Model/SiteTreeTest_AdminDenied.php index 450cb470ff..7b50ccf1df 100644 --- a/tests/php/Model/SiteTreeTest_AdminDenied.php +++ b/tests/php/Model/SiteTreeTest_AdminDenied.php @@ -1,15 +1,15 @@ array('SiteTreeSubsites', 'Translatable'), + SiteTree::class => [ + 'SiteTreeSubsites', + 'Translatable' + ], ); protected static $required_extensions = array( - SiteTree::class => array('VirtualPageTest_PageExtension') + SiteTree::class => [ + VirtualPageTest_PageExtension::class + ] ); public function setUp() @@ -47,7 +53,11 @@ public function setUp() // Add extra fields Config::modify()->merge(VirtualPage::class, 'initially_copied_fields', array('MyInitiallyCopiedField')); - Config::modify()->merge(VirtualPage::class, 'non_virtual_fields', array('MyNonVirtualField', 'MySharedNonVirtualField')); + Config::modify()->merge( + VirtualPage::class, + 'non_virtual_fields', + array('MyNonVirtualField', 'MySharedNonVirtualField') + ); } /** @@ -81,6 +91,7 @@ public function testPublishingSourcePagePublishesAlreadyPublishedVirtualPages() { $this->logInWithPermission('ADMIN'); + /** @var Page $master */ $master = $this->objFromFixture('Page', 'master'); $master->publishRecursive(); @@ -89,7 +100,9 @@ public function testPublishingSourcePagePublishesAlreadyPublishedVirtualPages() $master->Content = "

New content

"; $master->write(); + /** @var VirtualPage $vp1 */ $vp1 = DataObject::get_by_id(VirtualPage::class, $this->idFromFixture(VirtualPage::class, 'vp1')); + /** @var VirtualPage $vp2 */ $vp2 = DataObject::get_by_id(VirtualPage::class, $this->idFromFixture(VirtualPage::class, 'vp2')); $this->assertTrue($vp1->publishRecursive()); $this->assertTrue($vp2->publishRecursive()); @@ -222,6 +235,7 @@ public function testCanView() /** @var Page $parentPage */ $parentPage = $this->objFromFixture('Page', 'master3'); $parentPage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE); + /** @var VirtualPage $virtualPage */ $virtualPage = $this->objFromFixture(VirtualPage::class, 'vp3'); $virtualPage->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE); $cindy = $this->objFromFixture(Member::class, 'cindy'); @@ -310,10 +324,8 @@ public function testUnpublishingSourcePageOfAVirtualPageAlsoUnpublishesVirtualPa $vp->flushCache(); $vp = DataObject::get_by_id(SiteTree::class, $vpID); $this->assertEquals($p->ID, $vp->CopyContentFromID); - - $vpLive = Versioned::get_one_by_stage(SiteTree::class, Versioned::LIVE, '"SiteTree"."ID" = ' . $vpID); + $vpLive = Versioned::get_by_stage(SiteTree::class, Versioned::LIVE)->byID($vpID); $this->assertNull($vpLive); - // Delete from draft, ensure virtual page deletion cascades $p->delete(); $vp->flushCache(); @@ -336,7 +348,6 @@ public function testDeletingFromLiveSourcePageOfAVirtualPageAlsoUnpublishesVirtu // All is fine, the virtual page doesn't have a broken link $this->assertFalse($vp->HasBrokenLink); - // Delete the source page from draft, cascades to virtual page $pID = $p->ID; $p->delete(); @@ -344,8 +355,8 @@ public function testDeletingFromLiveSourcePageOfAVirtualPageAlsoUnpublishesVirtu $vpDraft = Versioned::get_by_stage(SiteTree::class, Versioned::DRAFT) ->byID($pID); $this->assertNull($vpDraft); - // Delete the source page form live, confirm that the virtual page has also been unpublished + /** @var Page $pLive */ $pLive = Versioned::get_by_stage(SiteTree::class, Versioned::LIVE) ->byID($pID); $this->assertTrue($pLive->doUnpublish()); @@ -485,14 +496,19 @@ public function testPageTypeChangePropagatesToLive() $nonVirtual = $virtual; - $nonVirtual->ClassName = 'VirtualPageTest_ClassA'; + $nonVirtual->ClassName = VirtualPageTest_ClassA::class; $nonVirtual->MySharedNonVirtualField = 'changed on new type'; $nonVirtual->write(); // not publishing the page type change here // Stage record is changed to the new type and no longer acts as a virtual page - $nonVirtualStage = Versioned::get_one_by_stage(SiteTree::class, 'Stage', '"SiteTree"."ID" = ' . $nonVirtual->ID, false); + $nonVirtualStage = Versioned::get_one_by_stage( + SiteTree::class, + 'Stage', + '"SiteTree"."ID" = ' . $nonVirtual->ID, + false + ); $this->assertNotNull($nonVirtualStage); - $this->assertEquals('VirtualPageTest_ClassA', $nonVirtualStage->ClassName); + $this->assertEquals(VirtualPageTest_ClassA::class, $nonVirtualStage->ClassName); $this->assertEquals('changed on new type', $nonVirtualStage->MySharedNonVirtualField); $this->assertEquals( 'original', @@ -501,9 +517,14 @@ public function testPageTypeChangePropagatesToLive() ); // Virtual page on live keeps working as it should - $virtualLive = Versioned::get_one_by_stage(SiteTree::class, Versioned::LIVE, '"SiteTree_Live"."ID" = ' . $virtual->ID, false); + $virtualLive = Versioned::get_one_by_stage( + SiteTree::class, + Versioned::LIVE, + '"SiteTree_Live"."ID" = ' . $virtual->ID, + false + ); $this->assertNotNull($virtualLive); - $this->assertEquals('VirtualPageTest_VirtualPageSub', $virtualLive->ClassName); + $this->assertEquals(VirtualPageTest_VirtualPageSub::class, $virtualLive->ClassName); $this->assertEquals('virtual published field', $virtualLive->MySharedNonVirtualField); $this->assertEquals('published title', $virtualLive->Title); @@ -514,7 +535,12 @@ public function testPageTypeChangePropagatesToLive() $page->copyVersionToStage(Versioned::DRAFT, Versioned::LIVE); // Virtual page only notices changes to virtualised fields (Title) - $virtualLive = Versioned::get_one_by_stage(SiteTree::class, Versioned::LIVE, '"SiteTree_Live"."ID" = ' . $virtual->ID, false); + $virtualLive = Versioned::get_one_by_stage( + SiteTree::class, + Versioned::LIVE, + '"SiteTree_Live"."ID" = ' . $virtual->ID, + false + ); $this->assertEquals('virtual published field', $virtualLive->MySharedNonVirtualField); $this->assertEquals('title changed on original', $virtualLive->Title); } @@ -528,7 +554,7 @@ public function testVirtualPageFindsCorrectCasting() $virtual->CopyContentFromID = $page->ID; $virtual->write(); - $this->assertEquals('VirtualPageTest_TestDBField', $virtual->castingHelper('CastingTest')); + $this->assertEquals(VirtualPageTest_TestDBField::class, $virtual->castingHelper('CastingTest')); $this->assertEquals('SOME CONTENT', $virtual->obj('CastingTest')->forTemplate()); } @@ -611,10 +637,11 @@ public function testVirtualPageRendersCorrectTemplate() public function testMethod() { + /** @var VirtualPage $virtualPage */ $virtualPage = $this->objFromFixture(VirtualPage::class, 'vp4'); + /** @var VirtualPageTest_ClassAController $controller */ $controller = ModelAsController::controller_for($virtualPage); - - $this->assertInstanceOf('VirtualPageTest_ClassAController', $controller); + $this->assertInstanceOf(VirtualPageTest_ClassAController::class, $controller); $this->assertTrue($controller->hasMethod('testMethod')); $this->assertEquals('hello', $controller->testMethod()); $this->assertTrue($controller->hasMethod('modelMethod')); @@ -623,6 +650,7 @@ public function testMethod() public function testAllowedActions() { + /** @var VirtualPage $virtualPage */ $virtualPage = $this->objFromFixture(VirtualPage::class, 'vp4'); $controller = ModelAsController::controller_for($virtualPage); $this->assertContains('testaction', $controller->allowedActions()); diff --git a/tests/php/Model/VirtualPageTest.yml b/tests/php/Model/VirtualPageTest.yml index 75a8294608..59571e47ca 100644 --- a/tests/php/Model/VirtualPageTest.yml +++ b/tests/php/Model/VirtualPageTest.yml @@ -45,7 +45,7 @@ Page: CanEditType: OnlyTheseUsers CanViewType: Inherit EditorGroups: =>SilverStripe\Security\Group.bobgroup -VirtualPageTest_ClassA: +SilverStripe\CMS\Tests\Model\VirtualPageTest_ClassA: pagea: Title: 'Page A' Content: '

Content

' @@ -66,5 +66,5 @@ SilverStripe\CMS\Model\VirtualPage: EditorGroups: =>SilverStripe\Security\Group.andrewgroup ViewerGroups: =>SilverStripe\Security\Group.cindygroup vp4: - CopyContentFrom: =>VirtualPageTest_ClassA.pagea + CopyContentFrom: =>SilverStripe\CMS\Tests\Model\VirtualPageTest_ClassA.pagea Title: 'vp4' diff --git a/tests/php/Model/VirtualPageTest_ClassA.php b/tests/php/Model/VirtualPageTest_ClassA.php index 6b20e99816..3c11298e0a 100644 --- a/tests/php/Model/VirtualPageTest_ClassA.php +++ b/tests/php/Model/VirtualPageTest_ClassA.php @@ -1,22 +1,24 @@ 'Text', 'MyVirtualField' => 'Text', 'MyNonVirtualField' => 'Text', - 'CastingTest' => 'VirtualPageTest_TestDBField' + 'CastingTest' => VirtualPageTest_TestDBField::class, ); - private static $allowed_children = array('VirtualPageTest_ClassB'); + private static $allowed_children = [ + VirtualPageTest_ClassB::class, + ]; public function modelMethod() { diff --git a/tests/php/Model/VirtualPageTest_ClassAController.php b/tests/php/Model/VirtualPageTest_ClassAController.php index 3a386e9a30..578d9db321 100644 --- a/tests/php/Model/VirtualPageTest_ClassAController.php +++ b/tests/php/Model/VirtualPageTest_ClassAController.php @@ -1,12 +1,10 @@ 'Varchar', ); diff --git a/tests/php/Model/themes/virtualpagetest/templates/VirtualPageTest_ClassA.ss b/tests/php/Model/themes/virtualpagetest/templates/SilverStripe/CMS/Tests/Model/VirtualPageTest_ClassA.ss similarity index 100% rename from tests/php/Model/themes/virtualpagetest/templates/VirtualPageTest_ClassA.ss rename to tests/php/Model/themes/virtualpagetest/templates/SilverStripe/CMS/Tests/Model/VirtualPageTest_ClassA.ss diff --git a/tests/php/Reports/CmsReportsTest.php b/tests/php/Reports/CmsReportsTest.php index 7ff83d92a5..03a8437dc7 100644 --- a/tests/php/Reports/CmsReportsTest.php +++ b/tests/php/Reports/CmsReportsTest.php @@ -1,7 +1,6 @@ session()->set('loggedInAs', $this->idFromFixture('SilverStripe\\Security\\Member', 'admin')); + $this->session()->set('loggedInAs', $this->idFromFixture(Member::class, 'admin')); $response = $this->get( 'admin/pages/SearchForm/?' . diff --git a/tests/php/Search/SearchFormTest.php b/tests/php/Search/SearchFormTest.php index 756ef4719d..617860afe3 100644 --- a/tests/php/Search/SearchFormTest.php +++ b/tests/php/Search/SearchFormTest.php @@ -1,30 +1,25 @@ idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'home'); - $aboutID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'about'); - $staffID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'staff'); - $actionID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'action'); - $hashID = $this->idFromFixture('SilverStripe\\CMS\\Model\\SiteTree', 'hash_link'); + $homeID = $this->idFromFixture(SiteTree::class, 'home'); + $aboutID = $this->idFromFixture(SiteTree::class, 'about'); + $staffID = $this->idFromFixture(SiteTree::class, 'staff'); + $actionID = $this->idFromFixture(SiteTree::class, 'action'); + $hashID = $this->idFromFixture(SiteTree::class, 'hash_link'); $homeContent = sprintf( 'AboutStaffExternal Link', @@ -67,25 +60,25 @@ public function testLinkingMigration() $this->assertEquals( $homeContent, - DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $homeID)->Content, + DataObject::get_by_id(SiteTree::class, $homeID)->Content, 'HTML URLSegment links are rewritten.' ); $this->assertEquals( $aboutContent, - DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $aboutID)->Content + DataObject::get_by_id(SiteTree::class, $aboutID)->Content ); $this->assertEquals( $staffContent, - DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $staffID)->Content + DataObject::get_by_id(SiteTree::class, $staffID)->Content ); $this->assertEquals( $actionContent, - DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $actionID)->Content, + DataObject::get_by_id(SiteTree::class, $actionID)->Content, 'Links to actions on pages are rewritten correctly.' ); $this->assertEquals( $hashLinkContent, - DataObject::get_by_id('SilverStripe\\CMS\\Model\\SiteTree', $hashID)->Content, + DataObject::get_by_id(SiteTree::class, $hashID)->Content, 'Hash/anchor links are correctly handled.' ); } diff --git a/tests/php/Tasks/RemoveOrphanedPagesTaskTest.php b/tests/php/Tasks/RemoveOrphanedPagesTaskTest.php index ba935e437d..22577d7110 100644 --- a/tests/php/Tasks/RemoveOrphanedPagesTaskTest.php +++ b/tests/php/Tasks/RemoveOrphanedPagesTaskTest.php @@ -1,13 +1,10 @@ Fixture tree * @@ -35,13 +32,9 @@ * * * @author Ingo Schommer (@silverstripe.com), SilverStripe Ltd. - * - * @package cms - * @subpackage tests */ class RemoveOrphanedPagesTaskTest extends FunctionalTest { - protected static $fixture_file = 'RemoveOrphanedPagesTaskTest.yml'; protected static $use_draft_site = false; From d469a2dc8832d821296bb40767958d8706488bd7 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Tue, 15 Aug 2017 11:05:56 +1200 Subject: [PATCH 11/11] Fix regressions from tinymce upgrade (#1923) --- tests/behat/features/insert-a-link.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/behat/features/insert-a-link.feature b/tests/behat/features/insert-a-link.feature index 925fe494a9..bb6fd6c055 100644 --- a/tests/behat/features/insert-a-link.feature +++ b/tests/behat/features/insert-a-link.feature @@ -52,7 +52,7 @@ So that I can link to a external website or a page on my site When I fill in "http://silverstripe.org" for "URL" And I check "Open in new window/tab" And I press the "Insert" button - Then the "Content" HTML field should contain "awesome" + Then the "Content" HTML field should contain "awesome" # Required to avoid "unsaved changes" browser dialog Then I press the "Save draft" button
<% _t('SilverStripe\CMS\Model\SiteTreeFileExtension.TITLE_INDEX', '#') %><% _t('SilverStripe\CMS\Model\SiteTreeFileExtension.TITLE_USED_ON', 'Used on') %><% _t('SilverStripe\CMS\Model\SiteTreeFileExtension.TITLE_TYPE', 'Type') %><%t SilverStripe\CMS\Model\SiteTreeFileExtension.TITLE_INDEX '#' %><%t SilverStripe\CMS\Model\SiteTreeFileExtension.TITLE_USED_ON 'Used on' %><%t SilverStripe\CMS\Model\SiteTreeFileExtension.TITLE_TYPE 'Type' %>