Merge pull request #472 from creative-commoners/pulls/2/updating-translations

FIX updated translations to use namespaces
This commit is contained in:
Daniel Hensby 2017-09-18 10:44:45 +01:00 committed by GitHub
commit b83e0e8117
5 changed files with 69 additions and 84 deletions

View File

@ -1,8 +1,15 @@
en: en:
ArchiveWidget: SilverStripe\Blog\Forms\GridField\GridFieldAddByDBField:
PLURALNAME: 'Archive Widgets' Add: 'Add {name}'
SINGULARNAME: 'Archive Widget' AddFail: 'Unable to save {class} to the database.'
Blog: PermissionFail: 'You don''t have permission to create a {class}.'
SilverStripe\Blog\Forms\GridField\GridFieldBlogPostState:
Draft: 'Saved as Draft on {date}'
Published: 'Published on {date}'
Timer: 'Publish at {date}'
SilverStripe\Blog\Model:
Title: Title
SilverStripe\Blog\Model\Blog:
AND: and AND: and
Archive: Archive Archive: Archive
By: by By: by
@ -19,11 +26,13 @@ en:
FILTERDESCRIPTION_TAG: 'Tagged with {tag}' FILTERDESCRIPTION_TAG: 'Tagged with {tag}'
LumberjackTitle: 'Blog Posts' LumberjackTitle: 'Blog Posts'
NoPosts: 'There are no posts' NoPosts: 'There are no posts'
NoUnfeaturedPosts: 'There are no non-featured posts'
PERMISSIONS_CATEGORY: 'Blog permissions' PERMISSIONS_CATEGORY: 'Blog permissions'
PERMISSION_MANAGE_USERS_DESCRIPTION: 'Manage users for individual blogs' PERMISSION_MANAGE_USERS_DESCRIPTION: 'Manage users for individual blogs'
PERMISSION_MANAGE_USERS_HELP: 'Allow assignment of Editors, Writers, or Contributors to blogs' PERMISSION_MANAGE_USERS_HELP: 'Allow assignment of Editors, Writers, or Contributors to blogs'
PLURALNAME: 'Base Pages' PLURALNAME: Blogs
PLURALS:
one: 'A Blog'
other: '{count} Blogs'
Posted: Posted Posted: Posted
PostedIn: 'Posted in' PostedIn: 'Posted in'
PostsPerPage: 'Posts Per Page' PostsPerPage: 'Posts Per Page'
@ -33,87 +42,63 @@ en:
Tagged: Tagged Tagged: Tagged
Tags: Tags Tags: Tags
WRITER: Writer WRITER: Writer
BlogArchiveWidget: SilverStripe\Blog\Model\BlogCategory:
ArchiveType: ArchiveType Duplicate: 'A blog category already exists with that name.'
Blog: Blog
NumberToDisplay: 'No. to Display'
PLURALNAME: 'Blog Archive Widgets'
SINGULARNAME: 'Blog Archive Widget'
BlogCategoriesWidget:
Blog: Blog
Direction: Direction
Direction_Description: 'Change the direction of ordering of categories shown by this widget.'
Limit: Limit
Limit_Description: 'Limit the number of categories shown by this widget (set to 0 to show all categories).'
PLURALNAME: 'Blog Categories Widgets'
SINGULARNAME: 'Blog Categories Widget'
Sort: Sort
Sort_Description: 'Change the order of categories shown by this widget.'
BlogCategory:
Duplicate: 'A blog category already exists with that name'
PLURALNAME: 'Blog Categories' PLURALNAME: 'Blog Categories'
PLURALS:
one: 'A Blog Category'
other: '{count} Blog Categories'
SINGULARNAME: 'Blog Category' SINGULARNAME: 'Blog Category'
Title: Title SilverStripe\Blog\Model\BlogMemberExtension:
BlogEntry: BLOGPOSTS: 'Blog Posts'
DESCRIPTION: 'Generic content page' TABBLOGPOSTS: 'Blog Posts'
PLURALNAME: 'Base Pages' SilverStripe\Blog\Model\BlogPost:
SINGULARNAME: 'Blog Entry'
BlogHolder:
DESCRIPTION: 'Generic content page'
PLURALNAME: 'Base Pages'
SINGULARNAME: 'Blog Holder'
BlogPost:
AUTHOR: Author AUTHOR: Author
AdditionalCredits: 'Additional Credits' AdditionalCredits: 'Additional Credits'
AdditionalCredits_Description: 'If some authors of this post don''t have CMS access, enter their name(s) here. You can separate multiple names with a comma.' AdditionalCredits_Description: 'If some authors of this post don''t have CMS access, enter their name(s) here. You can separate multiple names with a comma.'
Authors: Authors Authors: Authors
CUSTOMSUMMARY: 'Add A Custom Summary' CUSTOMSUMMARY: 'Add A Custom Summary'
Categories: Categories Categories: Categories
DESCRIPTION: 'Generic content page'
FeaturedImage: 'Featured Image' FeaturedImage: 'Featured Image'
PLURALNAME: 'Base Pages' PLURALNAME: 'Blog Posts'
PLURALS:
one: 'A Blog Post'
other: '{count} Blog Posts'
PageTitleLabel: 'Post Title' PageTitleLabel: 'Post Title'
PublishDate: 'Publish Date' PublishDate: 'Publish Date'
PublishDate_Description: 'Will be set to "now" if published without a value.' PublishDate_Description: 'Will be set to "now" if published without a value.'
SINGULARNAME: 'Blog Post' SINGULARNAME: 'Blog Post'
SUMMARY_DESCRIPTION: 'If no summary is specified the first 30 words will be used.' SUMMARY_DESCRIPTION: 'If no summary is specified the first 30 words will be used.'
Tags: Tags Tags: Tags
BlogRecentPostsWidget: SilverStripe\Blog\Model\BlogTag:
Duplicate: 'A blog tag already exists with that name.'
PLURALNAME: 'Blog Tags'
PLURALS:
one: 'A Blog Tag'
other: '{count} Blog Tags'
SINGULARNAME: 'Blog Tag'
SilverStripe\Blog\Widgets\BlogArchiveWidget:
ArchiveType: ArchiveType
Blog: Blog
NumberToDisplay: 'No. to Display'
SilverStripe\Blog\Widgets\BlogCategoriesWidget:
Blog: Blog
Direction: Direction
Direction_Description: 'Change the direction of ordering of categories shown by this widget.'
Limit: Limit
Limit_Description: 'Limit the number of categories shown by this widget (set to 0 to show all categories).'
Sort: Sort
Sort_Description: 'Change the order of categories shown by this widget.'
SilverStripe\Blog\Widgets\BlogRecentPostsWidget:
Blog: Blog Blog: Blog
NumberOfPosts: 'Number of Posts' NumberOfPosts: 'Number of Posts'
PLURALNAME: 'Blog Recent Posts Widgets' SilverStripe\Blog\Widgets\BlogTagsCloudWidget:
SINGULARNAME: 'Blog Recent Posts Widget'
BlogTag:
Duplicate: 'A blog tag already exists with that name'
PLURALNAME: 'Blog Tags'
SINGULARNAME: 'Blog Tag'
Title: Title
BlogTagsCloudWidget:
Blog: Blog Blog: Blog
PLURALNAME: 'Blog Tags Cloud Widgets' SilverStripe\Blog\Widgets\BlogTagsWidget:
SINGULARNAME: 'Blog Tags Cloud Widget'
BlogTagsWidget:
Blog: Blog Blog: Blog
Direction: Direction Direction: Direction
Direction_Description: 'Change the direction of ordering of tags shown by this widget.' Direction_Description: 'Change the direction of ordering of tags shown by this widget.'
Limit: Limit Limit: Limit
Limit_Description: 'Limit the number of tags shown by this widget (set to 0 to show all tags).' Limit_Description: 'Limit the number of tags shown by this widget (set to 0 to show all tags).'
PLURALNAME: 'Blog Tags Widgets'
SINGULARNAME: 'Blog Tags Widget'
Sort: Sort Sort: Sort
Sort_Description: 'Change the order of tags shown by this widget.' Sort_Description: 'Change the order of tags shown by this widget.'
BlogTree:
DESCRIPTION: 'Generic content page'
PLURALNAME: 'Base Pages'
SINGULARNAME: 'Blog Tree'
GridFieldAddByDBField:
Add: 'Add {name}'
AddFail: 'Unable to save {class} to the database.'
PermissionFail: 'You don''t have permission to create a {class}.'
GridFieldBlogPostState:
Draft: '<i class="btn-icon gridfield-icon btn-icon-pencil"></i> Saved as Draft on {date}'
Published: '<i class="btn-icon gridfield-icon btn-icon-accept"></i> Published on {date}'
Timer: '<i class="gridfield-icon blog-icon-timer"></i> Publish at {date}'
TagCloudWidget:
PLURALNAME: 'Tag Cloud Widgets'
SINGULARNAME: 'Tag Cloud Widget'

