diff --git a/lang/en_utf8/forum.php b/lang/en_utf8/forum.php index 8d6c1e875e5..092266df51e 100644 --- a/lang/en_utf8/forum.php +++ b/lang/en_utf8/forum.php @@ -2,6 +2,7 @@ // forum.php - created with Moodle 1.7 beta + (2006101003) + $string['addanewdiscussion'] = 'Add a new discussion topic'; $string['addanewquestion'] = 'Add a new question'; $string['addanewtopic'] = 'Add a new topic'; @@ -10,14 +11,15 @@ $string['allforums'] = 'All forums'; $string['allowchoice'] = 'Allow everyone to choose'; $string['allowdiscussions'] = 'Can a $a post to this forum?'; $string['allowratings'] = 'Allow posts to be rated?'; +$string['allowsallsubscribe'] = 'This forum allows everyone to choose whether to subscribe or not'; $string['allowsdiscussions'] = 'This forum allows each person to start one discussion topic.'; $string['allsubscribe'] = 'Subscribe to all forums'; $string['allunsubscribe'] = 'Unsubscribe from all forums'; $string['anyfile'] = 'Any file'; $string['attachment'] = 'Attachment'; $string['blockafter'] = 'Post threshold for blocking'; -$string['blockperiod'] = 'Time period for blocking'; $string['blockperioddisabled'] = 'Don\'t block'; +$string['blockperiod'] = 'Time period for blocking'; $string['bynameondate'] = 'by $a->name - $a->date'; $string['cannotviewpostyet'] = 'You cannot read other students questions in this discussion yet because you haven\'t posted'; $string['configcleanreadtime'] = 'The hour of the day to clean old posts from the \'read\' table.'; @@ -35,10 +37,10 @@ $string['couldnotadd'] = 'Could not add your post due to an unknown error'; $string['couldnotdeleteratings'] = 'Sorry, that cannot be deleted as people have already rated it'; $string['couldnotdeletereplies'] = 'Sorry, that cannot be deleted as people have already responded to it'; $string['couldnotupdate'] = 'Could not update your post due to an unknown error'; -$string['delete'] = 'Delete'; $string['deleteddiscussion'] = 'The discussion topic has been deleted'; -$string['deletedpost'] = 'The post has been deleted'; +$string['delete'] = 'Delete'; $string['deletedposts'] = 'Those posts have been deleted'; +$string['deletedpost'] = 'The post has been deleted'; $string['deletesure'] = 'Are you sure you want to delete this post?'; $string['deletesureplural'] = 'Are you sure you want to delete this post and all replies? ($a posts)'; $string['digestmailheader'] = 'This is your daily digest of new posts from the $a->sitename forums. To change your forum email preferences, go to $a->userprefs.'; @@ -48,8 +50,8 @@ $string['digestsentusers'] = 'Email digests successfully sent to $a users.'; $string['disallowsubscribe'] = 'Subscriptions not allowed'; $string['disallowsubscribeteacher'] = 'Subscriptions not allowed (except for teachers)'; $string['discussion'] = 'Discussion'; -$string['discussionmoved'] = 'This discussion has been moved to \'$a\'.'; $string['discussionmovedpost'] = 'This discussion has been moved to discusshref\">here in the forum forumhref\">$a->forumname'; +$string['discussionmoved'] = 'This discussion has been moved to \'$a\'.'; $string['discussionname'] = 'Discussion name'; $string['discussions'] = 'Discussions'; $string['discussionsstartedby'] = 'Discussions started by $a'; @@ -59,48 +61,51 @@ $string['displayend'] = 'Display end'; $string['displayperiod'] = 'Display Period'; $string['displaystart'] = 'Display start'; $string['eachuserforum'] = 'Each person posts one discussion'; -$string['edit'] = 'Edit'; $string['editedby'] = 'Edited by $a->name - original submission $a->date'; +$string['edit'] = 'Edit'; $string['editing'] = 'Editing'; $string['emptymessage'] = 'Something was wrong with your post. Perhaps you left it blank, or the attachment was too big. Your changes have NOT been saved.'; $string['everyonecanchoose'] = 'Everyone can choose to be subscribed'; +$string['everyonecannowchoose'] = 'Everyone can now choose to be subscribed'; $string['everyoneissubscribed'] = 'Everyone is subscribed to this forum'; +$string['everyoneisnowsubscribed'] = 'Everyone is now subscribed to this forum'; $string['existingsubscribers'] = 'Existing subscribers'; +$string['forcessubscribe'] = 'This forum forces everyone to be subscribed'; $string['forcesubscribe'] = 'Force everyone to be subscribed'; $string['forcesubscribeq'] = 'Force everyone to be subscribed?'; -$string['forum'] = 'Forum'; $string['forum:addnews'] = 'Add news'; +$string['forumauthorhidden'] = 'Author (hidden)'; +$string['forumblockingalmosttoomanyposts'] = 'You are approaching the posting threshold. You have posted $a->numposts times in the last $a->blockperiod and the limit is $a->blockafter posts.'; +$string['forumbodyhidden'] = 'This post cannot be viewed by you, probably because you have not posted in the discussion yet.'; $string['forum:createattachment'] = 'Create attachments'; $string['forum:deleteanypost'] = 'Delete any posts (anytime)'; $string['forum:deleteownpost'] = 'Delete own posts (within deadline)'; $string['forum:editanypost'] = 'Edit any post'; +$string['forum'] = 'Forum'; +$string['forumintro'] = 'Forum introduction'; $string['forum:managesubscriptions'] = 'Manage subscriptions'; $string['forum:movediscussions'] = 'Move discussions'; -$string['forum:throttlingapplies'] = 'Throttling applies'; +$string['forumname'] = 'Forum name'; +$string['forumposts'] = 'Forum posts'; $string['forum:rate'] = 'Rate posts'; -$string['forum:replypost'] = 'Reply to posts'; $string['forum:replynews'] = 'Reply to news'; +$string['forum:replypost'] = 'Reply to posts'; +$string['forums'] = 'Forums'; $string['forum:splitdiscussions'] = 'Split discussions'; $string['forum:startdiscussion'] = 'Start new discussions'; +$string['forumsubjecthidden'] = 'Subject (hidden)'; +$string['forum:throttlingapplies'] = 'Throttling applies'; +$string['forumtrackednot'] = 'Unread posts are not being tracked'; +$string['forumtracked'] = 'Unread posts are being tracked'; +$string['forumtype'] = 'Forum type'; $string['forum:viewanyrating'] = 'View any ratings'; $string['forum:viewdiscussion'] = 'View discussions'; $string['forum:viewhiddentimedposts'] = 'View hidden timed posts'; $string['forum:viewqandawithoutposting'] = 'Always see Q and A posts'; $string['forum:viewrating'] = 'View ratings'; $string['forum:viewsubscribers'] = 'View subscribers'; -$string['forumauthorhidden'] = 'Author (hidden)'; -$string['forumblockingalmosttoomanyposts'] = 'You are approaching the posting threshold. You have posted $a->numposts times in the last $a->blockperiod and the limit is $a->blockafter posts.'; -$string['forumbodyhidden'] = 'This post cannot be viewed by you, probably because you have not posted in the discussion yet.'; -$string['forumintro'] = 'Forum introduction'; -$string['forumname'] = 'Forum name'; -$string['forumposts'] = 'Forum posts'; -$string['forums'] = 'Forums'; -$string['forumsubjecthidden'] = 'Subject (hidden)'; -$string['forumtracked'] = 'Unread posts are being tracked'; -$string['forumtrackednot'] = 'Unread posts are not being tracked'; -$string['forumtype'] = 'Forum type'; -$string['generalforum'] = 'Standard forum for general use'; $string['generalforums'] = 'General forums'; +$string['generalforum'] = 'Standard forum for general use'; $string['inforum'] = 'in $a'; $string['intronews'] = 'General news and announcements'; $string['introsocial'] = 'An open forum for chatting about anything you want to'; @@ -110,10 +115,10 @@ $string['learningforums'] = 'Learning forums'; $string['mailnow'] = 'Mail now'; $string['markalldread'] = 'Mark all posts in this discussion read.'; $string['markallread'] = 'Mark all posts in this forum read.'; -$string['markread'] = 'Mark read'; $string['markreadbutton'] = 'Mark
read'; -$string['markunread'] = 'Mark unread'; +$string['markread'] = 'Mark read'; $string['markunreadbutton'] = 'Mark
unread'; +$string['markunread'] = 'Mark unread'; $string['maxattachmentsize'] = 'Maximum attachment size'; $string['maxtimehaspassed'] = 'Sorry, but the maximum time for editing this post ($a) has passed!'; $string['message'] = 'Message'; @@ -131,15 +136,15 @@ $string['namenews'] = 'News forum'; $string['namesocial'] = 'Social forum'; $string['nameteacher'] = 'Teacher forum'; //depreciated after 1.7 $string['newforumposts'] = 'New forum posts'; -$string['nodiscussions'] = 'There are no discussion topics yet in this forum'; $string['nodiscussionsstartedby'] = 'No discussions started by this user'; +$string['nodiscussions'] = 'There are no discussion topics yet in this forum'; $string['noguestpost'] = 'Sorry, guests are not allowed to post.'; $string['noguestsubscribe'] = 'Sorry, guests are not allowed to subscribe to receive forum postings by email.'; $string['noguesttracking'] = 'Sorry, guests are not allowed to set tracking options.'; $string['nomorepostscontaining'] = 'No more posts containing \'$a\' were found'; $string['nonews'] = 'No news has been posted yet'; -$string['noposts'] = 'No posts'; $string['nopostscontaining'] = 'No posts containing \'$a\' were found'; +$string['noposts'] = 'No posts'; $string['noquestions'] = 'There are no questions yet in this forum'; $string['nosubscribers'] = 'There are no subscribers yet for this forum'; $string['nothingnew'] = 'Nothing new for $a'; @@ -160,14 +165,11 @@ $string['openmode1'] = 'No discussions, but replies are allowed'; $string['openmode2'] = 'Discussions and replies are allowed'; $string['overviewnumpostssince'] = 'posts since last login'; $string['overviewnumunread'] = 'total unread'; -$string['parent'] = 'Show parent'; $string['parentofthispost'] = 'Parent of this post'; -$string['postadded'] = '

