Commit Graph

3357 Commits

Author SHA1 Message Date
Ingo Schommer
0ec269f1bd Merge branch '3.0-translation-compatibility-fixes' of git://github.com/tractorcow/silverstripe-cms into tractorcow-3.0-translation-compatibility-fixes
Conflicts:
	code/controllers/CMSMain.php
2012-08-23 22:53:27 +02:00
Damian Mooyman
7807842eb1 FIXED: Additional issue where the add-page ajax parameters wouldu incorrectly concatenate additional query parameters into the add action url. Resolved by moving URL concatenation from view to controller where Controller::join_links is available 2012-08-21 15:50:03 +12:00
Ingo Schommer
2e791abad2 Better i18n for "new page" label (fixes #7796)
Also using better standard name for auto generated
page names ("Page" instead of "Site Tree",  "Pages" instead of "Site Tres" [sic])
2012-08-20 22:25:18 +02:00
Ingo Schommer
e6e2ab4774 Updated translations 2012-08-20 22:01:46 +02:00
Sean Harvey
c019f22163 Fix notice when ErrorPage tries to create static error pages and can't write 2012-08-20 15:23:46 +12:00
Ingo Schommer
2923e55c71 BUG Restrict URLSegment preview to editable fields
This fixes a bug where the Translatable module
would have a duplicate preview because it had
another ".urlsegment" field showing the value in its
original language.

See https://github.com/silverstripe/silverstripe-translatable/issues/43
2012-08-16 09:48:54 +02:00
Ingo Schommer
f5007a5536 Allow extension of "add" link in CMS
First use case is the "translatable" module
2012-08-16 09:29:51 +02:00
Ingo Schommer
e486a16a8f "Edit tree" button alignment
Happens to work for the width of the english label,
but breaks on any other language with longer labels.
Don't make the button absolutely positioned.
Partially reverts 1e25637a.
2012-08-12 23:20:26 +02:00
Ingo Schommer
82699bae62 Updated translations 2012-08-12 22:49:46 +02:00
Will Rossiter
4bbd90487b BUG fix getting translated string for page type description (Fixes #7781). 2012-08-12 14:44:48 +12:00
Ruud Arentsen
18a40b4b5d BUG Adding siteconfig translations
translations were not added in the same translation group, and the
translation module didn't work. Also commited changes in the translation module, which will need this commit.
2012-08-10 10:16:39 +02:00
Will Rossiter
24ce0c199a Merge pull request #174 from adrexia/add-archive
BUG: Missing preview archive version button (fixes 7656)
2012-08-09 02:57:59 -07:00
Damian Mooyman
a6087f1d4e FIXED: Issue where links within the CMS page list view would not be correctly generated. E.g. when the translatable module is used, page links for the "show children" action would come up as admin/pages/?locale=en_NZ?ParentID=21&view=list when they should be shows as admin/pages/?locale=en_NZ&ParentID=21&view=list. Uses Controller::join_links to perform the necessary sanity check on urls. 2012-08-08 17:04:17 +12:00
Ingo Schommer
342ecd999d Removed custom entities from master file 2012-08-06 14:28:37 +02:00
Ingo Schommer
39a9093715 BUG SiteTree->provideI18nEntities() limited to class
Called for each subclass by the collector,
so we don't need to aggregate here.
In fact, its harmful because it causes entities
to be placed in the wrong definitions file.
The <class>.DESCRIPTION entity was always placed in cms/lang/en.yml,
regardless of the original location of the file containing the class.
2012-08-06 14:28:04 +02:00
Ingo Schommer
e925401cc3 BUG Re-added singular/plural name i18n entities
Previously "hidden" by inability of i18nTextCollector
to autoload classes in order to introspect them.
2012-08-06 14:05:21 +02:00
Ingo Schommer
77ec21fe9d BUG Fully qualified namespace for _t() in templates
Was inferred by the containing file previously,
which is deprecated behaviour, because it obscures
the fact that renaming an template file or copying
template code will change the context of the translations.
While it would be nice to use shorter and more readable namespaces,
this change would remove all existing translations.
Since there is no (easy) migration of entities to a new namespace,
having verbose template code is the lesser of two evils.
2012-08-06 13:44:33 +02:00
Ingo Schommer
2276336d6e Maori translation of URLSegment JS UI 2012-08-06 10:50:05 +02:00
Ingo Schommer
635c05b3b4 URLSegment JS UI globalization 2012-08-06 10:49:25 +02:00
Ingo Schommer
7e33fac7fa Updated translations 2012-08-06 10:43:41 +02:00
Ingo Schommer
671c7daa4c SiteConfig load/save with ID in CMS
Allow loading a SiteConfig by ID (by specifying $tree_class),
and pass the ID through with the form data. Unifies processing
with SiteTree, and allows the Translatable module
to use the same logic for interacting with the load/save process.
2012-08-06 09:36:25 +02:00
Ingo Schommer
9076286162 SiteTree->CMSEditLink()
Mainly to make it compatible with the Translatable
extension linking to existing translations of it,
but also to make it work similarly to the SiteTree logic elsewhere.
2012-08-05 20:52:22 +02:00
Will Rossiter
5938ab06ba Merge pull request #165 from silverstripe-droptables/search-form-fix
BUG: Check for the parameter existence.
2012-08-04 23:18:45 -07:00
Andrew Short
21bcc01878 ENHANCEMENT: Made the tree search form more extensible.
- Use DataQuery for generating the search query.
- For custom field matching, use searchcontext rather than a LIKE query.
- Added an extension hook for updating the search form.
2012-08-05 18:05:46 +12:00
Marcus Nyeholt
97d678b258 BUGFIX Provide default constructor value to filesystem publisher so that singleton calls (which don't pass params) don't fail 2012-08-05 18:02:13 +12:00
Naomi Guyer
7c0e38707c BUG: Missing preview archive version button (fixes 7656)
Added missing preview button
2012-07-31 17:49:59 +12:00
Hamish Friedlander
4c91a56277 Merge in changes from 3.0.1 final 2012-07-31 16:52:55 +12:00
Hamish Friedlander
795964275a Merge in changes from 3.0.1-rc3 2012-07-30 11:53:35 +12:00
Hamish Friedlander
267b9b87ae Updated translations 2012-07-30 10:51:13 +12:00
Hamish Friedlander
c96101654d BUG 15e2efb55d broke the Page ListView. 2012-07-28 15:43:13 +12:00
Stig Lindqvist
7fe7d2a5e0 Merge pull request #169 from adrexia/7698-merge-maori-language
BUG: Missing comma in Maori language translation
2012-07-25 23:04:11 -07:00
Naomi Guyer
7dfc7dec1d BUG: Missing comma in Maori language translation 2012-07-26 17:56:23 +12:00
Stig Lindqvist
d051be3f9c Merge pull request #168 from adrexia/7698-merge-maori-language
ENHANCEMENT: Maori Language javascript
2012-07-25 22:30:27 -07:00
Naomi Guyer
c97ed78fd9 ENHANCEMENT: Maori Language javascript 2012-07-26 17:21:16 +12:00
Hamish Friedlander
3a01ae61ea Updated translations 2012-07-25 13:26:14 +12:00
Hamish Friedlander
6d5d3d19b4 Merge remote-tracking branch 'origin/3.0' 2012-07-25 11:46:14 +12:00
Hamish Friedlander
6b20bc89ec Add javascript japanese translation - thanks Yuki Awano 2012-07-25 09:43:18 +12:00
Hamish Friedlander
9d6178b323 Merge pull request #167 from silverstripe-rebelalliance/trac/7450
'updatetreenodes' URL in tree template (#7450)
2012-07-23 03:21:51 -07:00
Hamish Friedlander
1717e400f6 Always show badge on current page in side tree 2012-07-23 22:16:39 +12:00
Hamish Friedlander
ace2dfe54f Make compass not include line number comments 2012-07-23 22:15:42 +12:00
Ingo Schommer
2ba3fbe42d 'updatetreenodes' URL in tree template (#7450) 2012-07-23 21:24:28 +12:00
Hamish Friedlander
605b11d8d1 Merge pull request #166 from silverstripe-rebelalliance/trac/5239
BUG 5239 Fix infinite loop in some cases w/ live subpage of draft page
2012-07-22 22:09:07 -07:00
carlos barberis
f7b6f1de5a BUGFIX: ticket #5239 - Infinite loop: live subpage of draft page redirects onto itself when called just by url segment 2012-07-23 17:06:37 +12:00
Mateusz Uzdowski
ee2b1a9070 BUG Check for the parameter existence.
The specific situation is if the SearchForm.ss is overriden, and the
$SearchQuery parameter is used in the template. This will throw a Notice
in case the form is rendered without searching.
2012-07-20 14:04:52 +12:00
Ingo Schommer
2ad40e1ba7 Merge remote-tracking branch 'origin/3.0' 2012-07-18 13:55:46 +02:00
Ingo Schommer
abc87a4f8f Localized CMS breadcrumbs title 2012-07-18 13:51:30 +02:00
Hamish Friedlander
d75a061c6f Merge pull request #162 from silverstripe-rebelalliance/3.0_5880
BUG: open ticket 5880 always show the current page type in the page type...
2012-07-16 14:46:57 -07:00
Kirk Mayo
b15fabaf0d BUG: open ticket 5880 always show the current page type in the page type dropdown list 2012-07-16 14:56:24 +12:00
Ingo Schommer
69e4fa072a Toggle metadata fields in SiteTree->getCMSFields()
To save space, reduce clutter and deemphasize the fields.
Partially fixes #7405, needs better design though.
2012-07-15 21:29:46 +02:00
Ingo Schommer
3ff0c428cf Ignore ajaxified tabsets on tab state saving
This prevents them from ping-ponging between the two states
in infinite loops.
2012-07-13 17:37:48 +02:00