From e3523594206c9628058e98954f12eec7bf566ccc Mon Sep 17 00:00:00 2001 From: toyomoyo Date: Tue, 26 Jun 2007 08:33:03 +0000 Subject: [PATCH] merged fix for MDL-9051, apply supplied patch to fix $CFG->forum_enabletimedposts --- lang/en_utf8/forum.php | 55 +++++++++++++++++++++--------------------- mod/forum/config.html | 17 +++++++++++++ 2 files changed, 44 insertions(+), 28 deletions(-) diff --git a/lang/en_utf8/forum.php b/lang/en_utf8/forum.php index 29fbae3a2c..ecb41b5112 100644 --- a/lang/en_utf8/forum.php +++ b/lang/en_utf8/forum.php @@ -1,8 +1,6 @@ -name - $a->date'; $string['cannotviewpostyet'] = 'You cannot read other students questions in this discussion yet because you haven\'t posted'; $string['cannotadddiscussion'] = 'Adding discussions to this forum requires group membership.'; $string['configcleanreadtime'] = 'The hour of the day to clean old posts from the \'read\' table.'; $string['configdisplaymode'] = 'The default display mode for discussions if one isn\'t set.'; $string['configenablerssfeeds'] = 'This switch will enable the possibility of RSS feeds for all forums. You will still need to turn feeds on manually in the settings for each forum.'; +$string['configenabletimedposts'] = 'Set to \'yes\' if you want to allow setting of display periods when posting a new forum discussion (Experimental as not yet fully tested)'; $string['configlongpost'] = 'Any post over this length (in characters not including HTML) is considered long. Posts displayed on the site front page, social format course pages, or user profiles are shortened to a natural break somewhere between the forum_shortpost and forum_longpost values.'; $string['configmanydiscussions'] = 'Maximum number of discussions shown in a forum per page'; $string['configmaxbytes'] = 'Default maximum size for all forum attachments on the site (subject to course limits and other local settings)'; @@ -38,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['deleteddiscussion'] = 'The discussion topic has been deleted'; $string['delete'] = 'Delete'; -$string['deletedposts'] = 'Those posts have been deleted'; +$string['deleteddiscussion'] = 'The discussion topic has been deleted'; $string['deletedpost'] = 'The post has been deleted'; +$string['deletedposts'] = 'Those posts have 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.'; @@ -51,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['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['discussionmovedpost'] = 'This discussion has been moved to discusshref\">here in the forum forumhref\">$a->forumname'; $string['discussionname'] = 'Discussion name'; $string['discussions'] = 'Discussions'; $string['discussionsstartedby'] = 'Discussions started by $a'; @@ -62,18 +61,19 @@ $string['displayend'] = 'Display end'; $string['displayperiod'] = 'Display Period'; $string['displaystart'] = 'Display start'; $string['eachuserforum'] = 'Each person posts one discussion'; -$string['editedby'] = 'Edited by $a->name - original submission $a->date'; $string['edit'] = 'Edit'; +$string['editedby'] = 'Edited by $a->name - original submission $a->date'; $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['everyoneissubscribed'] = 'Everyone is 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.'; @@ -82,7 +82,6 @@ $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['forum:initialsubscriptions'] = 'Initial subscription'; $string['forumintro'] = 'Forum introduction'; $string['forum:managesubscriptions'] = 'Manage subscriptions'; @@ -106,8 +105,8 @@ $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['generalforums'] = 'General forums'; $string['generalforum'] = 'Standard forum for general use'; +$string['generalforums'] = 'General forums'; $string['inforum'] = 'in $a'; $string['intronews'] = 'General news and announcements'; $string['introsocial'] = 'An open forum for chatting about anything you want to'; @@ -117,10 +116,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['markreadbutton'] = 'Mark
read'; $string['markread'] = 'Mark read'; -$string['markunreadbutton'] = 'Mark
unread'; +$string['markreadbutton'] = 'Mark
read'; $string['markunread'] = 'Mark unread'; +$string['markunreadbutton'] = 'Mark
unread'; $string['maxattachmentsize'] = 'Maximum attachment size'; $string['maxtimehaspassed'] = 'Sorry, but the maximum time for editing this post ($a) has passed!'; $string['message'] = 'Message'; @@ -138,15 +137,15 @@ $string['namenews'] = 'News forum'; $string['namesocial'] = 'Social forum'; $string['nameteacher'] = 'Teacher forum'; //depreciated after 1.7 $string['newforumposts'] = 'New forum posts'; -$string['nodiscussionsstartedby'] = 'No discussions started by this user'; $string['nodiscussions'] = 'There are no discussion topics yet in this forum'; +$string['nodiscussionsstartedby'] = 'No discussions started by this user'; $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['nopostscontaining'] = 'No posts containing \'$a\' were found'; $string['noposts'] = 'No posts'; +$string['nopostscontaining'] = 'No posts containing \'$a\' were found'; $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'; @@ -167,8 +166,8 @@ $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['parentofthispost'] = 'Parent of this post'; $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['postincontext'] = 'See this post in context'; $string['postmailinfo'] = 'This is a copy of a message posted on the $a website. @@ -190,27 +189,28 @@ $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['replies'] = 'Replies'; -$string['replyforum'] = 'Reply to forum'; $string['reply'] = 'Reply'; -$string['re'] = 'Re:'; +$string['replyforum'] = 'Reply to forum'; $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:'; @@ -220,10 +220,9 @@ $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['searchuserid'] = 'The Moodle ID of the author'; $string['searchuser'] = 'This name should match the author'; +$string['searchuserid'] = 'The Moodle ID of 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'; @@ -232,6 +231,7 @@ $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'; @@ -239,24 +239,23 @@ $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['subscribe'] = 'Subscribe to this forum'; -$string['subscriptions'] = 'Subscriptions'; $string['subscription'] = 'Subscription'; +$string['subscriptions'] = 'Subscriptions'; $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['unreadposts'] = 'Unread posts'; -$string['unread'] = 'Unread'; +$string['unsubscribe'] = 'Unsubscribe from this forum'; $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'; diff --git a/mod/forum/config.html b/mod/forum/config.html index 85b6c3fdc2..e272eba0d6 100644 --- a/mod/forum/config.html +++ b/mod/forum/config.html @@ -170,6 +170,23 @@ + + forum_enabletimedposts: + + forum_enabletimedposts, "", "", ""); + ?> + + + + + + " /> -- 2.39.5