diff --git a/admin/code/LeftAndMain.php b/admin/code/LeftAndMain.php index 807f61fec..4e8a6c3b3 100644 --- a/admin/code/LeftAndMain.php +++ b/admin/code/LeftAndMain.php @@ -1499,6 +1499,9 @@ class LeftAndMain extends Controller implements PermissionProvider { public function currentPageID() { if($this->getRequest()->requestVar('ID') && is_numeric($this->getRequest()->requestVar('ID'))) { return $this->getRequest()->requestVar('ID'); + } elseif ($this->getRequest()->requestVar('CMSMainCurrentPageID') && is_numeric($this->getRequest()->requestVar('CMSMainCurrentPageID'))) { + // see GridFieldDetailForm::ItemEditForm + return $this->getRequest()->requestVar('CMSMainCurrentPageID'); } elseif (isset($this->urlParams['ID']) && is_numeric($this->urlParams['ID'])) { return $this->urlParams['ID']; } elseif(Session::get($this->sessionNamespace() . ".currentPage")) { diff --git a/admin/javascript/lang/fa_IR.js b/admin/javascript/lang/fa_IR.js index 7dd73b459..4e1ffa6ac 100644 --- a/admin/javascript/lang/fa_IR.js +++ b/admin/javascript/lang/fa_IR.js @@ -6,25 +6,25 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') { } } else { ss.i18n.addDictionary('fa_IR', { - "CMSMAIN.BATCH_ARCHIVE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to archive these pages?\n\nThese pages and all of their children pages will be unpublished and sent to the archive.", - "CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?", - "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?", - "CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?", + "CMSMAIN.BATCH_ARCHIVE_PROMPT": "شما {num} صفحه(صفحهها) را انتخاب کردهاید.\n\n\nآیا از اینکه میخواهید بایگانی شوند اطمینان دارید؟\n\nتمامی این صفحات و تمامی صفحات فرزند آنها عدم انتشار میشوند و به بایگانی ارسال میگردند.", + "CMSMAIN.BATCH_DELETELIVE_PROMPT": "شما {num} صفحه(صفحهها) را انتخاب کردهاید.\n\nآیا واقعاً میخواهید آنها از لایو را حذف نمایید؟", + "CMSMAIN.BATCH_DELETE_PROMPT": "شما {num} صفحه(صفحهها) را انتخاب کردهاید.\n\nآیا واقعاً میخواهید آنها را حذف نمایید؟", + "CMSMAIN.BATCH_PUBLISH_PROMPT": "شما {num} صفحه(صفحهها) را انتخاب کردهاید.\n\nآیا واقعاً میخواهید آنها را منتشر نمایید؟", "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.", "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "شما {num} صفحه را انتخاب کردهاید.\n\nآیا واقعاً میخواهید انتشار آنها را لغو نمایید", "CMSMAIN.SELECTONEPAGE": "لطفاً حداقل ۱ صفحه را انتخاب نمایید.", - "Campaigns.ADDCAMPAIGN": "Add campaign", - "Campaigns.ITEM_SUMMARY_PLURAL": "%s items", - "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item", - "Campaigns.PUBLISHCAMPAIGN": "Publish campaign", - "Campaigns.REVERTCAMPAIGN": "Revert", + "Campaigns.ADDCAMPAIGN": "افزودن کمپین", + "Campaigns.ITEM_SUMMARY_PLURAL": "%s آیتم", + "Campaigns.ITEM_SUMMARY_SINGULAR": "%s آیتم", + "Campaigns.PUBLISHCAMPAIGN": "انتشار کمپین", + "Campaigns.REVERTCAMPAIGN": "بازگرداندن", "LeftAndMain.CONFIRMUNSAVED": "Are you sure you want to navigate away from this page?\n\nWARNING: Your changes have not been saved.\n\nPress OK to continue, or Cancel to stay on the current page.", - "LeftAndMain.CONFIRMUNSAVEDSHORT": "WARNING: Your changes have not been saved.", - "LeftAndMain.PAGEWASDELETED": "This page was deleted. To edit a page, select it from the left.", + "LeftAndMain.CONFIRMUNSAVEDSHORT": "هشدار: تغییرات شما ذخیره نشدهاند.", + "LeftAndMain.PAGEWASDELETED": "این صفحه حذف شده است. برای ویرایش یک صفحه، آنرا از لیست چپ انتخاب نمایید.", "ModelAdmin.DELETED": "حذف شده", - "ModelAdmin.REALLYDELETE": "Do you really want to delete?", + "ModelAdmin.REALLYDELETE": "آیا واقعاً میخواهید حذف نمایید؟", "ModelAdmin.SAVED": "ذخیره شده", "ModelAdmin.VALIDATIONERROR": "خطای اعتبارسنجی", - "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "Do you really want to delete %s groups?" + "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "آیا واقعاً میخواهید %s گروه را حذف نمایید؟" }); } \ No newline at end of file diff --git a/admin/javascript/lang/it.js b/admin/javascript/lang/it.js index f6f072893..c6c641633 100644 --- a/admin/javascript/lang/it.js +++ b/admin/javascript/lang/it.js @@ -13,11 +13,11 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') { "CMSMAIN.BATCH_RESTORE_PROMPT": "Hai selezionato {num} pagina(e).\n\nSei sicuri di volerle ripristinare?\n\nI figli delle pagine archiviate saranno ripristinati nel primo livello, a meno anche i genitori non vengano ripristinati.", "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Hai {num} pagine selezionate.\n\nVuoi veramente nasconderle?", "CMSMAIN.SELECTONEPAGE": "Per favore selezionare almeno una pagina", - "Campaigns.ADDCAMPAIGN": "Add campaign", - "Campaigns.ITEM_SUMMARY_PLURAL": "%s items", - "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item", - "Campaigns.PUBLISHCAMPAIGN": "Publish campaign", - "Campaigns.REVERTCAMPAIGN": "Revert", + "Campaigns.ADDCAMPAIGN": "Aggiungi campagna", + "Campaigns.ITEM_SUMMARY_PLURAL": "%s elementi", + "Campaigns.ITEM_SUMMARY_SINGULAR": "%s elemento", + "Campaigns.PUBLISHCAMPAIGN": "Pubblica campagna", + "Campaigns.REVERTCAMPAIGN": "Ripristina", "LeftAndMain.CONFIRMUNSAVED": "Siete sicuri di voler uscire da questa pagina?\n\nATTENZIONE: I vostri cambiamenti non sono stati salvati.\n\nCliccare OK per continuare, o su Annulla per rimanere sulla pagina corrente.", "LeftAndMain.CONFIRMUNSAVEDSHORT": "ATTENZIONE: le tue modifiche non sono state salvate.", "LeftAndMain.PAGEWASDELETED": "Questa pagina è stata eliminata. Per modificare questa pagine, selezionarla a sinistra.", diff --git a/admin/javascript/lang/sl_SI.js b/admin/javascript/lang/sl_SI.js new file mode 100644 index 000000000..73e80a189 --- /dev/null +++ b/admin/javascript/lang/sl_SI.js @@ -0,0 +1,30 @@ +// This file was generated by silverstripe/cow from admin/javascript/lang/src/sl_SI.js. +// See https://github.com/tractorcow/cow for details +if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') { + if (typeof(console) !== 'undefined') { // eslint-disable-line no-console + console.error('Class ss.i18n not defined'); // eslint-disable-line no-console + } +} else { + ss.i18n.addDictionary('sl_SI', { + "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Izbrano število strani: {num}\n\nSte prepričani, da želite arhivirati te strani?\n\nTe strani in vse ostale podstrani bodo odstranjene iz objave in premaknjene v arhiv.", + "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Izbrali ste {num} strani.\n\nAli ste prepričani, da želite izbrisati te strani iz objave?", + "CMSMAIN.BATCH_DELETE_PROMPT": "Izbrali ste {num} strani.\n\nAli ste prepričani, da jih želite izbrisati?", + "CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?", + "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.", + "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to unpublish", + "CMSMAIN.SELECTONEPAGE": "Prosimo izberite vsaj eno stran", + "Campaigns.ADDCAMPAIGN": "Dodaj kampanjo", + "Campaigns.ITEM_SUMMARY_PLURAL": "% predmetov", + "Campaigns.ITEM_SUMMARY_SINGULAR": "%s predmet", + "Campaigns.PUBLISHCAMPAIGN": "Objavi kampanjo", + "Campaigns.REVERTCAMPAIGN": "Povrni", + "LeftAndMain.CONFIRMUNSAVED": "Are you sure you want to navigate away from this page?\n\nWARNING: Your changes have not been saved.\n\nPress OK to continue, or Cancel to stay on the current page.", + "LeftAndMain.CONFIRMUNSAVEDSHORT": "POZOR: Spremembe niso bile shranjene.", + "LeftAndMain.PAGEWASDELETED": "Ta stran je bila izbrisana. Če želite urediti stran, jo najprej izberite na levi strani.", + "ModelAdmin.DELETED": "Izbrisano", + "ModelAdmin.REALLYDELETE": "Ste prepričani, da želite izbrisati?", + "ModelAdmin.SAVED": "Shranjeno", + "ModelAdmin.VALIDATIONERROR": "Napaka pri validaciji", + "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "Ste prepričani, da želite pobrisati grupe: %s ?" +}); +} \ No newline at end of file diff --git a/admin/javascript/lang/src/fa_IR.js b/admin/javascript/lang/src/fa_IR.js index 1fa5d18c5..e09ba9f2e 100644 --- a/admin/javascript/lang/src/fa_IR.js +++ b/admin/javascript/lang/src/fa_IR.js @@ -1,22 +1,22 @@ { - "CMSMAIN.BATCH_ARCHIVE_PROMPT": "You have {num} page(s) selected.\n\nAre you sure you want to archive these pages?\n\nThese pages and all of their children pages will be unpublished and sent to the archive.", - "CMSMAIN.BATCH_DELETELIVE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete these pages from live?", - "CMSMAIN.BATCH_DELETE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to delete?", - "CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?", + "CMSMAIN.BATCH_ARCHIVE_PROMPT": "شما {num} صفحه(صفحهها) را انتخاب کردهاید.\n\n\nآیا از اینکه میخواهید بایگانی شوند اطمینان دارید؟\n\nتمامی این صفحات و تمامی صفحات فرزند آنها عدم انتشار میشوند و به بایگانی ارسال میگردند.", + "CMSMAIN.BATCH_DELETELIVE_PROMPT": "شما {num} صفحه(صفحهها) را انتخاب کردهاید.\n\nآیا واقعاً میخواهید آنها از لایو را حذف نمایید؟", + "CMSMAIN.BATCH_DELETE_PROMPT": "شما {num} صفحه(صفحهها) را انتخاب کردهاید.\n\nآیا واقعاً میخواهید آنها را حذف نمایید؟", + "CMSMAIN.BATCH_PUBLISH_PROMPT": "شما {num} صفحه(صفحهها) را انتخاب کردهاید.\n\nآیا واقعاً میخواهید آنها را منتشر نمایید؟", "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.", "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "شما {num} صفحه را انتخاب کردهاید.\n\nآیا واقعاً میخواهید انتشار آنها را لغو نمایید", "CMSMAIN.SELECTONEPAGE": "لطفاً حداقل ۱ صفحه را انتخاب نمایید.", - "Campaigns.ADDCAMPAIGN": "Add campaign", - "Campaigns.ITEM_SUMMARY_PLURAL": "%s items", - "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item", - "Campaigns.PUBLISHCAMPAIGN": "Publish campaign", - "Campaigns.REVERTCAMPAIGN": "Revert", + "Campaigns.ADDCAMPAIGN": "افزودن کمپین", + "Campaigns.ITEM_SUMMARY_PLURAL": "%s آیتم", + "Campaigns.ITEM_SUMMARY_SINGULAR": "%s آیتم", + "Campaigns.PUBLISHCAMPAIGN": "انتشار کمپین", + "Campaigns.REVERTCAMPAIGN": "بازگرداندن", "LeftAndMain.CONFIRMUNSAVED": "Are you sure you want to navigate away from this page?\n\nWARNING: Your changes have not been saved.\n\nPress OK to continue, or Cancel to stay on the current page.", - "LeftAndMain.CONFIRMUNSAVEDSHORT": "WARNING: Your changes have not been saved.", - "LeftAndMain.PAGEWASDELETED": "This page was deleted. To edit a page, select it from the left.", + "LeftAndMain.CONFIRMUNSAVEDSHORT": "هشدار: تغییرات شما ذخیره نشدهاند.", + "LeftAndMain.PAGEWASDELETED": "این صفحه حذف شده است. برای ویرایش یک صفحه، آنرا از لیست چپ انتخاب نمایید.", "ModelAdmin.DELETED": "حذف شده", - "ModelAdmin.REALLYDELETE": "Do you really want to delete?", + "ModelAdmin.REALLYDELETE": "آیا واقعاً میخواهید حذف نمایید؟", "ModelAdmin.SAVED": "ذخیره شده", "ModelAdmin.VALIDATIONERROR": "خطای اعتبارسنجی", - "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "Do you really want to delete %s groups?" + "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "آیا واقعاً میخواهید %s گروه را حذف نمایید؟" } \ No newline at end of file diff --git a/admin/javascript/lang/src/it.js b/admin/javascript/lang/src/it.js index 9ae0eb964..0d67b85a3 100644 --- a/admin/javascript/lang/src/it.js +++ b/admin/javascript/lang/src/it.js @@ -6,11 +6,11 @@ "CMSMAIN.BATCH_RESTORE_PROMPT": "Hai selezionato {num} pagina(e).\n\nSei sicuri di volerle ripristinare?\n\nI figli delle pagine archiviate saranno ripristinati nel primo livello, a meno anche i genitori non vengano ripristinati.", "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "Hai {num} pagine selezionate.\n\nVuoi veramente nasconderle?", "CMSMAIN.SELECTONEPAGE": "Per favore selezionare almeno una pagina", - "Campaigns.ADDCAMPAIGN": "Add campaign", - "Campaigns.ITEM_SUMMARY_PLURAL": "%s items", - "Campaigns.ITEM_SUMMARY_SINGULAR": "%s item", - "Campaigns.PUBLISHCAMPAIGN": "Publish campaign", - "Campaigns.REVERTCAMPAIGN": "Revert", + "Campaigns.ADDCAMPAIGN": "Aggiungi campagna", + "Campaigns.ITEM_SUMMARY_PLURAL": "%s elementi", + "Campaigns.ITEM_SUMMARY_SINGULAR": "%s elemento", + "Campaigns.PUBLISHCAMPAIGN": "Pubblica campagna", + "Campaigns.REVERTCAMPAIGN": "Ripristina", "LeftAndMain.CONFIRMUNSAVED": "Siete sicuri di voler uscire da questa pagina?\n\nATTENZIONE: I vostri cambiamenti non sono stati salvati.\n\nCliccare OK per continuare, o su Annulla per rimanere sulla pagina corrente.", "LeftAndMain.CONFIRMUNSAVEDSHORT": "ATTENZIONE: le tue modifiche non sono state salvate.", "LeftAndMain.PAGEWASDELETED": "Questa pagina è stata eliminata. Per modificare questa pagine, selezionarla a sinistra.", diff --git a/admin/javascript/lang/src/sl_SI.js b/admin/javascript/lang/src/sl_SI.js new file mode 100644 index 000000000..c8bf098ec --- /dev/null +++ b/admin/javascript/lang/src/sl_SI.js @@ -0,0 +1,22 @@ +{ + "CMSMAIN.BATCH_ARCHIVE_PROMPT": "Izbrano število strani: {num}\n\nSte prepričani, da želite arhivirati te strani?\n\nTe strani in vse ostale podstrani bodo odstranjene iz objave in premaknjene v arhiv.", + "CMSMAIN.BATCH_DELETELIVE_PROMPT": "Izbrali ste {num} strani.\n\nAli ste prepričani, da želite izbrisati te strani iz objave?", + "CMSMAIN.BATCH_DELETE_PROMPT": "Izbrali ste {num} strani.\n\nAli ste prepričani, da jih želite izbrisati?", + "CMSMAIN.BATCH_PUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to publish?", + "CMSMAIN.BATCH_RESTORE_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to restore to stage?\n\nChildren of archived pages will be restored to the root level, unless those pages are also being restored.", + "CMSMAIN.BATCH_UNPUBLISH_PROMPT": "You have {num} page(s) selected.\n\nDo you really want to unpublish", + "CMSMAIN.SELECTONEPAGE": "Prosimo izberite vsaj eno stran", + "Campaigns.ADDCAMPAIGN": "Dodaj kampanjo", + "Campaigns.ITEM_SUMMARY_PLURAL": "% predmetov", + "Campaigns.ITEM_SUMMARY_SINGULAR": "%s predmet", + "Campaigns.PUBLISHCAMPAIGN": "Objavi kampanjo", + "Campaigns.REVERTCAMPAIGN": "Povrni", + "LeftAndMain.CONFIRMUNSAVED": "Are you sure you want to navigate away from this page?\n\nWARNING: Your changes have not been saved.\n\nPress OK to continue, or Cancel to stay on the current page.", + "LeftAndMain.CONFIRMUNSAVEDSHORT": "POZOR: Spremembe niso bile shranjene.", + "LeftAndMain.PAGEWASDELETED": "Ta stran je bila izbrisana. Če želite urediti stran, jo najprej izberite na levi strani.", + "ModelAdmin.DELETED": "Izbrisano", + "ModelAdmin.REALLYDELETE": "Ste prepričani, da želite izbrisati?", + "ModelAdmin.SAVED": "Shranjeno", + "ModelAdmin.VALIDATIONERROR": "Napaka pri validaciji", + "SecurityAdmin.BATCHACTIONSDELETECONFIRM": "Ste prepričani, da želite pobrisati grupe: %s ?" +} \ No newline at end of file diff --git a/core/Config.php b/core/Config.php index 9f3c7ecd2..414350995 100644 --- a/core/Config.php +++ b/core/Config.php @@ -911,6 +911,7 @@ class Config_ForClass { /** * @param string $name + * @return mixed */ public function __get($name) { return Config::inst()->get($this->class, $name); @@ -924,6 +925,16 @@ class Config_ForClass { return Config::inst()->update($this->class, $name, $val); } + /** + * @param string $name + * @return bool + */ + public function __isset($name) + { + $val = $this->__get($name); + return isset($val); + } + /** * @param string $name * @param int $sourceOptions diff --git a/dev/install/MySQLDatabaseConfigurationHelper.php b/dev/install/MySQLDatabaseConfigurationHelper.php index 91bc19141..5907eb4bb 100644 --- a/dev/install/MySQLDatabaseConfigurationHelper.php +++ b/dev/install/MySQLDatabaseConfigurationHelper.php @@ -172,8 +172,10 @@ class MySQLDatabaseConfigurationHelper implements DatabaseConfigurationHelper { if(!$this->checkValidDatabaseName($database)) return false; // Escape all valid database patterns (permission must exist on all tables) + $sqlDatabase = addcslashes($database, '_%'); // See http://dev.mysql.com/doc/refman/5.7/en/string-literals.html $dbPattern = sprintf( - '((%s)|(%s)|(%s))', + '((%s)|(%s)|(%s)|(%s))', + preg_quote("\"$sqlDatabase\".*"), // Regexp escape sql-escaped db identifier preg_quote("\"$database\".*"), preg_quote('"%".*'), preg_quote('*.*') diff --git a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/05_Typography.md b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/05_Typography.md index c34d47ec9..cfc9d95e7 100644 --- a/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/05_Typography.md +++ b/docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/05_Typography.md @@ -11,6 +11,11 @@ SilverStripe lets you customise the style of content in the CMS. This is done by Will load the `mysite/css/editor.css` file. +If using this config option in `mysite/_config.php`, you will have to instead call: + + :::php + HtmlEditorConfig::get('cms')->setOption('content_css', project() . '/css/editor.css'); + Any CSS classes within this file will be automatically added to the `WYSIWYG` editors 'style' dropdown. For instance, to add the color 'red' as an option within the `WYSIWYG` add the following to the `editor.css` diff --git a/docs/en/04_Changelogs/rc/3.1.20-rc1.md b/docs/en/04_Changelogs/rc/3.1.20-rc1.md new file mode 100644 index 000000000..1d996e329 --- /dev/null +++ b/docs/en/04_Changelogs/rc/3.1.20-rc1.md @@ -0,0 +1,13 @@ +# 3.1.20-rc1 + + + +## Change Log + +### Bugfixes + + * 2016-05-20 [8382685](https://github.com/silverstripe/silverstripe-framework/commit/83826850346bc486bc4599dca56067897961cbfa) #5557 Tests with no DB requirements wont create test DB (Daniel Hensby) + * 2016-05-18 [62bd26d](https://github.com/silverstripe/silverstripe-framework/commit/62bd26d11ab9c9bf5b91ba8abb776ab3a4813a18) Fix suppression of display_errors in ErrorControlChain (Damian Mooyman) + * 2016-05-10 [3738d88](https://github.com/silverstripe/silverstripe-framework/commit/3738d888e0fbce48e0d88735edd3455a116937b5) Empty FROM clause (Daniel Hensby) + * 2016-05-05 [cc7a2ae](https://github.com/silverstripe/silverstripe-installer/commit/cc7a2aeb1e03f3f8db67a1ca547280b05dd9372a) Add framework/admin tests (#118) (Daniel Hensby) + * 2015-04-21 [a7100e9](https://github.com/silverstripe/silverstripe-framework/commit/a7100e9006b27e7885eb2ce851d9bc0839ca4468) Object::parse_class_spec failed to parse associative arrays (Loz Calver) diff --git a/docs/en/04_Changelogs/rc/3.2.5-rc1.md b/docs/en/04_Changelogs/rc/3.2.5-rc1.md new file mode 100644 index 000000000..2f3696077 --- /dev/null +++ b/docs/en/04_Changelogs/rc/3.2.5-rc1.md @@ -0,0 +1,21 @@ +# 3.2.5-rc1 + + + +## Change Log + +### Bugfixes + + * 2016-07-07 [4aa1fc2](https://github.com/silverstripe/silverstripe-framework/commit/4aa1fc2d2cafd1c90401896cefb03e64b530a59c) Changed form fields that call renderWith in Field() to call parent::Field() instead (#5783) (Ed Chipman) + * 2016-07-07 [27cea80](https://github.com/silverstripe/silverstripe-framework/commit/27cea80b15a986d43b832658b13d01c08a5cfce1) SS_ConfigStaticManifest_Parser failed to handle ::class syntax (fixes #5701) (#5781) (Loz Calver) + * 2016-07-01 [39238d9](https://github.com/silverstripe/silverstripe-framework/commit/39238d908e0ed077d7aaf773562749468b6827ee) falsey attribute values in shortcodes now work (Daniel Hensby) + * 2016-06-30 [2cdfe6c](https://github.com/silverstripe/silverstripe-framework/commit/2cdfe6cc21f0cb253401fa169b5e1c3bb8738d43) Use RAW for DBField template helpers (Daniel Hensby) + * 2016-06-30 [b0f237b](https://github.com/silverstripe/silverstripe-framework/commit/b0f237bb3a336eea9f3a9f9bece2b65661c03cbc) Use RAW instead of Value for parsing shortcodes (Daniel Hensby) + * 2016-05-31 [eba89b9](https://github.com/silverstripe/silverstripe-cms/commit/eba89b9520a0103e4c0cb4b6730c3c0742f8b0d9) OldPageRedirector no longer loops infinitely if 404 thrown on existing page (Daniel Hensby) + * 2016-05-31 [341f49c](https://github.com/silverstripe/silverstripe-framework/commit/341f49c630c23ee665c195250c19935763172e36) Fixed lookup of next closest visible field for focus restoring (fixes #5618) (UndefinedOffset) + * 2016-05-20 [8382685](https://github.com/silverstripe/silverstripe-framework/commit/83826850346bc486bc4599dca56067897961cbfa) #5557 Tests with no DB requirements wont create test DB (Daniel Hensby) + * 2016-05-18 [62bd26d](https://github.com/silverstripe/silverstripe-framework/commit/62bd26d11ab9c9bf5b91ba8abb776ab3a4813a18) Fix suppression of display_errors in ErrorControlChain (Damian Mooyman) + * 2016-05-10 [3738d88](https://github.com/silverstripe/silverstripe-framework/commit/3738d888e0fbce48e0d88735edd3455a116937b5) Empty FROM clause (Daniel Hensby) + * 2016-05-05 [cc7a2ae](https://github.com/silverstripe/silverstripe-installer/commit/cc7a2aeb1e03f3f8db67a1ca547280b05dd9372a) Add framework/admin tests (#118) (Daniel Hensby) + * 2016-04-19 [43dcde5](https://github.com/silverstripe/silverstripe-framework/commit/43dcde5197e0995225235f69937ed57bec0cd7e2) Hierarchy was incorrectly unexpanding nodes that had been previously expanded (madmatt) + * 2015-04-21 [a7100e9](https://github.com/silverstripe/silverstripe-framework/commit/a7100e9006b27e7885eb2ce851d9bc0839ca4468) Object::parse_class_spec failed to parse associative arrays (Loz Calver) diff --git a/docs/en/04_Changelogs/rc/3.3.3-rc1.md b/docs/en/04_Changelogs/rc/3.3.3-rc1.md new file mode 100644 index 000000000..1239039cc --- /dev/null +++ b/docs/en/04_Changelogs/rc/3.3.3-rc1.md @@ -0,0 +1,38 @@ +# 3.3.3-rc1 + + + +## Change Log + +### Bugfixes + + * 2016-08-02 [cd80d50](https://github.com/silverstripe/silverstripe-framework/commit/cd80d501f9eb12d9aca3e65f742041b142ee659f) Fix unset config options returning isset() = true (Damian Mooyman) + * 2016-07-25 [3306deb](https://github.com/silverstripe/silverstripe-cms/commit/3306deb69b88473efac009f46a90cbaa6bb27351) Fix link concatenation in SilverStripeNavigator (#1560) (Damian Mooyman) + * 2016-07-20 [319d6d2](https://github.com/silverstripe/silverstripe-framework/commit/319d6d293e873d989c55473a0aa7ae1679010474) Fix doclink (#5827) (Damian Mooyman) + * 2016-07-19 [10e06dc](https://github.com/silverstripe/silverstripe-cms/commit/10e06dce507c6f9b3588e4f8669ce36ee843f79e) Fixes #1054 By preventing errors in the CMS _only_. (Russell Michell) + * 2016-07-15 [b3fea37](https://github.com/silverstripe/silverstripe-framework/commit/b3fea3723fae822068a6b761a682011b0970fff5) Fixes support for "inline" form actions (fixes #2534) (Loz Calver) + * 2016-07-12 [24efc7e](https://github.com/silverstripe/silverstripe-framework/commit/24efc7edf83bb06b5a01080d2742c07ef68d21b2) Fix sorting ArrayList with sql-like syntax (Damian Mooyman) + * 2016-07-12 [8123c43](https://github.com/silverstripe/silverstripe-cms/commit/8123c433f01ca1ce59062e45ad90bac13be1e990) Fix getAbsoluteLiveLink() concatenation (Damian Mooyman) + * 2016-07-12 [87477a1](https://github.com/silverstripe-labs/silverstripe-reports/commit/87477a1e01d03ebee7eb71c352b3da47da73a9f2) Fix incorrect url manipulation (Damian Mooyman) + * 2016-07-07 [4aa1fc2](https://github.com/silverstripe/silverstripe-framework/commit/4aa1fc2d2cafd1c90401896cefb03e64b530a59c) Changed form fields that call renderWith in Field() to call parent::Field() instead (#5783) (Ed Chipman) + * 2016-07-07 [27cea80](https://github.com/silverstripe/silverstripe-framework/commit/27cea80b15a986d43b832658b13d01c08a5cfce1) SS_ConfigStaticManifest_Parser failed to handle ::class syntax (fixes #5701) (#5781) (Loz Calver) + * 2016-07-01 [39238d9](https://github.com/silverstripe/silverstripe-framework/commit/39238d908e0ed077d7aaf773562749468b6827ee) falsey attribute values in shortcodes now work (Daniel Hensby) + * 2016-06-30 [2cdfe6c](https://github.com/silverstripe/silverstripe-framework/commit/2cdfe6cc21f0cb253401fa169b5e1c3bb8738d43) Use RAW for DBField template helpers (Daniel Hensby) + * 2016-06-30 [b0f237b](https://github.com/silverstripe/silverstripe-framework/commit/b0f237bb3a336eea9f3a9f9bece2b65661c03cbc) Use RAW instead of Value for parsing shortcodes (Daniel Hensby) + * 2016-06-13 [f0d4951](https://github.com/silverstripe/silverstripe-framework/commit/f0d49518152bb9743e32174bc870fac6951c161d) for #5683: Address security warning in CMS when attempting to access <iframe> contents (Back-porting fix from PR #5163) (Patrick Nelson) + * 2016-06-08 [bf00810](https://github.com/silverstripe/silverstripe-framework/commit/bf00810e1f5a7164d74ad66f3d03e813d81dfa25) Fix buttonClicked() error (Damian Mooyman) + * 2016-05-31 [eba89b9](https://github.com/silverstripe/silverstripe-cms/commit/eba89b9520a0103e4c0cb4b6730c3c0742f8b0d9) OldPageRedirector no longer loops infinitely if 404 thrown on existing page (Daniel Hensby) + * 2016-05-31 [341f49c](https://github.com/silverstripe/silverstripe-framework/commit/341f49c630c23ee665c195250c19935763172e36) Fixed lookup of next closest visible field for focus restoring (fixes #5618) (UndefinedOffset) + * 2016-05-27 [f1a0aef](https://github.com/silverstripe/silverstripe-framework/commit/f1a0aef0d7e18b921b53a381ff8489bc5c12740b) fix CMS_ACCESS permission being ignored if in incorrect order in array (Damian Mooyman) + * 2016-05-21 [decd7e5](https://github.com/silverstripe/silverstripe-framework/commit/decd7e5c57a0839cb873c86782a870326ffa175a) Fix getFinalisedQuery not including all queried columns (Damian Mooyman) + * 2016-05-20 [8382685](https://github.com/silverstripe/silverstripe-framework/commit/83826850346bc486bc4599dca56067897961cbfa) #5557 Tests with no DB requirements wont create test DB (Daniel Hensby) + * 2016-05-18 [62bd26d](https://github.com/silverstripe/silverstripe-framework/commit/62bd26d11ab9c9bf5b91ba8abb776ab3a4813a18) Fix suppression of display_errors in ErrorControlChain (Damian Mooyman) + * 2016-05-16 [79d0590](https://github.com/silverstripe/silverstripe-framework/commit/79d05906286698e7cf7274703088a47c54b106f2) Fix singleton('DBLocale') (Damian Mooyman) + * 2016-05-10 [3738d88](https://github.com/silverstripe/silverstripe-framework/commit/3738d888e0fbce48e0d88735edd3455a116937b5) Empty FROM clause (Daniel Hensby) + * 2016-05-10 [d1df67d](https://github.com/silverstripe/silverstripe-framework/commit/d1df67d3089a51c0db63fbaed869738453bee482) SQLSelect count methods now cast to int (fixes #5498) (Loz Calver) + * 2016-05-05 [cc7a2ae](https://github.com/silverstripe/silverstripe-installer/commit/cc7a2aeb1e03f3f8db67a1ca547280b05dd9372a) Add framework/admin tests (#118) (Daniel Hensby) + * 2016-05-02 [096f30e](https://github.com/silverstripe/silverstripe-framework/commit/096f30ebe5ff6446a399abc92813a6ff2d02e04e) Fix GridFieldAddExistingAutocompleter (Damian Mooyman) + * 2016-04-28 [6934083](https://github.com/silverstripe/silverstripe-framework/commit/693408330bdd235b92690912ad36ba8adbebdbef) for #5410 to help focus errors occurring on tabs within GridField controlled DataObjects (et al). (Patrick Nelson) + * 2016-04-19 [43dcde5](https://github.com/silverstripe/silverstripe-framework/commit/43dcde5197e0995225235f69937ed57bec0cd7e2) Hierarchy was incorrectly unexpanding nodes that had been previously expanded (madmatt) + * 2016-01-22 [4bd66b9](https://github.com/silverstripe/silverstripe-framework/commit/4bd66b9d3693492806bb4e9a512f8ae623c6a306) for #4909: Ensure RSSFeed_Entry is instantiated using the injector. (Patrick Nelson) + * 2015-04-21 [a7100e9](https://github.com/silverstripe/silverstripe-framework/commit/a7100e9006b27e7885eb2ce851d9bc0839ca4468) Object::parse_class_spec failed to parse associative arrays (Loz Calver) diff --git a/docs/en/04_Changelogs/rc/3.4.1-rc1.md b/docs/en/04_Changelogs/rc/3.4.1-rc1.md new file mode 100644 index 000000000..610524874 --- /dev/null +++ b/docs/en/04_Changelogs/rc/3.4.1-rc1.md @@ -0,0 +1,38 @@ +# 3.4.1-rc1 + + + +## Change Log + +### Bugfixes + + * 2016-08-02 [cd80d50](https://github.com/silverstripe/silverstripe-framework/commit/cd80d501f9eb12d9aca3e65f742041b142ee659f) Fix unset config options returning isset() = true (Damian Mooyman) + * 2016-08-01 [7d0b8e6](https://github.com/silverstripe/silverstripe-framework/commit/7d0b8e6520a246bd20204613233a0a6ad0f19437) Fix permission checking code not correctly handling escaped SQL identifiers (Damian Mooyman) + * 2016-07-28 [6c37532](https://github.com/silverstripe/silverstripe-framework/commit/6c37532a7ae4877fe1eaff45f41ff9902d5cccee) Gridfield delete action back link (#5848) (Jono Menz) + * 2016-07-28 [c965133](https://github.com/silverstripe/silverstripe-cms/commit/c965133da03941fc736384d17518dc37be3d0e07) Direct edit file by URL (Jonathon Menz) + * 2016-07-25 [3306deb](https://github.com/silverstripe/silverstripe-cms/commit/3306deb69b88473efac009f46a90cbaa6bb27351) Fix link concatenation in SilverStripeNavigator (#1560) (Damian Mooyman) + * 2016-07-25 [9c7c7f6](https://github.com/silverstripe/silverstripe-framework/commit/9c7c7f6aa945ce5eeea3468bca59e5496e765016) Fix regression in missing require_js from #4259 (Damian Mooyman) + * 2016-07-22 [82e5431](https://github.com/silverstripe/silverstripe-cms/commit/82e54314bf2d26a5eb233018f472e248e44dc1ba) do not show HiddenClass pages in allowed children (#1555) (Robbie Averill) + * 2016-07-20 [319d6d2](https://github.com/silverstripe/silverstripe-framework/commit/319d6d293e873d989c55473a0aa7ae1679010474) Fix doclink (#5827) (Damian Mooyman) + * 2016-07-19 [10e06dc](https://github.com/silverstripe/silverstripe-cms/commit/10e06dce507c6f9b3588e4f8669ce36ee843f79e) Fixes #1054 By preventing errors in the CMS _only_. (Russell Michell) + * 2016-07-15 [b3fea37](https://github.com/silverstripe/silverstripe-framework/commit/b3fea3723fae822068a6b761a682011b0970fff5) Fixes support for "inline" form actions (fixes #2534) (Loz Calver) + * 2016-07-12 [24efc7e](https://github.com/silverstripe/silverstripe-framework/commit/24efc7edf83bb06b5a01080d2742c07ef68d21b2) Fix sorting ArrayList with sql-like syntax (Damian Mooyman) + * 2016-07-12 [8123c43](https://github.com/silverstripe/silverstripe-cms/commit/8123c433f01ca1ce59062e45ad90bac13be1e990) Fix getAbsoluteLiveLink() concatenation (Damian Mooyman) + * 2016-07-12 [87477a1](https://github.com/silverstripe-labs/silverstripe-reports/commit/87477a1e01d03ebee7eb71c352b3da47da73a9f2) Fix incorrect url manipulation (Damian Mooyman) + * 2016-07-07 [4aa1fc2](https://github.com/silverstripe/silverstripe-framework/commit/4aa1fc2d2cafd1c90401896cefb03e64b530a59c) Changed form fields that call renderWith in Field() to call parent::Field() instead (#5783) (Ed Chipman) + * 2016-07-07 [27cea80](https://github.com/silverstripe/silverstripe-framework/commit/27cea80b15a986d43b832658b13d01c08a5cfce1) SS_ConfigStaticManifest_Parser failed to handle ::class syntax (fixes #5701) (#5781) (Loz Calver) + * 2016-07-04 [0b7dab3](https://github.com/silverstripe/silverstripe-framework/commit/0b7dab3f66d64a4415b436b4301d4608b01b0597) Fix missing icons (Damian Mooyman) + * 2016-07-01 [39238d9](https://github.com/silverstripe/silverstripe-framework/commit/39238d908e0ed077d7aaf773562749468b6827ee) falsey attribute values in shortcodes now work (Daniel Hensby) + * 2016-06-30 [2cdfe6c](https://github.com/silverstripe/silverstripe-framework/commit/2cdfe6cc21f0cb253401fa169b5e1c3bb8738d43) Use RAW for DBField template helpers (Daniel Hensby) + * 2016-06-30 [b0f237b](https://github.com/silverstripe/silverstripe-framework/commit/b0f237bb3a336eea9f3a9f9bece2b65661c03cbc) Use RAW instead of Value for parsing shortcodes (Daniel Hensby) + * 2016-06-13 [f0d4951](https://github.com/silverstripe/silverstripe-framework/commit/f0d49518152bb9743e32174bc870fac6951c161d) for #5683: Address security warning in CMS when attempting to access <iframe> contents (Back-porting fix from PR #5163) (Patrick Nelson) + * 2016-06-08 [bf00810](https://github.com/silverstripe/silverstripe-framework/commit/bf00810e1f5a7164d74ad66f3d03e813d81dfa25) Fix buttonClicked() error (Damian Mooyman) + * 2016-06-06 [946495b](https://github.com/silverstripe/silverstripe-framework/commit/946495bcf575d727726dcacc0a6eba596661cfa2) Regression with <% with / %> (fixes #5656) (Loz Calver) + * 2016-05-31 [eba89b9](https://github.com/silverstripe/silverstripe-cms/commit/eba89b9520a0103e4c0cb4b6730c3c0742f8b0d9) OldPageRedirector no longer loops infinitely if 404 thrown on existing page (Daniel Hensby) + * 2016-05-31 [341f49c](https://github.com/silverstripe/silverstripe-framework/commit/341f49c630c23ee665c195250c19935763172e36) Fixed lookup of next closest visible field for focus restoring (fixes #5618) (UndefinedOffset) + * 2016-05-27 [f1a0aef](https://github.com/silverstripe/silverstripe-framework/commit/f1a0aef0d7e18b921b53a381ff8489bc5c12740b) fix CMS_ACCESS permission being ignored if in incorrect order in array (Damian Mooyman) + * 2016-05-21 [decd7e5](https://github.com/silverstripe/silverstripe-framework/commit/decd7e5c57a0839cb873c86782a870326ffa175a) Fix getFinalisedQuery not including all queried columns (Damian Mooyman) + * 2016-05-20 [8382685](https://github.com/silverstripe/silverstripe-framework/commit/83826850346bc486bc4599dca56067897961cbfa) #5557 Tests with no DB requirements wont create test DB (Daniel Hensby) + * 2016-04-19 [43dcde5](https://github.com/silverstripe/silverstripe-framework/commit/43dcde5197e0995225235f69937ed57bec0cd7e2) Hierarchy was incorrectly unexpanding nodes that had been previously expanded (madmatt) + * 2016-01-22 [4bd66b9](https://github.com/silverstripe/silverstripe-framework/commit/4bd66b9d3693492806bb4e9a512f8ae623c6a306) for #4909: Ensure RSSFeed_Entry is instantiated using the injector. (Patrick Nelson) + * 2015-04-21 [a7100e9](https://github.com/silverstripe/silverstripe-framework/commit/a7100e9006b27e7885eb2ce851d9bc0839ca4468) Object::parse_class_spec failed to parse associative arrays (Loz Calver) diff --git a/forms/gridfield/GridFieldDetailForm.php b/forms/gridfield/GridFieldDetailForm.php index 65e24041a..e2fd8c960 100644 --- a/forms/gridfield/GridFieldDetailForm.php +++ b/forms/gridfield/GridFieldDetailForm.php @@ -407,6 +407,14 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler { } } + // this pushes the current page ID in as a hidden field + // this means the request will have the current page ID in it + // rather than relying on session which can have been rewritten + // by the user having another tab open + // see LeftAndMain::currentPageID + if($this->controller->hasMethod('currentPageID') && $this->controller->currentPageID()) { + $fields->push(new HiddenField('CMSMainCurrentPageID', null, $this->controller->currentPageID())); + } // Caution: API violation. Form expects a Controller, but we are giving it a RequestHandler instead. // Thanks to this however, we are able to nest GridFields, and also access the initial Controller by // dereferencing GridFieldDetailForm_ItemRequest->getController() multiple times. See getToplevelController @@ -598,6 +606,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler { public function doDelete($data, $form) { $title = $this->record->Title; + $backLink = $this->getBacklink(); try { if (!$this->record->canDelete()) { throw new ValidationException( @@ -628,7 +637,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler { $controller = $this->getToplevelController(); $controller->getRequest()->addHeader('X-Pjax', 'Content'); // Force a content refresh - return $controller->redirect($this->getBacklink(), 302); //redirect back to admin section + return $controller->redirect($backLink, 302); //redirect back to admin section } /** diff --git a/javascript/lang/fa_IR.js b/javascript/lang/fa_IR.js index 208077815..a02ef9f34 100644 --- a/javascript/lang/fa_IR.js +++ b/javascript/lang/fa_IR.js @@ -10,40 +10,40 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') { "FILEIFRAMEFIELD.DELETEFILE": "حذف فایل", "FILEIFRAMEFIELD.DELETEIMAGE": "حذف تصویر", "FILEIFRAMEFIELD.UNATTACHFILE": "حذف ضمیمه فایل", - "GRIDFIELD.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later.", + "GRIDFIELD.ERRORINTRANSACTION": "یک خطا هنگام دستیابی به دادههای سرور روی داد\nلطفاً بعداً تلاش نمایید.", "HASMANYFILEFIELD.UPLOADING": "در حال آپلود... %s", - "HtmlEditorField.SelectAnchor": "Select an anchor", + "HtmlEditorField.SelectAnchor": "انتخاب یک محل ارجاع لینک", "LOADING": "بارگذاری...", - "LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.", - "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field", + "LeftAndMain.IncompatBrowserWarning": "مرورگر شما با محیط کاربری سیاماس سازگار نیست. لطفاً از اینترنت اکسپلورر نسخه 7 به بعد، گوگل کروم 10 به بعد یا موزیلا فایرفاکس 3.5 به بعد استفاده کنید.", + "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "کاراکتر '%s' نمیتواند در این فیلد استفاده شود", "TABLEFIELD.DELETECONFIRMMESSAGE": "آیا مطمئن هستید که میخواهید این رکورد حذف شود؟", - "TreeDropdownField.ENTERTOSEARCH": "Press enter to search", - "TreeDropdownField.FieldTitle": "انتخاب کنید", + "TreeDropdownField.ENTERTOSEARCH": "جهت جستجو دکمهی enter را بزنید", + "TreeDropdownField.FieldTitle": "انتخاب", "TreeDropdownField.OpenLink": "باز کنید", - "TreeDropdownField.SearchFieldTitle": "گزینش یا جستجو", - "UNIQUEFIELD.CANNOTLEAVEEMPTY": "This field cannot be left empty", - "UNIQUEFIELD.ENTERNEWVALUE": "You will need to enter a new value for this field", - "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s", - "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s", - "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'", - "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?", - "UploadField.EMPTYRESULT": "Empty file upload result", - "UploadField.Editing": "Editing ...", - "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)", + "TreeDropdownField.SearchFieldTitle": "انتخاب یا جستجو", + "UNIQUEFIELD.CANNOTLEAVEEMPTY": "این فیلد نمیتواند خالی بماند", + "UNIQUEFIELD.ENTERNEWVALUE": "شما نیازمند این هستید که ارزش جدیدی برای این فیلد وارد نمایید", + "UNIQUEFIELD.SUGGESTED": "ارزش به '%s' : %s تغییر کرد", + "UPDATEURL.CONFIRM": "آیا میخواهید که نشانی اینترنتی را تغییر دهم به:\n\n%s/\n\nبله را کلیک نمایید تا نشانی تغییر یابد، لغو را کلیک کنید تا بدین شکل باقی بماند:\n\n%s", + "UPDATEURL.CONFIRMURLCHANGED": "نشانی اینترنتی تغییر یافت به\n'%s'", + "UploadField.ConfirmDelete": "آیا مطمئن هستید که میخواهید این فایل از فایلسیستم سرور حذف شود؟", + "UploadField.EMPTYRESULT": "نتیجهی آپلود فایل خالی است", + "UploadField.Editing": "ویراستن ...", + "UploadField.HTML_MAXFILESIZE": "فایل از MAX_FILE_SIZE تجاوز میکند (اچتیامال از متضمن دستور)", "UploadField.INVALIDEXTENSION": "قالب مجاز نیست", - "UploadField.LOADING": "بارگذاری...", - "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded", + "UploadField.LOADING": "بارگذاری ...", + "UploadField.MAXNUMBEROFFILESSIMPLE": "از حداکثر تعداد فایل تجاوز کرد", "UploadField.NOFILEUPLOADED": "هیچ فایلی آپلود نشد", - "UploadField.NOTMPFOLDER": "Missing a temporary folder", - "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded", + "UploadField.NOTMPFOLDER": "پوشهی موقت پیدا نشد", + "UploadField.ONLYPARTIALUPLOADED": "تنها بخشهایی از فایل آپلود شده است", "UploadField.OVERWRITEWARNING": "فایل با نام یکسان از پیش وجود دارد", - "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)", - "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension", - "UploadField.TOOLARGE": "Filesize is too large", - "UploadField.TOOSMALL": "Filesize is too small", - "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size", + "UploadField.PHP_MAXFILESIZE": "فایل از upload_max_filesize تجاوز میکند (متضمن دستور php.ini)", + "UploadField.STOPEDBYEXTENSION": "آپلود فایل به دلیل قالب متوقف شد", + "UploadField.TOOLARGE": "حجم فایل بسیار زیاد است", + "UploadField.TOOSMALL": "حجم فایل بسیار کم است", + "UploadField.UPLOADEDBYTES": "بایتهای آپلودشده از سایز فایل تجاوز میکند", "UploadField.Uploaded": "آپلودشده", - "UploadField.WRITEFAILED": "Failed to write file to disk", + "UploadField.WRITEFAILED": "ناتوان از نگارش فایل بر هارددیسک", "VALIDATOR.FIELDREQUIRED": "لطفاً \"%s\" را تکمیل نمایید، پرکردن آن الزامی است." }); } \ No newline at end of file diff --git a/javascript/lang/src/fa_IR.js b/javascript/lang/src/fa_IR.js index 7ee642d51..e15b611e2 100644 --- a/javascript/lang/src/fa_IR.js +++ b/javascript/lang/src/fa_IR.js @@ -3,39 +3,39 @@ "FILEIFRAMEFIELD.DELETEFILE": "حذف فایل", "FILEIFRAMEFIELD.DELETEIMAGE": "حذف تصویر", "FILEIFRAMEFIELD.UNATTACHFILE": "حذف ضمیمه فایل", - "GRIDFIELD.ERRORINTRANSACTION": "An error occured while fetching data from the server\n Please try again later.", + "GRIDFIELD.ERRORINTRANSACTION": "یک خطا هنگام دستیابی به دادههای سرور روی داد\nلطفاً بعداً تلاش نمایید.", "HASMANYFILEFIELD.UPLOADING": "در حال آپلود... %s", - "HtmlEditorField.SelectAnchor": "Select an anchor", + "HtmlEditorField.SelectAnchor": "انتخاب یک محل ارجاع لینک", "LOADING": "بارگذاری...", - "LeftAndMain.IncompatBrowserWarning": "Your browser is not compatible with the CMS interface. Please use Internet Explorer 7+, Google Chrome 10+ or Mozilla Firefox 3.5+.", - "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "The character '%s' cannot be used in this field", + "LeftAndMain.IncompatBrowserWarning": "مرورگر شما با محیط کاربری سیاماس سازگار نیست. لطفاً از اینترنت اکسپلورر نسخه 7 به بعد، گوگل کروم 10 به بعد یا موزیلا فایرفاکس 3.5 به بعد استفاده کنید.", + "RESTRICTEDTEXTFIELD.CHARCANTBEUSED": "کاراکتر '%s' نمیتواند در این فیلد استفاده شود", "TABLEFIELD.DELETECONFIRMMESSAGE": "آیا مطمئن هستید که میخواهید این رکورد حذف شود؟", - "TreeDropdownField.ENTERTOSEARCH": "Press enter to search", - "TreeDropdownField.FieldTitle": "انتخاب کنید", + "TreeDropdownField.ENTERTOSEARCH": "جهت جستجو دکمهی enter را بزنید", + "TreeDropdownField.FieldTitle": "انتخاب", "TreeDropdownField.OpenLink": "باز کنید", - "TreeDropdownField.SearchFieldTitle": "گزینش یا جستجو", - "UNIQUEFIELD.CANNOTLEAVEEMPTY": "This field cannot be left empty", - "UNIQUEFIELD.ENTERNEWVALUE": "You will need to enter a new value for this field", - "UNIQUEFIELD.SUGGESTED": "Changed value to '%s' : %s", - "UPDATEURL.CONFIRM": "Would you like me to change the URL to:\n\n%s/\n\nClick Ok to change the URL, click Cancel to leave it as:\n\n%s", - "UPDATEURL.CONFIRMURLCHANGED": "The URL has been changed to\n'%s'", - "UploadField.ConfirmDelete": "Are you sure you want to remove this file from the server filesystem?", - "UploadField.EMPTYRESULT": "Empty file upload result", - "UploadField.Editing": "Editing ...", - "UploadField.HTML_MAXFILESIZE": "File exceeds MAX_FILE_SIZE (HTML form directive)", + "TreeDropdownField.SearchFieldTitle": "انتخاب یا جستجو", + "UNIQUEFIELD.CANNOTLEAVEEMPTY": "این فیلد نمیتواند خالی بماند", + "UNIQUEFIELD.ENTERNEWVALUE": "شما نیازمند این هستید که ارزش جدیدی برای این فیلد وارد نمایید", + "UNIQUEFIELD.SUGGESTED": "ارزش به '%s' : %s تغییر کرد", + "UPDATEURL.CONFIRM": "آیا میخواهید که نشانی اینترنتی را تغییر دهم به:\n\n%s/\n\nبله را کلیک نمایید تا نشانی تغییر یابد، لغو را کلیک کنید تا بدین شکل باقی بماند:\n\n%s", + "UPDATEURL.CONFIRMURLCHANGED": "نشانی اینترنتی تغییر یافت به\n'%s'", + "UploadField.ConfirmDelete": "آیا مطمئن هستید که میخواهید این فایل از فایلسیستم سرور حذف شود؟", + "UploadField.EMPTYRESULT": "نتیجهی آپلود فایل خالی است", + "UploadField.Editing": "ویراستن ...", + "UploadField.HTML_MAXFILESIZE": "فایل از MAX_FILE_SIZE تجاوز میکند (اچتیامال از متضمن دستور)", "UploadField.INVALIDEXTENSION": "قالب مجاز نیست", - "UploadField.LOADING": "بارگذاری...", - "UploadField.MAXNUMBEROFFILESSIMPLE": "Max number of files exceeded", + "UploadField.LOADING": "بارگذاری ...", + "UploadField.MAXNUMBEROFFILESSIMPLE": "از حداکثر تعداد فایل تجاوز کرد", "UploadField.NOFILEUPLOADED": "هیچ فایلی آپلود نشد", - "UploadField.NOTMPFOLDER": "Missing a temporary folder", - "UploadField.ONLYPARTIALUPLOADED": "File was only partially uploaded", + "UploadField.NOTMPFOLDER": "پوشهی موقت پیدا نشد", + "UploadField.ONLYPARTIALUPLOADED": "تنها بخشهایی از فایل آپلود شده است", "UploadField.OVERWRITEWARNING": "فایل با نام یکسان از پیش وجود دارد", - "UploadField.PHP_MAXFILESIZE": "File exceeds upload_max_filesize (php.ini directive)", - "UploadField.STOPEDBYEXTENSION": "File upload stopped by extension", - "UploadField.TOOLARGE": "Filesize is too large", - "UploadField.TOOSMALL": "Filesize is too small", - "UploadField.UPLOADEDBYTES": "Uploaded bytes exceed file size", + "UploadField.PHP_MAXFILESIZE": "فایل از upload_max_filesize تجاوز میکند (متضمن دستور php.ini)", + "UploadField.STOPEDBYEXTENSION": "آپلود فایل به دلیل قالب متوقف شد", + "UploadField.TOOLARGE": "حجم فایل بسیار زیاد است", + "UploadField.TOOSMALL": "حجم فایل بسیار کم است", + "UploadField.UPLOADEDBYTES": "بایتهای آپلودشده از سایز فایل تجاوز میکند", "UploadField.Uploaded": "آپلودشده", - "UploadField.WRITEFAILED": "Failed to write file to disk", + "UploadField.WRITEFAILED": "ناتوان از نگارش فایل بر هارددیسک", "VALIDATOR.FIELDREQUIRED": "لطفاً \"%s\" را تکمیل نمایید، پرکردن آن الزامی است." } \ No newline at end of file diff --git a/lang/cs.yml b/lang/cs.yml index d05aa48da..6b774c4cc 100644 --- a/lang/cs.yml +++ b/lang/cs.yml @@ -210,15 +210,12 @@ cs: JsType: 'Javascript soubor' Mp3Type: 'MP3 audio soubor' MpgType: 'MPEG video soubor' - NOFILESIZE: 'Velikost souboru je 0 bajtů.' NOVALIDUPLOAD: 'Soubor není validní pro nahrání' Name: Jméno PLURALNAME: Soubory PdfType: 'Adobe Acrobat PDF soubor' PngType: 'PNG obrázek - vhodný jako univerzálmí formát' SINGULARNAME: Soubor - TOOLARGE: 'Velikost souboru je příliš velká, povolené maximum {size}' - TOOLARGESHORT: 'Velikost souboru překračuje {size}' TiffType: 'Tiff formát obrázku' Title: Titulek WavType: 'WAV audo soubor' @@ -381,8 +378,6 @@ cs: FROMWEB: 'Z webu' FindInFolder: 'Hledat ve složce' IMAGEALT: 'Alternativní text (alt)' - IMAGEALTTEXT: 'Alternativní text (alt) - bude ukázán, když obrázek nemúže být zobrazen' - IMAGEALTTEXTDESC: 'Zobrazeno na obrazovce, když obrázek nemůže být zobrazen' IMAGEDIMENSIONS: Rozměry IMAGEHEIGHTPX: Výška IMAGETITLE: 'Titul text (tooltip) - další informace o obrázku' @@ -417,13 +412,10 @@ cs: CANCEL: Storno CANT_REORGANISE: 'Nemáte oprávnění měnit stránky nejvyšší úrovně. Vaše změna nebyla uložena.' DELETED: Smazáno. - DropdownBatchActionsDefault: 'Vyberte akci...' HELP: Nápověda - PAGETYPE: 'Typ stránky' PERMAGAIN: 'Byli jste odhlášeni z CMS. Pokud se chcete znovu přihlásit, zadejte níže své uživatelské jméno a heslo.' PERMALREADY: 'Omlouvám se, ale nemůžete vstoupit do této části CMS. Pokud se chcete přihlásit jako někdo jiný, udělejte tak níže.' PERMDEFAULT: 'Musíte být přihlášen/a k přístup do oblasti administrace, níže zadejte vaše přihlašovací údaje, prosím.' - PLEASESAVE: 'Prosím uložte stránku: Tato stránka nemohla být aktualizována, protože ještě nebyla uložena.' PreviewButton: Náhled REORGANISATIONSUCCESSFUL: 'Strom webu reorganizován úspěšně.' SAVEDUP: Uloženo. @@ -479,7 +471,6 @@ cs: SUBJECTPASSWORDRESET: 'Nulovací odkaz pro Vaše heslo' SURNAME: Příjmení TIMEFORMAT: 'Formát času' - VALIDATIONMEMBEREXISTS: 'Již existuje člen se stejným {identifier}' ValidationIdentifierFailed: 'Nemůžete přepsat existujícího člena #{id} s identickým identifikátorem ({name} = {value}))' WELCOMEBACK: 'Vítejte zpět, {firstname}' YOUROLDPASSWORD: 'Vaše staré heslo' diff --git a/lang/de.yml b/lang/de.yml index 24338f24b..b00176f9c 100644 --- a/lang/de.yml +++ b/lang/de.yml @@ -332,8 +332,6 @@ de: FROMWEB: 'Aus dem Web' FindInFolder: 'In Ordner suchen' IMAGEALT: 'Alternativtext (alt)' - IMAGEALTTEXT: 'Alternativtext (alt) - erscheint, falls das Bild nicht angezeigt werden kann.' - IMAGEALTTEXTDESC: 'Wird von Screenreadern vorgelesen oder angezeigt, falls das Bild nicht angezeigt werden kann.' IMAGEDIMENSIONS: Dimensionen IMAGEHEIGHTPX: Höhe (px) IMAGETITLE: 'Titeltext (Tooltip) - für zusätzliche Informationen über das Bild' @@ -367,13 +365,10 @@ de: CANCEL: Abbrechen CANT_REORGANISE: 'Sie besitzen nicht die benötigten Zugriffsrechte um Seiten der höchsten Ebene zu bearbeiten. Ihre Änderungen wurden nicht gespeichert.' DELETED: Gelöscht. - DropdownBatchActionsDefault: 'Aktion auswählen...' HELP: Hilfe - PAGETYPE: 'Seitentyp' PERMAGAIN: 'Sie wurden aus dem System ausgeloggt. Falls Sie sich wieder einloggen möchten, geben Sie bitte Benutzernamen und Passwort im untenstehenden Formular an.' PERMALREADY: 'Leider dürfen Sie diesen Teil des CMS nicht aufrufen. Wenn Sie sich als jemand anderes einloggen wollen, benutzen Sie bitte das nachstehende Formular.' PERMDEFAULT: 'Sie müssen angemeldet sein, um auf diesen Bereich zugreifen zu können. Bitte geben Sie Ihre Zugangsdaten ein.' - PLEASESAVE: 'Diese Seite konnte nicht aktualisiert werden weil sie noch nicht gespeichert wurde - bitte speichern.' PreviewButton: Vorschau REORGANISATIONSUCCESSFUL: 'Der Seitenbaum wurde erfolgreich sortiert.' SAVEDUP: Gespeichert. diff --git a/lang/eo.yml b/lang/eo.yml index ecbe8652d..bd4026829 100644 --- a/lang/eo.yml +++ b/lang/eo.yml @@ -210,15 +210,12 @@ eo: JsType: 'Ĝavaskripta dosiero' Mp3Type: 'MP3-sondosiero' MpgType: 'AVI-videa dosiero' - NOFILESIZE: 'Dosiero havas nul bajtojn.' NOVALIDUPLOAD: 'Dosiero ne estas valida alŝutaĵo.' Name: Nomo PLURALNAME: Dosieroj PdfType: 'Dosiero de Adobe Acrobat PDF' PngType: 'PNG-bildo - ĝeneralcela formato' SINGULARNAME: Dosiero - TOOLARGE: 'Dosiero estas tro granda. La maksimumo estas {size}' - TOOLARGESHORT: 'Grando de dosiero superas {size}' TiffType: 'Markita bildoformato' Title: Titolo WavType: 'WAV-sondosiero' @@ -381,8 +378,6 @@ eo: FROMWEB: 'El la TTT' FindInFolder: 'Serĉi en dosierujo' IMAGEALT: 'Alternativa teksto (alt)' - IMAGEALTTEXT: 'Alternativa teksto (alt) - vidiĝas se ne eblas vidigi bildon' - IMAGEALTTEXTDESC: 'Vidigita al ekranlegiloj aŭ se ne eblas vidigi bildon' IMAGEDIMENSIONS: Dimensioj IMAGEHEIGHTPX: Alto IMAGETITLE: 'Titola teksto (ŝpruchelpilo) - por plua informo pri la bildo' @@ -417,13 +412,10 @@ eo: CANCEL: Rezigni CANT_REORGANISE: 'Vi ne rajtas ŝanĝi supronivelajn paĝojn. Via ŝanĝo ne konserviĝis.' DELETED: Forigita. - DropdownBatchActionsDefault: 'Elekti agon...' HELP: Helpo - PAGETYPE: 'Tipo de paĝo' PERMAGAIN: 'Vin adiaŭis la CMS. Se vi volas denove saluti, enigu salutnomon kaj pasvorton malsupre.' PERMALREADY: 'Bedaŭrinde vi ne povas aliri tiun parton de la CMS. Se vi volas ensaluti kiel aliulo, faru tion sube.' PERMDEFAULT: 'Necesas ensaluti por aliri la administran zonon; bonvolu enigi viajn akreditaĵoj sube.' - PLEASESAVE: 'Bonvolu konservi paĝon: Ne eblis ĝisdatigi ĉi tiun paĝon ĉar ĝi ankoraŭ ne estas konservita.' PreviewButton: Antaŭvido REORGANISATIONSUCCESSFUL: 'Sukcese reorganizis la retejan arbon.' SAVEDUP: Konservita. @@ -479,7 +471,6 @@ eo: SUBJECTPASSWORDRESET: 'Via pasvorto reagordis ligilon' SURNAME: Familia nomo TIMEFORMAT: 'Formato de horo' - VALIDATIONMEMBEREXISTS: 'Jam ekzistas membro kun la sama {identifier}' ValidationIdentifierFailed: 'Ne povas anstataŭigi ekzistantan membron #{id} per sama identigilo ({name} = {value}))' WELCOMEBACK: 'Bonvenon denove, {firstname}' YOUROLDPASSWORD: 'Vian malnovan pasvorton' diff --git a/lang/fa_IR.yml b/lang/fa_IR.yml index f5c7abf05..b76eff838 100644 --- a/lang/fa_IR.yml +++ b/lang/fa_IR.yml @@ -1,6 +1,12 @@ fa_IR: + AddToCampaign: + ErrorCampaignPermissionDenied: 'به نظر میرسد شما دسترسیهای لازم برای افزودن {ObjectTitle} به {CampaignTitle} را ندارید' + ErrorGeneral: 'پوزش میطلبیم، اما خطایی رخ داد' + ErrorItemPermissionDenied: 'به نظر میرسد شما دسترسیهای لازم برای افزودن {ObjectTitle} به کمپین را ندارید' + ErrorNotFound: 'این {Type} یافت نشد' + Success: '{ObjectTitle} با موفقیت به {CampaignTitle} افزوده شد' AssetAdmin: - ALLOWEDEXTS: 'قالبهای مجاز آپلود فایل' + ALLOWEDEXTS: 'قالبهای مجاز جهت آپلود فایل' HIDEALLOWEDEXTS: 'مخفیکردن قالبهای مجاز' NEWFOLDER: پوشهی جدید SHOWALLOWEDEXTS: 'نمایش قالبهای مجاز' @@ -30,11 +36,12 @@ fa_IR: INSERTURL: 'واردکردن از نشانی اینترنتی' REMOVEINFO: 'حذف این فایل از این فیلد' TOTAL: مجموع + TOUPLOAD: 'انتخاب فایلها جهت آپلود...' UPLOADINPROGRESS: 'لطفاً صبر کنید... آپلود در جریان است' UPLOADOR: یا BBCodeParser: ALIGNEMENT: جاگذاری - ALIGNEMENTEXAMPLE: 'راستچین' + ALIGNEMENTEXAMPLE: 'راستچین شده' BOLD: 'متن درشت' BOLDEXAMPLE: درشت CODE: 'بلوک کد' @@ -47,7 +54,7 @@ fa_IR: IMAGE: عکس IMAGEDESCRIPTION: 'نمایش یک تصویر در ارسال شما' ITALIC: 'نوشته ایتالیک' - ITALICEXAMPLE: ایتالیک + ITALICEXAMPLE: ایتالیکها LINK: 'لینک وبسایت' LINKDESCRIPTION: 'لینک به یک وبسایت یا نشانی اینترنتی دیگر' STRUCK: 'متن باطلشده' @@ -67,6 +74,8 @@ fa_IR: ANY: هر NOANSWER: 'خیر' YESANSWER: 'بله' + CAMPAIGNS: + ADDTOCAMPAIGN: 'افزودن به کمپین' CMSLoadingScreen_ss: LOADING: بارگذاری... REQUIREJS: 'سیاماس نیازمند این است که جاوااسکریپت را فعال نمایید.' @@ -93,12 +102,29 @@ fa_IR: SUCCESSCONTENT: '
ورود موفق. اگر بهطور خودکار ارجاع نشدید اینجا را کلیک کنید.
' TimedOutTitleAnonymous: 'جلسه شما به پایان رسیده است.' TimedOutTitleMember: 'سلام {name}!Accesso eseguito. Se non sarai ridirezionato automaticamente, cliccare qui
' TimedOutTitleAnonymous: 'La tua sessione è scaduta.' TimedOutTitleMember: 'Ciao {name}!Importa gruppi in formato CSV (valori separati da virgole). Mostra utilizzo avanzato
' + Help2: 'Importa utenti in formato CSV (valori separati da virgole). Mostra utilizzo avanzato
' + Help2: '