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

FIX updated translations to use namespaces

lang/en.yml

@@ -1,8 +1,15 @@
 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
     Archive: Archive
     By: by
@@ -19,11 +26,13 @@ en:
     FILTERDESCRIPTION_TAG: 'Tagged with {tag}'
     LumberjackTitle: 'Blog Posts'
     NoPosts: 'There are no posts'
-    NoUnfeaturedPosts: 'There are no non-featured posts'
     PERMISSIONS_CATEGORY: 'Blog permissions'
     PERMISSION_MANAGE_USERS_DESCRIPTION: 'Manage users for individual 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
     PostedIn: 'Posted in'
     PostsPerPage: 'Posts Per Page'
@@ -33,87 +42,63 @@ en:
     Tagged: Tagged
     Tags: Tags
     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'
+    PLURALS:
+      one: 'A Blog Category'
+      other: '{count} Blog Categories'
     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
     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.'
     Authors: Authors
     CUSTOMSUMMARY: 'Add A Custom Summary'
     Categories: Categories
-    DESCRIPTION: 'Generic content page'
     FeaturedImage: 'Featured Image'
-    PLURALNAME: 'Base Pages'
+    PLURALNAME: 'Blog Posts'
+    PLURALS:
+      one: 'A Blog Post'
+      other: '{count} Blog Posts'
     PageTitleLabel: 'Post Title'
     PublishDate: 'Publish Date'
     PublishDate_Description: 'Will be set to "now" if published without a value.'
     SINGULARNAME: 'Blog Post'
     SUMMARY_DESCRIPTION: 'If no summary is specified the first 30 words will be used.'
     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
     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
-    PLURALNAME: 'Blog Tags Cloud Widgets'
+  SilverStripe\Blog\Widgets\BlogTagsWidget:
-    SINGULARNAME: 'Blog Tags Cloud Widget'
-  BlogTagsWidget:
     Blog: Blog
     Direction: Direction
     Direction_Description: 'Change the direction of ordering of tags shown by this widget.'
     Limit: Limit
     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_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'

src/Forms/GridField/GridFieldBlogPostState.php

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

templates/Includes/EntryMeta.ss

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

templates/Includes/PostSummary.ss

@@ -1,13 +1,13 @@
 <div class="post-summary">
 	<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
 			<% else %>$Title<% end_if %>
 		</a>
 	</h2>
 
 	<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)
 		</a>
 	</p>
@@ -19,7 +19,7 @@
 	<% end_if %>
 	    <p>
 			<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>
 		</p>
 

templates/SilverStripe/Blog/Model/Layout/Blog.ss

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