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

Merge pull request #6879 from mikenz/patch-11

Browse Source 
MINOR: Fix mismatched brackets
This commit is contained in:
Daniel Hensby 2017-05-11 11:57:46 +01:00 committed by GitHub
commit a65ae8353a
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/en.yml
View File

@ -197,10 +197,10 @@ en:
SilverStripe\ORM\FieldType\DBEnum: SilverStripe\ORM\FieldType\DBEnum:
ANY: Any ANY: Any
SilverStripe\ORM\Hierarchy: SilverStripe\ORM\Hierarchy:
LIMITED_TITLE: 'Too many children ({count}}' LIMITED_TITLE: 'Too many children ({count})'
SilverStripe\ORM\Hierarchy\Hierarchy: SilverStripe\ORM\Hierarchy\Hierarchy:
InfiniteLoopNotAllowed: 'Infinite loop found within the "{type}" hierarchy. Please change the parent to resolve this' InfiniteLoopNotAllowed: 'Infinite loop found within the "{type}" hierarchy. Please change the parent to resolve this'
LIMITED_TITLE: 'Too many children ({count}}' LIMITED_TITLE: 'Too many children ({count})'
SilverStripe\ORM\ValidationException: SilverStripe\ORM\ValidationException:
DEFAULT_ERROR: 'Validation error' DEFAULT_ERROR: 'Validation error'
SilverStripe\Security\BasicAuth: SilverStripe\Security\BasicAuth:

2
templates/SilverStripe/Forms/Includes/TreeDropdownField_HTML.ss
View File

@ -7,7 +7,7 @@
<% end_if %> <% end_if %>
<% if $limited %> <% if $limited %>
<li><%t SilverStripe\\ORM\\Hierarchy.LIMITED_TITLE 'Too many children ({count}}' count=$count %></li> <li><%t SilverStripe\\ORM\\Hierarchy.LIMITED_TITLE 'Too many children ({count})' count=$count %></li>
<% else_if $children %> <% else_if $children %>
<% loop $children %> <% loop $children %>
<li id="selector-{$name}-{$id}" data-id="{$id}" <li id="selector-{$name}-{$id}" data-id="{$id}"

2
templates/SilverStripe/ORM/Hierarchy/Includes/MarkedSet_HTML.ss
View File

@ -1,7 +1,7 @@
<% if $children || $limited %> <% if $children || $limited %>
<ul> <ul>
<% if $limited %> <% if $limited %>
<li><%t SilverStripe\\ORM\\Hierarchy\\Hierarchy.LIMITED_TITLE 'Too many children ({count}}' count=$count %></li> <li><%t SilverStripe\\ORM\\Hierarchy\\Hierarchy.LIMITED_TITLE 'Too many children ({count})' count=$count %></li>
<% else_if $children %> <% else_if $children %>
<% loop $children %><li>$node.Title.XML $SubTree</li><% end_loop %> <% loop $children %><li>$node.Title.XML $SubTree</li><% end_loop %>
<% end_if %> <% end_if %>