From 66bfff4d150ce5a6544ff5a21c2644c1469a1761 Mon Sep 17 00:00:00 2001 From: Loz Calver Date: Thu, 3 Oct 2013 11:25:05 +0100 Subject: [PATCH 1/4] FIX Don't validate pages when restoring or reverting (fixes #2449) Use new method --- code/controllers/CMSMain.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php index 290da5fd..237464ff 100644 --- a/code/controllers/CMSMain.php +++ b/code/controllers/CMSMain.php @@ -634,6 +634,8 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr $form->addExtraClass('center ' . $this->BaseCSSClasses()); // if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet'); $form->setAttribute('data-pjax-fragment', 'CurrentForm'); + // Set validation exemptions for specific actions + $form->setValidationExemptActions(array('restore', 'revert', 'deletefromlive', 'rollback')); // Announce the capability so the frontend can decide whether to allow preview or not. if(in_array('CMSPreviewable', class_implements($record))) { From 6a8de3090c7ee638ca3b6c9c35128f9db4abb09a Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 8 Oct 2013 11:37:43 +0200 Subject: [PATCH 2/4] Updated Te Reo translations --- javascript/lang/mi_NZ.js | 14 +++++++++----- lang/mi.yml | 35 +++++++++++++++++++++++++++++++++-- 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/javascript/lang/mi_NZ.js b/javascript/lang/mi_NZ.js index 7bd03522..69f237b2 100644 --- a/javascript/lang/mi_NZ.js +++ b/javascript/lang/mi_NZ.js @@ -28,12 +28,16 @@ if(typeof(ss) == 'undefined' || typeof(ss.i18n) == 'undefined') { 'WidgetAreaEditor.TOOMANY': 'Aroha noa, kua taea te mōrahi o ngā taupānga iti i tēnei wāhi', 'AssetAdmin.ConfirmDelete': 'Kei te tino hiahia muku i tēnei kōpaki me ngā kōnae i roto?', 'Folder.Name': 'Ingoa kōpaki', - 'URLSEGMENT.Edit': 'Whakatika', - 'URLSEGMENT.OK': 'Tiaki', - 'URLSEGMENT.Cancel': 'Whakakore', - 'Tree.AddSubPage': 'Tāpiritia he whārangi hōu ki konei', + 'Tree.AddSubPage': 'Tāpiri whārangi hou ki konei', + 'Tree.Duplicate': 'Tārite', 'Tree.EditPage': 'Whakatika', + 'Tree.ThisPageOnly': 'Tēnei whārangi anake', + 'Tree.ThisPageAndSubpages': 'Tēnei whārangi me ngā whārangi iti', + 'Tree.ShowAsList': 'Whakaatu tamariki hei rārangi', 'CMSMain.ConfirmRestoreFromLive': "Kei te tino hiahia tārua i te ihirangi kua whakaputaina ki te pae hukihuki?", - 'CMSMain.RollbackToVersion': "Kei te tino hiahia hoki ki te tauira #%s o tēnei whārangi?" + 'CMSMain.RollbackToVersion': "Kei te tino hiahia hoki ki te tauira #%s o tēnei whārangi?", + 'URLSEGMENT.Edit': 'Whakatika', + 'URLSEGMENT.OK': 'ĀE', + 'URLSEGMENT.Cancel': 'Whakakore' }); } \ No newline at end of file diff --git a/lang/mi.yml b/lang/mi.yml index 64c4f75d..5685bb5a 100644 --- a/lang/mi.yml +++ b/lang/mi.yml @@ -5,11 +5,12 @@ mi: AppCategoryArchive: Puranga AppCategoryAudio: Ororongo AppCategoryDocument: Tuhinga + AppCategoryFlash: Kohiko AppCategoryImage: Atahanga AppCategoryVideo: Ataata BackToFolder: 'Hoki ki te kōpaki' CREATED: Rā - CurrentFolderOnly: 'Ka whakatiki ki te kōpaki o nāianei?' + CurrentFolderOnly: 'Me whakatiki ki te kōpaki o nāianei?' DetailsView: Ngā Taipitopito FILES: Ngā Kōnae FILESYSTEMSYNC: 'Tukutahi kōnae' @@ -56,7 +57,7 @@ mi: ReasonDropdownRPBROKENLINK: 'Whārangi tuku anō e tohu ana ki te whārangi kāore i reira' ReasonDropdownVPBROKENLINK: 'Whārangi mariko e tohu ana ki te whārangi kāore i reira' RedirectorNonExistent: 'Whārangi tuku anō e tohu ana ki te whārangi kāore i reira' - VirtualPageNonExistent: 'Whārangi mariko e tohu ana ki te whārangi kāore i reira' + VirtualPageNonExistent: 'whārangi mariko e tohu ana ki te whārangi kāore i reira' CMSAddPageController: Title: 'Tāpiri whārangi' CMSBatchActions: @@ -79,6 +80,8 @@ mi: DELETE: 'Mukua te hukihuki' DELETEFP: Muku DESCREMOVED: 'me ngā uri {count}' + DUPLICATED: 'I momoho te tārite i ''{title}''' + DUPLICATEDWITHCHILDREN: 'I momoho te tārite i ''{title}'' me ngā tamariki' EMAIL: Īmēra EditTree: 'Whakatika Rākau' ListFiltered: 'Rārangi kua tātaritia' @@ -92,18 +95,23 @@ mi: PUBALLFUN2: "Ko te pēhi i tēnei pātene he taurite ki te haere ki ia whārangi me te pēhi i te \"whakaputaina\". Ko te tikanga, ka whakamahia tēnei pātene i muri ake i te mahi whakatikatika kua maha ngā tinihanga, pērā i te wā i hangaia tuatahi mai te pae. " PUBPAGES: 'Kua oti: I whakaputaina ngā whārangi {count}' PageAdded: 'I momoho te hanga whārangi' + REMOVED: 'I mukua te ''{title}''{description} i te pae ora' REMOVEDPAGE: 'I tango te ''{title}'' i te pae kua whakaputaina' REMOVEDPAGEFROMDRAFT: 'I tangohia a ''%s'' i te pae hukihuki' RESTORE: Whakaora RESTORED: 'I momoho te whakaora i te ''{title}''' ROLLBACK: 'Hoki whakamuri ki tēnei putanga.' + ROLLEDBACKPUBv2: 'I hoki ki te tauira kua whakaputaina.' + ROLLEDBACKVERSIONv2: 'I hoki ki te tauira #%d.' SAVE: tiakina + SAVEDRAFT: 'Tiaki hukihuki' TabContent: Ngā Ihirangi TabHistory: Hītori TabSettings: Ngā Tautuhinga TreeFiltered: 'Rākau kua tātaritia' TreeFilteredClear: 'Ūkui tātari' MENUTITLE: 'Whakatika Whārangi' + AddPageRestriction: 'Tuhipoka: Kāore e whakaaetia ētahi momo whārangi mō tēnei tīpakonga' CMSMain_left_ss: APPLY_FILTER: 'Hoatu Tātari' RESET: Tautuhi Anō @@ -121,6 +129,7 @@ mi: VIEW: Tiro VIEWINGVERSION: 'Tiro ana i te putanga {version} ināianei.' MENUTITLE: Hītori + VIEWINGLATEST: 'Tirohia ana te tauira hou rawa ināianei.' CMSPageHistoryController_versions_ss: AUTHOR: Kaituhi NOTPUBLISHED: 'Kāore i whakaputaina' @@ -153,6 +162,7 @@ mi: ContentController: ARCHIVEDSITE: 'Putanga Arokite' ARCHIVEDSITEFROM: 'Pae putumōhio mai i' + CMS: CMS DRAFTSITE: 'Pae Hukihuki' DRAFT_SITE_ACCESS_RESTRICTION: 'Me takiuru mā tō kupuhipa CMS hei tiro i te hukihuki, ngā ihirangi putumōhio rānei. Pāwhiri ki konei kia hoki ki te pae kua whakaputaina.' Email: Īmēra @@ -167,6 +177,7 @@ mi: PUBLISHEDSITE: 'Pae Kua Whakaputaina' Password: Kupuhipa PostInstallTutorialIntro: 'He tauira rūnā tēnei paetukutuku o tētahi paetukutuku SilverStripe 3. Hei toro i tēnei, tirohia te {link}' + StartEditing: 'Ka taea te tīmata ki te whakatika i ō ihirangi mā te whakatuwhera i the CMS.' UnableDeleteInstall: 'Kāore i taea te muku i ngā kōnae tāuta. Mukua ā-ringa ngā kōnae kei raro' VIEWPAGEIN: 'Tiro Whārangi i' DRAFT: Hukihuki @@ -255,6 +266,7 @@ mi: ParameterLiveCheckbox: 'Tirohia te pae ora' REPEMPTY: 'Kua piako te pūrongo {title}.' SilverStripeNavigatorLink: + ShareInstructions: 'Hei tiritiri i tēnei whārangi, tāruatia ka whakapiri i te hono kei raro.' ShareLink: 'Tiritiri hono' SilverStripeNavigatorLinkl: CloseLink: Kati @@ -317,10 +329,13 @@ mi: LINKCHANGENOTE: 'Mā te huri i te hono o tēnei whārangi ka pāngia ngā hono o ngā whārangi tamariki katoa.' MENUTITLE: 'Tapanga whakatere' METADESC: 'Whakaahuatanga Meta' + METADESCHELP: 'Ka whakamahi ngā pūrere rapu i ēnei ihirangi ki te whakaatu huanga rapu (ahakoa kāore ngā whakatauranga e whakaawetia).' METAEXTRA: 'Ngā Tūtohu Meta Ritenga' + METAEXTRAHELP: 'Ngā tūtohu HTML mō ngā mōhiohio meta tāpiri. Hei tauira <ingoa meta="customName" ihirangi="your custom content here" />' MODIFIEDONDRAFTHELP: 'He huringa kāore anō kia whakaputaina ō te whārangi' MODIFIEDONDRAFTSHORT: Kua Whakakētia MetadataToggle: Raraungameta + OBSOLETECLASS: 'Nō te momo tawhito rawa {type} tēnei whārangi. Mā te tiaki ka tautuhia anō tōna momo, ka ngaro pea i a koe he raraunga' PAGELOCATION: 'Tauwāhi' PAGETITLE: 'Ingoa whārangi' PAGETYPE: 'Tūmomo wharangi ' @@ -349,6 +364,7 @@ mi: URLSegment: 'Wāhanga PRO' VIEWERGROUPS: 'Ngā Ropū Kaitirotiro' VIEW_ALL_DESCRIPTION: 'Tirohia tētahi whārangi' + VIEW_ALL_HELP: 'Te āhei ki te tiro i tētahi whārangi i te pae, ahakoa ngā tautuhinga i te ripa Uru. Ka hiahia i te whakaaetanga "wāhanga Uru ki ''Ngā Whārangi''"' VIEW_DRAFT_CONTENT: 'Tirohia ngā ihirangi hukihuki' VIEW_DRAFT_CONTENT_HELP: 'Ka hāngai ki te tiro whārangi i waho i te CMS i te aratau hukihuki. He whaihua mā ngā kaimahitahi kāore i a rātou te āhei CMS.' Viewers: 'Ngā Rōpū Kaitirotiro' @@ -359,9 +375,14 @@ mi: many_many_LinkTracking: 'Taki Hono' BUTTONPUBLISHED: I whakaputaina BUTTONSAVED: Kua Tiakina + GroupPlaceholder: 'Pāwhiri ki te tīpako rōpū' + LASTPUBLISHED: 'Whakaputanga hou rawa' + LASTSAVED: 'Tiakinga hou rawa' MoreOptions: 'He kōwhiringa anō' + NOTPUBLISHED: 'Kāore i whakaputaina' SiteTreeURLSegmentField: HelpChars: 'Ka tahuri aunoatia, ka tangohia rānei ngā pūāhua motuhake' + EMPTY: 'Tāurua he Wāhanga PRO, ka pāwhiri whakakore rānei' StaticExporter: BASEURL: 'PRO Matua' EXPORTTO: 'Kaweake ki tēnā kōpaki' @@ -386,12 +407,15 @@ mi: CANACCESS: 'Ka taea te uru ki te pae putumōhio mā tēnei hononga' HAVEASKED: 'Kua tono mai kia tirohia e koe ngā ihirangi o tā mātou pae i' VirtualPage: + CHOOSE: 'Whārangi kua honoa' DESCRIPTION: 'Ka whakaatu i ngā ihirangi o tētahi atu whārangi' + EDITCONTENT: 'Whakatika ihirangi ki te whārangi kua honoa' HEADER: 'He whārangi mariko tēnei' PLURALNAME: 'Ngā Whārangi Mariko' PageTypNotAllowedOnRoot: 'Kāore e whakaaetia te momo whārangi taketake "{type}" i te taumata pūtake o tēnei whārangi mariko' SINGULARNAME: 'Whārangi Mariko' EditLink: Whakatika + HEADERWITHLINK: 'He whārangi mariko tēnei e tārua ihirangi ana i "{title}" ({link})' CMSFileAddController: MENUTITLE: Ngā Kōnae CMSPageEditController: @@ -400,6 +424,13 @@ mi: MENUTITLE: 'Whakatika Whārangi' CMSSettingsController: MENUTITLE: Ngā Tautuhinga + SITETREE: + VIRTUALPAGEDRAFTWARNING: 'Whakaputaina te whārangi kua honoa kia whakaputa ai i te whārangi mariko' + VIRTUALPAGEWARNING: 'Kōwhiria he whārangi kua honoa kātahi anō ka tiaki kia whakaputa ai i tēnei whārangi' + VIRTUALPAGEWARNINGSETTINGS: 'Kōwhiria he whārangi kua honoa i ngā āpure ihirangi matua kia whakaputa ai' + SilverStripeNavigator: + ARCHIVED: I putumōhiotia URLSegmentField: Cancel: Whakakore Edit: Whakatika + OK: ĀE From 34a0fe3bf12205f0e6f3245d1199f5a284a86aa2 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 8 Oct 2013 12:20:21 +0200 Subject: [PATCH 3/4] Chinese translation encoding --- lang/zh.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lang/zh.yml b/lang/zh.yml index 52c893c4..21a4068c 100644 --- a/lang/zh.yml +++ b/lang/zh.yml @@ -164,11 +164,11 @@ zh: ARCHIVEDSITEFROM: '存档站点从' CMS: 内容管理系统 DRAFTSITE: '草稿站点' - DRAFT_SITE_ACCESS_RESTRICTION: '您必须使用您的内容管理系统密码登录，才可以查看草稿或存档内容。<a href="%s">点击这里返回到已发布的站点。</a>' + DRAFT_SITE_ACCESS_RESTRICTION: '您必须使用您的内容管理系统密码登录，才可以查看草稿或存档内容。点击这里返回到已发布的站点。' Email: 电子邮件 INSTALL_SUCCESS: '安装成功' InstallFilesDeleted: '安装文件已经成功删除。' - InstallSecurityWarning: '出于安全原因，您应该现在删除安装文件，除非您计划以后（<em>需要以管理员身份登录，详见下方</em>）重新安装。web服务器现在仅需要对“assets”文件夹的写权限，您可以删除所有其他文件夹的写权限。<a href="{link}" style="text-align: center;">点击这里删除安装文件。</a>' + InstallSecurityWarning: '出于安全原因，您应该现在删除安装文件，除非您计划以后（需要以管理员身份登录，详见下方）重新安装。web服务器现在仅需要对“assets”文件夹的写权限，您可以删除所有其他文件夹的写权限。点击这里删除安装文件。' InstallSuccessCongratulations: 'SilverStripe已经成功安装！' LOGGEDINAS: '当前登录' LOGIN: 登录 @@ -207,9 +207,9 @@ zh: 504: '504 - 网关超时' 505: '505 - HTTP版本不支持' CODE: '错误代码' - DEFAULTERRORPAGECONTENT: '<p>对不起，您正在尝试访问不存在的页面。</p><p>请检查您想要访问的URL的拼写并再试一次。</p>' + DEFAULTERRORPAGECONTENT: '

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

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