View File

@ -34,9 +34,9 @@ class GridFieldBlogPostState extends GridFieldSiteTreeState
*/ */
$lastEdited = $record->dbObject('LastEdited'); $lastEdited = $record->dbObject('LastEdited');
return _t( return '<i class="btn-icon gridfield-icon btn-icon-pencil"></i> ' . _t(
__CLASS__ . '.Draft', __CLASS__ . '.Draft',
'<i class="btn-icon gridfield-icon btn-icon-pencil"></i> Saved as Draft on {date}', 'Saved as Draft on {date}',
'State for when a post is saved.', 'State for when a post is saved.',
[ [
'date' => $lastEdited->FormatFromSettings(), 'date' => $lastEdited->FormatFromSettings(),
@ -50,9 +50,9 @@ class GridFieldBlogPostState extends GridFieldSiteTreeState
$publishDate = $record->dbObject('PublishDate'); $publishDate = $record->dbObject('PublishDate');
if (strtotime($record->PublishDate) > time()) { if (strtotime($record->PublishDate) > time()) {
return _t( return '<i class="gridfield-icon blog-icon-timer"></i> ' . _t(
__CLASS__ . '.Timer', __CLASS__ . '.Timer',
'<i class="gridfield-icon blog-icon-timer"></i> Publish at {date}', 'Publish at {date}',
'State for when a post is published.', 'State for when a post is published.',
[ [
'date' => $publishDate->FormatFromSettings(), 'date' => $publishDate->FormatFromSettings(),
@ -60,9 +60,9 @@ class GridFieldBlogPostState extends GridFieldSiteTreeState
) . $modifiedLabel; ) . $modifiedLabel;
} }
return _t( return '<i class="btn-icon gridfield-icon btn-icon-accept"></i> ' . _t(
__CLASS__ . '.Published', __CLASS__ . '.Published',
'<i class="btn-icon gridfield-icon btn-icon-accept"></i> Published on {date}', 'Published on {date}',
'State for when a post is published.', 'State for when a post is published.',
[ [
'date' => $publishDate->FormatFromSettings(), 'date' => $publishDate->FormatFromSettings(),

View File

@ -1,13 +1,13 @@
<p class="blog-post-meta"> <p class="blog-post-meta">
<% if $Categories.exists %> <% if $Categories.exists %>
<%t Blog.PostedIn "Posted in" %> <%t SilverStripe\\Blog\\Model\\Blog.PostedIn "Posted in" %>
<% loop $Categories %> <% loop $Categories %>
<a href="$Link" title="$Title">$Title</a><% if not Last %>, <% else %>;<% end_if %> <a href="$Link" title="$Title">$Title</a><% if not Last %>, <% else %>;<% end_if %>
<% end_loop %> <% end_loop %>
<% end_if %> <% end_if %>
<% if $Tags.exists %> <% if $Tags.exists %>
<%t Blog.Tagged "Tagged" %> <%t SilverStripe\\Blog\\Model\\Blog.Tagged "Tagged" %>
<% loop $Tags %> <% loop $Tags %>
<a href="$Link" title="$Title">$Title</a><% if not Last %>, <% else %>;<% end_if %> <a href="$Link" title="$Title">$Title</a><% if not Last %>, <% else %>;<% end_if %>
<% end_loop %> <% end_loop %>
@ -15,20 +15,20 @@
<% if $Comments.exists %> <% if $Comments.exists %>
<a href="{$Link}#comments-holder"> <a href="{$Link}#comments-holder">
<%t Blog.Comments "Comments" %> <%t SilverStripe\\Blog\\Model\\Blog.Comments "Comments" %>
$Comments.count $Comments.count
</a>; </a>;
<% end_if %> <% end_if %>
<%t Blog.Posted "Posted" %> <%t SilverStripe\\Blog\\Model\\Blog.Posted "Posted" %>
<a href="$MonthlyArchiveLink">$PublishDate.ago</a> <a href="$MonthlyArchiveLink">$PublishDate.ago</a>
<% if $Credits %> <% if $Credits %>
<%t Blog.By "by" %> <%t SilverStripe\\Blog\\Model\\Blog.By "by" %>
<% loop $Credits %> <% loop $Credits %>
<% if not $First && not $Last %>, <% end_if %> <% if not $First && not $Last %>, <% end_if %>
<% if not $First && $Last %> <%t Blog.AND "and" %> <% end_if %> <% if not $First && $Last %> <%t SilverStripe\\Blog\\Model\\Blog.AND "and" %> <% end_if %>
<% if $URLSegment %> <% if $URLSegment %>
<a href="$URL">$Name.XML</a> <a href="$URL">$Name.XML</a>
<% else %> <% else %>

View File

@ -1,13 +1,13 @@
<div class="post-summary"> <div class="post-summary">
<h2> <h2>
<a href="$Link" title="<%t Blog.ReadMoreAbout "Read more about '{title}'..." title=$Title %>"> <a href="$Link" title="<%t SilverStripe\\Blog\\Model\\Blog.ReadMoreAbout "Read more about '{title}'..." title=$Title %>">
<% if $MenuTitle %>$MenuTitle <% if $MenuTitle %>$MenuTitle
<% else %>$Title<% end_if %> <% else %>$Title<% end_if %>
</a> </a>
</h2> </h2>
<p class="post-image"> <p class="post-image">
<a href="$Link" title="<%t Blog.ReadMoreAbout "Read more about '{title}'..." title=$Title %>"> <a href="$Link" title="<%t SilverStripe\\Blog\\Model\\Blog.ReadMoreAbout "Read more about '{title}'..." title=$Title %>">
$FeaturedImage.ScaleWidth(795) $FeaturedImage.ScaleWidth(795)
</a> </a>
</p> </p>
@ -19,7 +19,7 @@
<% end_if %> <% end_if %>
<p> <p>
<a href="$Link"> <a href="$Link">
<%t Blog.ReadMoreAbout "Read more about '{title}'..." title=$Title %> <%t SilverStripe\\Blog\\Model\\Blog.ReadMoreAbout "Read more about '{title}'..." title=$Title %>
</a> </a>
</p> </p>

View File

@ -5,7 +5,7 @@
<article> <article>
<h1> <h1>
<% if $ArchiveYear %> <% if $ArchiveYear %>
<%t Blog.Archive 'Archive' %>: <%t SilverStripe\\Blog\\Model\\Blog.Archive 'Archive' %>:
<% if $ArchiveDay %> <% if $ArchiveDay %>
$ArchiveDate.Nice $ArchiveDate.Nice
<% else_if $ArchiveMonth %> <% else_if $ArchiveMonth %>
@ -14,9 +14,9 @@
$ArchiveDate.format('Y') $ArchiveDate.format('Y')
<% end_if %> <% end_if %>
<% else_if $CurrentTag %> <% else_if $CurrentTag %>
<%t Blog.Tag 'Tag' %>: $CurrentTag.Title <%t SilverStripe\\Blog\\Model\\Blog.Tag 'Tag' %>: $CurrentTag.Title
<% else_if $CurrentCategory %> <% else_if $CurrentCategory %>
<%t Blog.Category 'Category' %>: $CurrentCategory.Title <%t SilverStripe\\Blog\\Model\\Blog.Category 'Category' %>: $CurrentCategory.Title
<% else %> <% else %>
$Title $Title
<% end_if %> <% end_if %>
@ -29,7 +29,7 @@
<% include PostSummary %> <% include PostSummary %>
<% end_loop %> <% end_loop %>
<% else %> <% else %>
<p><%t Blog.NoPosts 'There are no posts' %></p> <p><%t SilverStripe\\Blog\\Model\\Blog.NoPosts 'There are no posts' %></p>
<% end_if %> <% end_if %>
</article> </article>