diffs (108 lines):
diff -r 204e47331314 -r d4b6f9d8be46 bin/upgrading/s2layers/core2.s2
--- a/bin/upgrading/s2layers/core2.s2 Thu Apr 22 06:10:35 2010 -0700
+++ b/bin/upgrading/s2layers/core2.s2 Thu Apr 22 06:38:18 2010 -0700
@@ -596,7 +596,7 @@ class Page
and DayPage to change how entries display.";
function builtin get_latest_month() : YearMonth
- "Returns information about the latest month the user posted (or the
current month, if no posts), so that the page may include a mini-calendar or
similar features.";
+ "Returns information about the latest month the user posted (or the
current month, if no entries), so that the page may include a mini-calendar or
similar features.";
function builtin visible_tag_list() : TagDetail[]
"Returns an array of tags that the logged in user can see for the journal
being viewed.";
@@ -781,7 +781,7 @@ class YearPage extends Page
}
class MonthDay extends YearDay
-"Summaries of posts on a given day on the [class[MonthPage]]."
+"Summaries of entries on a given day on the [class[MonthPage]]."
{
var bool has_entries "True if there are entries on this day.";
var Entry[] entries "Only populated on the month view. Entry text not
present.";
@@ -799,7 +799,7 @@ class MonthEntryInfo
}
class MonthPage extends Page
-"A page which contains a list of posts made in that month"
+"A page which contains a list of entries made in that month"
{
var Date date "Date of this month, with day of zero.";
var MonthDay[] days "One entry for each day of the month.";
@@ -1901,7 +1901,7 @@ property string text_view_recent {
des = "Text used to link to the 'Recent Entries' view";
maxlength = 40;
"size" = 15;
- example = "Recent Posts";
+ example = "Recent Entries";
}
property string text_view_recent_tagged {
des = "Text used to link to a tag-filtered version of the 'Recent Entries'
view";
@@ -2394,12 +2394,6 @@ property string text_nosubject {
note = "This only appears in places where a subject line is required, such
as on a month view.";
}
-property string text_calendar_num_entries {
- des = "Text to show how many entries were made on a particular day";
- format = "plurals";
- example = "1 entry // # entries";
-}
-
set text_default_separator = " | ";
set text_view_month = "View Subjects";
set text_generated_on = "Page generated";
@@ -2408,7 +2402,6 @@ set text_layout_resources = "Resources:"
set text_layout_resources = "Resources:";
set text_posting_in = " posting in ";
set text_nosubject = "(no subject)";
-set text_calendar_num_entries = "1 entry // # entries";
property bool all_entrysubjects {
des = "For all entries, display the replacement text when no subject is
specified";
@@ -3765,11 +3758,10 @@ function print_module_calendar() {
foreach var YearWeek week ($mon.weeks) {
foreach var YearDay day ($week.days) {
if ($day.num_entries > 0) {
- var string entries = get_plural_phrase($day.num_entries,
"text_calendar_num_entries");
- print """<span class="entry-day"> <a href="$day.url"
title="$entries">$day.day</a></td>""";
+ print """<span class="entry-day"> <a
href="$day.url">$day.day</a> </span>""";
}
else {
- print """<span class="empty-day"> $day.day </span>""";
+ print """<span class="empty-day"> $day.day </span>""";
}
}
}
@@ -3779,7 +3771,7 @@ function print_module_calendar() {
}
else {
open_module("calendar", $mon->month_format("", true), "");
- println """<table summary="Monthly calendar with links to each day's
posts">""";
+ println """<table summary="Monthly calendar with links to each day's
entries">""";
println "<tr>";
foreach var int d (weekdays()) {
@@ -3794,12 +3786,11 @@ function print_module_calendar() {
}
foreach var YearDay day ($week.days) {
- if ( $day.num_entries > 0) {
- var string entries = get_plural_phrase($day.num_entries,
"text_calendar_num_entries");
- print """<td class="entry-day"> <a href="$day.url"
title="$entries">$day.day</a></td>""";
+ if ($day.num_entries > 0) {
+ print """<td class="entry-day"><a
href="$day.url">$day.day</a></td>""";
}
else {
- print """<td class="empty-day">$day.day</td>""";
+ print """<td class="empty-day">$day.day</td>""";
}
}
@@ -4788,7 +4779,7 @@ function YearPage::print_month(YearMonth
</div><!-- header -->
<div class="contents">
<div class="inner">
- <table summary="Monthly calendar with links to each
day's posts" class="month" cellspacing="0" cellpadding="0">
+ <table summary="Monthly calendar with links to each
day's entries" class="month" cellspacing="0" cellpadding="0">
<caption>$month_label</caption>
<thead>
<tr>""";
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog
