From 90359e36f880bcdcd1a9e308f5428200d3e9381e Mon Sep 17 00:00:00 2001 From: Franco Springveldt Date: Mon, 18 Sep 2017 15:24:33 +1200 Subject: [PATCH 1/2] FIX updated translations to use namespaces --- lang/en.yml | 115 +++++++++++++++++++++++----------------------------- 1 file changed, 50 insertions(+), 65 deletions(-) diff --git a/lang/en.yml b/lang/en.yml index 4566095..326e894 100755 --- a/lang/en.yml +++ b/lang/en.yml @@ -1,8 +1,15 @@ en: - ArchiveWidget: - PLURALNAME: 'Archive Widgets' - SINGULARNAME: 'Archive Widget' - Blog: + SilverStripe\Blog\Forms\GridField\GridFieldAddByDBField: + Add: 'Add {name}' + AddFail: 'Unable to save {class} to the database.' + 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: - ArchiveType: ArchiveType - 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' + SilverStripe\Blog\Model\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 - BlogEntry: - DESCRIPTION: 'Generic content page' - PLURALNAME: 'Base Pages' - SINGULARNAME: 'Blog Entry' - BlogHolder: - DESCRIPTION: 'Generic content page' - PLURALNAME: 'Base Pages' - SINGULARNAME: 'Blog Holder' - BlogPost: + SilverStripe\Blog\Model\BlogMemberExtension: + BLOGPOSTS: 'Blog Posts' + TABBLOGPOSTS: 'Blog Posts' + SilverStripe\Blog\Model\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' - SINGULARNAME: 'Blog Recent Posts Widget' - BlogTag: - Duplicate: 'A blog tag already exists with that name' - PLURALNAME: 'Blog Tags' - SINGULARNAME: 'Blog Tag' - Title: Title - BlogTagsCloudWidget: + SilverStripe\Blog\Widgets\BlogTagsCloudWidget: Blog: Blog - PLURALNAME: 'Blog Tags Cloud Widgets' - SINGULARNAME: 'Blog Tags Cloud Widget' - BlogTagsWidget: + SilverStripe\Blog\Widgets\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: ' Saved as Draft on {date}' - Published: ' Published on {date}' - Timer: ' Publish at {date}' - TagCloudWidget: - PLURALNAME: 'Tag Cloud Widgets' - SINGULARNAME: 'Tag Cloud Widget' From dc0e56b49a574a446f94c0c74c67c4a360d027fc Mon Sep 17 00:00:00 2001 From: Franco Springveldt Date: Mon, 18 Sep 2017 15:27:39 +1200 Subject: [PATCH 2/2] FIX further translations fixed in templates --- lang/en.yml | 6 +++--- src/Forms/GridField/GridFieldBlogPostState.php | 12 ++++++------ templates/Includes/EntryMeta.ss | 12 ++++++------ templates/Includes/PostSummary.ss | 6 +++--- templates/SilverStripe/Blog/Model/Layout/Blog.ss | 8 ++++---- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lang/en.yml b/lang/en.yml index 326e894..857dd25 100755 --- a/lang/en.yml +++ b/lang/en.yml @@ -4,9 +4,9 @@ en: AddFail: 'Unable to save {class} to the database.' 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}' + Draft: 'Saved as Draft on {date}' + Published: 'Published on {date}' + Timer: 'Publish at {date}' SilverStripe\Blog\Model: Title: Title SilverStripe\Blog\Model\Blog: diff --git a/src/Forms/GridField/GridFieldBlogPostState.php b/src/Forms/GridField/GridFieldBlogPostState.php index 6913b22..58b8e95 100644 --- a/src/Forms/GridField/GridFieldBlogPostState.php +++ b/src/Forms/GridField/GridFieldBlogPostState.php @@ -34,9 +34,9 @@ class GridFieldBlogPostState extends GridFieldSiteTreeState */ $lastEdited = $record->dbObject('LastEdited'); - return _t( + return ' ' . _t( __CLASS__ . '.Draft', - ' 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 ' ' . _t( __CLASS__ . '.Timer', - ' 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 ' ' . _t( __CLASS__ . '.Published', - ' Published on {date}', + 'Published on {date}', 'State for when a post is published.', [ 'date' => $publishDate->FormatFromSettings(), diff --git a/templates/Includes/EntryMeta.ss b/templates/Includes/EntryMeta.ss index 8100f21..11160a7 100644 --- a/templates/Includes/EntryMeta.ss +++ b/templates/Includes/EntryMeta.ss @@ -1,13 +1,13 @@

<% if $Categories.exists %> - <%t Blog.PostedIn "Posted in" %> + <%t SilverStripe\\Blog\\Model\\Blog.PostedIn "Posted in" %> <% loop $Categories %> $Title<% 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 %> $Title<% if not Last %>, <% else %>;<% end_if %> <% end_loop %> @@ -15,20 +15,20 @@ <% if $Comments.exists %> - <%t Blog.Comments "Comments" %> + <%t SilverStripe\\Blog\\Model\\Blog.Comments "Comments" %> $Comments.count ; <% end_if %> - <%t Blog.Posted "Posted" %> + <%t SilverStripe\\Blog\\Model\\Blog.Posted "Posted" %> $PublishDate.ago <% 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 %> $Name.XML <% else %> diff --git a/templates/Includes/PostSummary.ss b/templates/Includes/PostSummary.ss index b06d1f1..7beec2c 100644 --- a/templates/Includes/PostSummary.ss +++ b/templates/Includes/PostSummary.ss @@ -1,13 +1,13 @@

- "> + "> <% if $MenuTitle %>$MenuTitle <% else %>$Title<% end_if %>

- "> + "> $FeaturedImage.ScaleWidth(795)

@@ -19,7 +19,7 @@ <% end_if %>

- <%t Blog.ReadMoreAbout "Read more about '{title}'..." title=$Title %> + <%t SilverStripe\\Blog\\Model\\Blog.ReadMoreAbout "Read more about '{title}'..." title=$Title %>

diff --git a/templates/SilverStripe/Blog/Model/Layout/Blog.ss b/templates/SilverStripe/Blog/Model/Layout/Blog.ss index 5a29c3b..29ffcaa 100644 --- a/templates/SilverStripe/Blog/Model/Layout/Blog.ss +++ b/templates/SilverStripe/Blog/Model/Layout/Blog.ss @@ -5,7 +5,7 @@

<% 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 %> -

<%t Blog.NoPosts 'There are no posts' %>

+

<%t SilverStripe\\Blog\\Model\\Blog.NoPosts 'There are no posts' %>

<% end_if %>