' DEFAULTERRORPAGETITLE: '未发现页面' - DEFAULTSERVERERRORPAGECONTENT: '<p>对不起，处理您的请求时发生错误。</p>' + DEFAULTSERVERERRORPAGECONTENT: '

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

' DEFAULTSERVERERRORPAGETITLE: '服务器错误' DESCRIPTION: '给不同的错误自定义内容（例如”未发现页面“）' ERRORFILEPROBLEM: '打开文件”{filename}“尝试写入. 请检查文件许可' @@ -303,11 +303,11 @@ zh: CREATED: '创建日期' Comments: 评论 Content: 内容 - DEFAULTABOUTCONTENT: '<p>您可以使用您自己的内容填充该页面，或者删除它并创建您自己的页面。<br /></p>' + DEFAULTABOUTCONTENT: '

您可以使用您自己的内容填充该页面，或者删除它并创建您自己的页面。

' DEFAULTABOUTTITLE: '关于我们' - DEFAULTCONTACTCONTENT: '<p>您可以使用您自己的内容填充该页面，或者删除它并创建您自己的页面。<br /></p>' + DEFAULTCONTACTCONTENT: '

您可以使用您自己的内容填充该页面，或者删除它并创建您自己的页面。

' DEFAULTCONTACTTITLE: '联络我们' - DEFAULTHOMECONTENT: '<p>欢迎来到SilverStripe！这是默认首页。您可以通过打开<a href="admin/">内容管理系统</a>修改该页面。您现在可以访问<a href="http://doc.silverstripe.org">开发者文档</a>，或者从<a href="http://doc.silverstripe.org/doku.php?id=tutorials">教程</a>开始。</p>' + DEFAULTHOMECONTENT: '

