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

Merge c558d25713 into 6bad5edb9f

This commit is contained in:
Johannes Weberhofer 2012-11-13 12:30:58 -08:00
parent 6bad5edb9f c558d25713
commit 6e67d93974
10 changed files with 55 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/BlogHolder.php
View File

@ -248,7 +248,7 @@ class BlogHolder_Controller extends BlogTree_Controller {
$contentfield,
$tagfield,
new LiteralField("Tagsnote"," <label id='tagsnote'>"._t('BlogHolder.TE', "For example: sport, personal, science fiction")."<br/>" .
_t('BlogHolder.SPUC', "Please separate tags using commas.")."</label>")
_t('BlogHolder.SPUC', "Please separate tags using commas.")."</label><br />")
);
$submitAction = new FormAction('postblog', _t('BlogHolder.POST', 'Post blog entry'));

14
code/widgets/ArchiveWidget.php
View File

@ -23,11 +23,23 @@ class ArchiveWidget extends Widget {
);
static $title = 'Browse by Date';
static $cmsTitle = 'Blog Archive';
static $description = 'Show a list of months or years in which there are blog posts, and provide links to them.';
function Title() {
return i18n::_t('ArchiveWidget.BrowseByDate', ArchiveWidget::$title);
}
function CMSTitle() {
return i18n::_t('ArchiveWidget.BlogArchive', ArchiveWidget::$cmsTitle);
}
function Description() {
return i18n::_t('ArchiveWidget.Description', ArchiveWidget::$description);
}
function getCMSFields() {
$fields = parent::getCMSFields();

12
code/widgets/SubscribeRSSWidget.php
View File

@ -15,6 +15,18 @@ class SubscribeRSSWidget extends Widget {
static $description = 'Shows a link allowing a user to subscribe to this blog via RSS.';
function Title() {
return i18n::_t('SubscribeRSSWidget.ss.SUBSCRIBESHORTTITLE', SubscribeRSSWidget::$title);
}
function CmsTitle() {
return i18n::_t('SubscribeRSSWidget.SINGULARNAME', SubscribeRSSWidget::$cmsTitle);
}
function Description() {
return i18n::_t('SubscribeRSSWidget.ss.DESCRIPTION', SubscribeRSSWidget::$description);
}
/**
* Return an absolute URL based on the BlogHolder
* that this widget is located on.

7
code/widgets/TagCloudWidget.php
View File

@ -21,8 +21,8 @@ class TagCloudWidget extends Widget {
"Sortby" => "alphabet"
);
static $cmsTitle = "Tag Cloud";
static $description = "Shows a tag cloud of tags on your blog.";
static $cmsTitle;
static $description;
static $popularities = array( 'not-popular', 'not-very-popular', 'somewhat-popular', 'popular', 'very-popular', 'ultra-popular' );
@ -146,5 +146,6 @@ class TagCloudWidget extends Widget {
}
}
TagCloudWidget::$cmsTitle = i18n::_t('TagCloudWidget.TAGCLOUD', 'Tag Cloud');
TagCloudWidget::$description = i18n::_t('TagCloudWidget.DESCRIPTION', 'Shows a tag cloud of tags on your blog.');
?>

10
lang/de_DE.php
View File

@ -16,6 +16,9 @@ if(array_key_exists('de_DE', $lang) && is_array($lang['de_DE'])) {
$lang['de_DE'] = $lang['en_US'];
}
$lang['de_DE']['ArchiveWidget']['BlogArchive'] = 'Archiv';
$lang['de_DE']['ArchiveWidget']['BrowseByDate'] = 'Archiv';
$lang['de_DE']['ArchiveWidget']['Description'] = 'Zeigt eine Liste von Monaten oder Jahren, welche Blog Einträge enthalten und erstellt Links';
$lang['de_DE']['ArchiveWidget']['DispBY'] = 'Anzeige nach';
$lang['de_DE']['ArchiveWidget']['MONTH'] = 'Monat';
$lang['de_DE']['ArchiveWidget']['PLURALNAME'] = 'Archiv-Widgets';
@ -56,8 +59,11 @@ $lang['de_DE']['BlogManagementWidget.ss']['POSTNEW'] = 'Neuen Eintrag schreiben'
$lang['de_DE']['BlogManagementWidget']['UNM1'] = 'Sie haben 1 noch nicht moderierten Kommentar';
$lang['de_DE']['BlogManagementWidget']['UNMM'] = 'Sie haben %i noch nicht moderierte Kommentare';
$lang['de_DE']['BlogSummary.ss']['COMMENTS'] = 'Kommentare';
$lang['de_DE']['BlogSummary.ss']['COMMENTSTITLE'] = 'Kommentare von diesem Eintrag anzeigen.';
$lang['de_DE']['BlogSummary.ss']['POSTEDBY'] = 'Verfasst von';
$lang['de_DE']['BlogSummary.ss']['POSTEDON'] = 'am';
$lang['de_DE']['BlogSummary.ss']['READFULLPOSTTITLE'] = 'Den ganzen Eintrag lesen';
$lang['de_DE']['BlogSummary.ss']['READFULLPOST'] = 'Weiterlesen';
$lang['de_DE']['BlogSummary.ss']['VIEWFULL'] = 'Detaillierte Ansicht von dem Titel --';
$lang['de_DE']['RSSWidget']['CT'] = 'Eigener Titel für den feed';
$lang['de_DE']['RSSWidget']['NTS'] = 'Anzahl der angezeigten Items';
@ -68,6 +74,10 @@ $lang['de_DE']['SubscribeRSSWidget']['PLURALNAME'] = 'RSS-Abonnier-Widgets';
$lang['de_DE']['SubscribeRSSWidget']['SINGULARNAME'] = 'RSS-Abonnier-Widget';
$lang['de_DE']['SubscribeRSSWidget.ss']['SUBSCRIBETEXT'] = 'Abonnieren';
$lang['de_DE']['SubscribeRSSWidget.ss']['SUBSCRIBETITLE'] = 'Abonniere diesen Blog per RSS';
$lang['de_DE']['SubscribeRSSWidget.ss']['SUBSCRIBESHORTTITLE'] = 'Via RSS abonnieren';
$lang['de_DE']['SubscribeRSSWidget.ss']['DESCRIPTION'] = 'Zeigt dem Benutzer einen Link um den Blog Via RSS zu abonnieren.';
$lang['de_DE']['TagCloudWidget']['CMSTITLE'] = 'Tags';
$lang['de_DE']['TagCloudWidget']['DESCRIPTION'] = 'Zeigt die Liste der Tags des Blogs.';
$lang['de_DE']['TagCloudWidget']['LIMIT'] = 'Anzahl der erlaubten Tags';
$lang['de_DE']['TagCloudWidget']['PLURALNAME'] = 'Tag-Cloud-Widgets';
$lang['de_DE']['TagCloudWidget']['SBAL'] = 'Alphabet';

2
lang/en_GB.php
View File

@ -68,6 +68,8 @@ $lang['en_GB']['SubscribeRSSWidget']['PLURALNAME'] = 'Subscript to RSS Widgets';
$lang['en_GB']['SubscribeRSSWidget']['SINGULARNAME'] = 'Subscript to an RSS Widget';
$lang['en_GB']['SubscribeRSSWidget.ss']['SUBSCRIBETEXT'] = 'Subscribe';
$lang['en_GB']['SubscribeRSSWidget.ss']['SUBSCRIBETITLE'] = 'Subscribe to this blog via RSS';
$lang['en_GB']['SubscribeRSSWidget.ss']['SUBSCRIBESHORTTITLE'] = 'Subscribe via RSS';
$lang['en_GB']['SubscribeRSSWidget.ss']['DESCRIPTION'] = 'Shows a link allowing a user to subscribe to this blog via RSS.';
$lang['en_GB']['TagCloudWidget']['LIMIT'] = 'Limit number of tags';
$lang['en_GB']['TagCloudWidget']['PLURALNAME'] = 'Tag Cloud Widgets';
$lang['en_GB']['TagCloudWidget']['SBAL'] = 'alphabet';

8
lang/en_US.php
View File

@ -2,6 +2,9 @@
global $lang;
$lang['en_US']['ArchiveWidget']['BlogArchive'] = 'Blog Archive';
$lang['en_US']['ArchiveWidget']['BrowseByDate'] = 'Browse by Date';
$lang['en_US']['ArchiveWidget']['Description'] = 'Show a list of months or years in which there are blog posts, and provide links to them.';
$lang['en_US']['ArchiveWidget']['DispBY'] = 'Display by';
$lang['en_US']['ArchiveWidget']['MONTH'] = 'month';
$lang['en_US']['ArchiveWidget']['PLURALNAME'] = array(
@ -72,9 +75,12 @@ $lang['en_US']['BlogManagementWidget']['UNM1'] = 'You have 1 unmoderated comment
$lang['en_US']['BlogManagementWidget']['UNMM'] = 'You have %i unmoderated comments';
$lang['en_US']['BlogManagementWidget.ss']['LOGOUT'] = 'Logout';
$lang['en_US']['BlogManagementWidget.ss']['POSTNEW'] = 'Post a new blog entry';
$lang['en_US']['BlogSummary.ss']['COMMENTSTITLE'] = 'View Comments for this post.';
$lang['en_US']['BlogSummary.ss']['COMMENTS'] = 'Comments';
$lang['en_US']['BlogSummary.ss']['POSTEDBY'] = 'Posted by';
$lang['en_US']['BlogSummary.ss']['POSTEDON'] = 'on';
$lang['en_US']['BlogSummary.ss']['READFULLPOSTTITLE'] = 'Read Full Post';
$lang['en_US']['BlogSummary.ss']['READFULLPOST'] = 'Read the full post';
$lang['en_US']['BlogSummary.ss']['VIEWFULL'] = 'View full post titled -';
$lang['en_US']['BlogTree']['PLURALNAME'] = array(
'Blog Tres',
@ -111,6 +117,8 @@ $lang['en_US']['SubscribeRSSWidget']['SINGULARNAME'] = array(
);
$lang['en_US']['SubscribeRSSWidget.ss']['SUBSCRIBETEXT'] = 'Subscribe';
$lang['en_US']['SubscribeRSSWidget.ss']['SUBSCRIBETITLE'] = 'Subscribe to this blog via RSS';
$lang['en_US']['TagCloudWidget']['CMSTITLE'] = 'Tag Cloud';
$lang['en_US']['TagCloudWidget']['DESCRIPTION'] = 'Shows a tag cloud of tags on your blog.';
$lang['en_US']['TagCloudWidget']['LIMIT'] = 'Limit number of tags';
$lang['en_US']['TagCloudWidget']['PLURALNAME'] = array(
'Tag Cloud Widgets',

4
templates/ArchiveWidget.ss
View File

@ -2,8 +2,8 @@
<ul class="archiveMonths">
<% loop Dates %>
<li>
<a href="$Link">
$Date.Format(F) $Date.Year
<a href="$Link">
$Date.FormatI18N(%B) $Date.Year
</a>
</li>
<% end_loop %>

4
templates/Includes/BlogSummary.ss
View File

@ -1,6 +1,6 @@
<div class="blogSummary">
<h2 class="postTitle"><a href="$Link" title="<% _t('VIEWFULL', 'View full post titled -') %> '$Title'">$MenuTitle</a></h2>
<p class="authorDate"><% _t('POSTEDBY', 'Posted by') %> $Author.XML <% _t('POSTEDON', 'on') %> $Date.Long | <a href="$Link#PageComments_holder" title="View Comments Posted">$Comments.Count <% _t('COMMENTS', 'Comments') %></a></p>
<p class="authorDate"><% _t('POSTEDBY', 'Posted by') %> $Author.XML <% _t('POSTEDON', 'on') %> $Date.FormatI18N(%x) | | <a href="$Link#PageComments_holder" title="View Comments Posted">$Comments.Count <% _t('COMMENTS', 'Comments') %></a></p>
<% if TagsCollection %>
<p class="tags">
Tags:
@ -16,5 +16,5 @@
<p>$Content.FirstParagraph(html)</p>
<% end_if %>
<p class="blogVitals"><a href="$Link#PageComments_holder" class="comments" title="View Comments for this post">$Comments.Count comments</a> | <a href="$Link" class="readmore" title="Read Full Post">Read the full post</a></p>
<p class="blogVitals"><a href="$Link#PageComments_holder" class="comments" title="<% _t('BlogSummary.ss.COMMENTSTITLE', 'View Comments for this post') %>"> $Comments.Count <% _t('BlogSummary.ss.COMMENTS', 'comments') %> </a> | <a href="$Link" class="readmore" title="<% _t('BlogSummary.ss.READFULLPOSTTITLE', 'Read FULL Post') %>"><% _t('BlogSummary.ss.READFULLPOST', 'Read the full post') %></a></p>
</div>

2
templates/Layout/BlogEntry.ss
View File

@ -4,7 +4,7 @@
<div class="blogEntry">
<h2 class="postTitle">$Title</h2>
<p class="authorDate"><% _t('POSTEDBY', 'Posted by') %> $Author.XML <% _t('POSTEDON', 'on') %> $Date.Long | $Comments.Count <% _t('COMMENTS', 'Comments') %></p>
<p class="authorDate"><% _t('POSTEDBY', 'Posted by') %> $Author.XML <% _t('POSTEDON', 'on') %> $Date.FormatI18N(%x) | $Comments.Count <% _t('COMMENTS', 'Comments') %></p>
<% if TagsCollection %>
<p class="tags">
<% _t('TAGS', 'Tags:') %>