Your post was successfully added.

-

You have $a to edit it if you want to make any changes.

'; +$string['parent'] = 'Show parent'; +$string['postadded'] = '

Your post was successfully added.

You have $a to edit it if you want to make any changes.

'; $string['postincontext'] = 'See this post in context'; -$string['postmailinfo'] = 'This is a copy of a message posted on the $a website. - -To add your reply via the website, click on this link:'; +$string['postmailinfo'] = "This is a copy of a message posted on the $a website.\n\nTo add your reply via the website, click on this link:"; $string['postmailnow'] = '

This post will be mailed out immediately to all forum subscribers.

'; $string['postrating1'] = 'Mostly Separate Knowing'; $string['postrating2'] = 'Separate and Connected'; @@ -178,34 +180,33 @@ $string['postupdated'] = 'Your post was updated'; $string['potentialsubscribers'] = 'Potential subscribers'; $string['processingdigest'] = 'Processing email digest for user $a'; $string['processingpost'] = 'Processing post $a'; -$string['prune'] = 'Split'; $string['prunedpost'] = 'A new discussion has been created from that post'; $string['pruneheading'] = 'Split the discussion and move this post to a new discussion'; +$string['prune'] = 'Split'; $string['qandaforum'] = 'Q and A forum'; $string['qandanotify'] = 'This is a Question and Answer forum. In order to see other responses to these Questions, you must first post your Answer'; $string['rate'] = 'Rate'; -$string['rating'] = 'Rating'; $string['ratingeveryone'] = 'Everyone can rate posts'; $string['ratingno'] = 'No ratings'; $string['ratingonlyteachers'] = 'Only $a can rate posts'; $string['ratingpublic'] = '$a can see everyone\'s ratings'; $string['ratingpublicnot'] = '$a can only see their own ratings'; +$string['rating'] = 'Rating'; $string['ratings'] = 'Ratings'; $string['ratingssaved'] = 'Ratings saved'; $string['ratingsuse'] = 'Use ratings'; $string['ratingtime'] = 'Restrict ratings to posts with dates in this range:'; -$string['re'] = 'Re:'; $string['readtherest'] = 'Read the rest of this topic'; -$string['replies'] = 'Replies'; $string['repliesmany'] = '$a replies so far'; $string['repliesone'] = '$a reply so far'; -$string['reply'] = 'Reply'; +$string['replies'] = 'Replies'; $string['replyforum'] = 'Reply to forum'; +$string['reply'] = 'Reply'; +$string['re'] = 'Re:'; $string['resetforums'] = 'Remove all posts from these types of forums'; $string['resetsubscriptions'] = 'Remove forum subscriptions'; $string['rsssubscriberssdiscussions'] = 'Display the RSS feed for \'$a\' discussions'; $string['rsssubscriberssposts'] = 'Display the RSS feed for \'$a\' posts'; -$string['search'] = 'Search'; $string['searchdatefrom'] = 'Posts must be newer than this'; $string['searchdateto'] = 'Posts must be older than this'; $string['searchforumintro'] = 'Please enter search terms into one or more of the following fields:'; @@ -215,9 +216,10 @@ $string['searchnotwords'] = 'These words should NOT be included'; $string['searcholderposts'] = 'Search older posts...'; $string['searchphrase'] = 'This exact phrase must appear in the post'; $string['searchresults'] = 'Search results'; +$string['search'] = 'Search'; $string['searchsubject'] = 'These words should be in the subject'; -$string['searchuser'] = 'This name should match the author'; $string['searchuserid'] = 'The Moodle ID of the author'; +$string['searchuser'] = 'This name should match the author'; $string['searchwhichforums'] = 'Choose which forums to search'; $string['searchwords'] = 'These words can appear anywhere in the post'; $string['seeallposts'] = 'See all posts made by this user'; @@ -226,7 +228,6 @@ $string['showsubscribers'] = 'Show/edit current subscribers'; $string['singleforum'] = 'A single simple discussion'; $string['startedby'] = 'Started by'; $string['subject'] = 'Subject'; -$string['subscribe'] = 'Subscribe to this forum'; $string['subscribeall'] = 'Subscribe everyone to this forum'; $string['subscribed'] = 'Subscribed'; $string['subscribenone'] = 'Unsubscribe everyone from this forum'; @@ -234,23 +235,24 @@ $string['subscribers'] = 'Subscribers'; $string['subscribersto'] = 'Subscribers to \'$a\''; $string['subscribestart'] = 'Send me email copies of posts to this forum'; $string['subscribestop'] = 'I don\'t want email copies of posts to this forum'; -$string['subscription'] = 'Subscription'; +$string['subscribe'] = 'Subscribe to this forum'; $string['subscriptions'] = 'Subscriptions'; +$string['subscription'] = 'Subscription'; $string['thisforumisthrottled'] = 'This forum has a limit to the number of forum postings you can make in a given time period - this is currently set at $a->blockafter posting(s) in $a->blockperiod'; $string['timestartenderror'] = 'Display end date cannot be earlier than the start date'; $string['trackforum'] = 'Track unread posts'; -$string['tracking'] = 'Track'; $string['trackingoff'] = 'Off'; $string['trackingon'] = 'On'; $string['trackingoptional'] = 'Optional'; +$string['tracking'] = 'Track'; $string['trackingtype'] = 'Read tracking for this forum?'; -$string['unread'] = 'Unread'; -$string['unreadposts'] = 'Unread posts'; $string['unreadpostsnumber'] = '$a unread posts'; $string['unreadpostsone'] = '1 unread post'; -$string['unsubscribe'] = 'Unsubscribe from this forum'; +$string['unreadposts'] = 'Unread posts'; +$string['unread'] = 'Unread'; $string['unsubscribed'] = 'Unsubscribed'; $string['unsubscribeshort'] = 'Unsubscribe'; +$string['unsubscribe'] = 'Unsubscribe from this forum'; $string['warnafter'] = 'Post threshold for warning'; $string['yesforever'] = 'Yes, forever'; $string['yesinitially'] = 'Yes, initially'; @@ -258,5 +260,4 @@ $string['youratedthis'] = 'You rated this'; $string['yournewquestion'] = 'Your new question'; $string['yournewtopic'] = 'Your new discussion topic'; $string['yourreply'] = 'Your reply'; - ?> diff --git a/mod/forum/subscribe.php b/mod/forum/subscribe.php index bd9c84d98c2..d807d8d851e 100644 --- a/mod/forum/subscribe.php +++ b/mod/forum/subscribe.php @@ -73,15 +73,15 @@ if ($force and has_capability('mod/forum:managesubscriptions', $context)) { if (forum_is_forcesubscribed($forum->id)) { forum_forcesubscribe($forum->id, 0); - redirect($returnto, get_string("everyonecanchoose", "forum"), 1); + redirect($returnto, get_string("everyonecannowchoose", "forum"), 1); } else { forum_forcesubscribe($forum->id, 1); - redirect($returnto, get_string("everyoneissubscribed", "forum"), 1); + redirect($returnto, get_string("everyoneisnowsubscribed", "forum"), 1); } } if (forum_is_forcesubscribed($forum->id)) { - redirect($returnto, get_string("everyoneissubscribed", "forum"), 1); + redirect($returnto, get_string("everyoneisnowsubscribed", "forum"), 1); } $info->name = fullname($user); diff --git a/mod/forum/view.php b/mod/forum/view.php index c68741e6ddf..00fcf70ffce 100644 --- a/mod/forum/view.php +++ b/mod/forum/view.php @@ -159,14 +159,15 @@ if (!empty($USER->id) && !has_capability('moodle/legacy:guest', $context, NULL, false)) { $SESSION->fromdiscussion = "$FULLME"; if (forum_is_forcesubscribed($forum->id)) { - $streveryoneissubscribed = get_string('everyoneissubscribed', 'forum'); + $streveryoneisnowsubscribed = get_string('everyoneisnowsubscribed', 'forum'); $strallowchoice = get_string('allowchoice', 'forum'); - helpbutton("subscription", $streveryoneissubscribed, "forum"); + echo '' . get_string("forcessubscribe", 'forum') . '
'; + helpbutton("subscription", $strallowchoice, "forum"); echo ' '; if (has_capability('moodle/course:manageactivities', $context)) { - echo "id&force=no\">$streveryoneissubscribed"; + echo "id&force=no\">$strallowchoice"; } else { - echo $streveryoneissubscribed; + echo $streveryoneisnowsubscribed; } echo ''; @@ -175,18 +176,18 @@ echo $strsubscriptionsoff; helpbutton("subscription", $strsubscriptionsoff, "forum"); } else { - $streveryonecanchoose = get_string("everyonecanchoose", "forum"); + $streveryonecannowchoose = get_string("everyonecannowchoose", "forum"); $strforcesubscribe = get_string("forcesubscribe", "forum"); $strshowsubscribers = get_string("showsubscribers", "forum"); - - helpbutton("subscription", $streveryonecanchoose, "forum"); + echo '' . get_string("allowsallsubscribe", 'forum') . '
'; + helpbutton("subscription", $strforcesubscribe, "forum"); echo ' '; if (has_capability('moodle/course:manageactivities', $context)) { - echo "id&force=yes\">$streveryonecanchoose"; + echo "id&force=yes\">$strforcesubscribe"; echo "
"; echo "id\">$strshowsubscribers"; } else { - echo ''.$streveryonecanchoose.''; + echo ''.$streveryonecannowchoose.''; } if (forum_is_subscribed($USER->id, $forum->id)) {