欢迎来到SilverStripe！这是默认首页。您可以通过打开内容管理系统修改该页面。您现在可以访问开发者文档，或者从教程开始。

' DEFAULTHOMETITLE: 首页 DELETEDPAGEHELP: '页面已停止发布' DELETEDPAGESHORT: 已删除 From b7476f2a46de1a856b56f0ca01d4a201066120ab Mon Sep 17 00:00:00 2001 From: Andrew Short Date: Thu, 10 Oct 2013 13:09:24 +1100 Subject: [PATCH 4/4] BUG: Fix add new button not passing the correct parent ID. The `%s` parent ID placeholder was being URL encoded, so it was not being replaced properly when adding a new page. This fix separately adds placeholder parameters to the URL to avoid this issue. The fix is not ideal, but there is no easy way to indicate that some URL parameters should be URL encoded and others should not while still correctly constructing the URL. --- code/controllers/CMSMain.php | 12 ++++++++++-- templates/Includes/CMSMain_TreeView.ss | 2 +- .../CMSPagesController_ContentToolActions.ss | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/code/controllers/CMSMain.php b/code/controllers/CMSMain.php index 237464ff..4eb61963 100644 --- a/code/controllers/CMSMain.php +++ b/code/controllers/CMSMain.php @@ -202,10 +202,18 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr return $link; } - public function LinkPageAdd($extraArguments = null) { + public function LinkPageAdd($extra = null, $placeholders = null) { $link = singleton("CMSPageAddController")->Link(); $this->extend('updateLinkPageAdd', $link); - if($extraArguments) $link = Controller::join_links ($link, $extraArguments); + + if($extra) { + $link = Controller::join_links ($link, $extra); + } + + if($placeholders) { + $link .= (strpos($link, '?') === false ? "?$placeholders" : "&$placeholders"); + } + return $link; } diff --git a/templates/Includes/CMSMain_TreeView.ss b/templates/Includes/CMSMain_TreeView.ss index 2e9cb6b1..d8d8f39e 100644 --- a/templates/Includes/CMSMain_TreeView.ss +++ b/templates/Includes/CMSMain_TreeView.ss @@ -19,7 +19,7 @@ $ExtraTreeTools <% end_if %> -
+
$SiteTreeAsUL
diff --git a/templates/Includes/CMSPagesController_ContentToolActions.ss b/templates/Includes/CMSPagesController_ContentToolActions.ss index 5c44a42b..b3b8b6b4 100644 --- a/templates/Includes/CMSPagesController_ContentToolActions.ss +++ b/templates/Includes/CMSPagesController_ContentToolActions.ss @@ -1,5 +1,5 @@
- <% _t('CMSMain.AddNewButton', 'Add new') %> + <% _t('CMSMain.AddNewButton', 'Add new') %>