tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Ingo Schommer 2012-08-06 13:44:33 +02:00
parent 2276336d6e
commit 77ec21fe9d
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
templates/CMSPageHistoryController_versions.ss
View File

@ -2,9 +2,9 @@
<thead>
<tr>
<th class="ui-helper-hidden"></th>
<th><% _t('WHEN','When') %></th>
<th><% _t('AUTHOR','Author') %></th>
<th><% _t('PUBLISHER','Publisher') %></th>
<th><% _t('CMSPageHistoryController_versions.ss.WHEN','When') %></th>
<th><% _t('CMSPageHistoryController_versions.ss.AUTHOR','Author') %></th>
<th><% _t('CMSPageHistoryController_versions.ss.PUBLISHER','Publisher') %></th>
</tr>
</thead>
@ -15,8 +15,8 @@
<% with LastEdited %>
<td class="last-edited first-column" title="$Ago - $Nice">$Nice</td>
<% end_with %>
<td><% if Author %>$Author.FirstName $Author.Surname.Initial<% else %><% _t('UNKNOWN','Unknown') %><% end_if %></td>
<td class="last-column"><% if Published %><% if Publisher %>$Publisher.FirstName $Publisher.Surname.Initial<% else %><% _t('UNKNOWN','Unknown') %><% end_if %><% else %><% _t('NOTPUBLISHED','Not published') %><% end_if %></td>
<td><% if Author %>$Author.FirstName $Author.Surname.Initial<% else %><% _t('CMSPageHistoryController_versions.ss.UNKNOWN','Unknown') %><% end_if %></td>
<td class="last-column"><% if Published %><% if Publisher %>$Publisher.FirstName $Publisher.Surname.Initial<% else %><% _t('CMSPageHistoryController_versions.ss.UNKNOWN','Unknown') %><% end_if %><% else %><% _t('CMSPageHistoryController_versions.ss.NOTPUBLISHED','Not published') %><% end_if %></td>
</tr>
<% end_loop %>
</tbody>

4
templates/Includes/AssetAdmin_Tools.ss
View File

@ -1,9 +1,9 @@
<div class="cms-content-tools west cms-panel cms-panel-layout collapsed" id="cms-content-tools-AssetAdmin" data-expandOnClick="true" data-layout-type="border">
<div class="cms-panel-content center">
<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
<h3 class="cms-panel-header"><% _t('AssetAdmin_Tools.FILTER', 'Filter') %></h3>
$SearchForm
</div>
<div class="cms-panel-content-collapsed">
<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
<h3 class="cms-panel-header"><% _t('AssetAdmin_Tools.FILTER', 'Filter') %></h3>
</div>
</div>

4
templates/Includes/CMSPagesController_ContentToolbar.ss
View File

@ -3,12 +3,12 @@
<% if CanOrganiseSitetree %>
<div class="checkboxAboveTree">
<input type="radio" name="view-mode" class="view-mode" value="draggable" id="view-mode-draggable" checked="checked" />
<label for="view-mode-draggable"><% _t("ENABLEDRAGGING","Drag'n'drop") %></label>
<label for="view-mode-draggable"><% _t("CMSPagesController_ContentToolbar.ss.ENABLEDRAGGING","Drag'n'drop") %></label>
</div>
<% end_if %>
<div>
<input type="radio" name="view-mode" class="view-mode" value="multiselect" id="view-mode-multiselect" />
<label for="view-mode-multiselect"><% _t("MULTISELECT","Multi-selection") %></label>
<label for="view-mode-multiselect"><% _t("CMSPagesController_ContentToolbar.ss.MULTISELECT","Multi-selection") %></label>
</div>
</div>
<% include CMSPagesController_ContentToolActions %>

4
templates/Includes/CMSPagesController_Tools.ss
View File

@ -1,9 +1,9 @@
<div class="cms-content-tools west cms-panel cms-panel-layout collapsed" data-expandOnClick="true" data-layout-type="border" id="cms-content-tools-CMSPagesController">
<div class="cms-panel-content center">
<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
<h3 class="cms-panel-header"><% _t('CMSPagesController_Tools.ss.FILTER', 'Filter') %></h3>
$SearchForm
</div>
<div class="cms-panel-content-collapsed">
<h3 class="cms-panel-header"><% _t('FILTER', 'Filter') %></h3>
<h3 class="cms-panel-header"><% _t('CMSPagesController_Tools.ss.FILTER', 'Filter') %></h3>
</div>
</div>

4
templates/email/ViewArchivedEmail.ss
View File

@ -1,3 +1,3 @@
<% _t('HAVEASKED','You have asked to view the content of our site on',30,'Followed by a date') %> $ArchiveDate.Date
<% _t('ViewArchivedEmail.ss.HAVEASKED','You have asked to view the content of our site on',30,'Followed by a date') %> $ArchiveDate.Date
<% _t('CANACCESS','You can access the archived site at this link:') %> $ArchiveURL
<% _t('ViewArchivedEmail.ss.CANACCESS','You can access the archived site at this link:') %> $ArchiveURL