merging messageboard cleanup from 1.7 branch [5908],[5909],[5917]

git-svn-id: http://code.elgg.org/elgg/trunk@6019 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 58 insertions, 60 deletions

diff --git a/mod/messageboard/languages/en.php b/mod/messageboard/languages/en.php
index ebe2cd50c..537177014 100644
--- a/mod/messageboard/languages/en.php
+++ b/mod/messageboard/languages/en.php
@@ -1,49 +1,49 @@
 <?php
 
-	$english = array(
-	
-		/**
-		 * Menu items and titles
-		 */
-	
-			'messageboard:board' => "Message board",
-			'messageboard:messageboard' => "message board",
-			'messageboard:viewall' => "View all",
-			'messageboard:postit' => "Post it",
-			'messageboard:history:title' => "History",
-			'messageboard:none' => "There is nothing on this message board yet",
-			'messageboard:num_display' => "Number of messages to display",
-			'messageboard:desc' => "This is a message board that you can put on your profile where other users can comment.",
-	
-			'messageboard:user' => "%s's message board",
-	
-			'messageboard:replyon' => 'reply on',
-			'messageboard:history' => "history",
-	
-         /**
-	     * Message board widget river
-	     **/
-	        
-	        'messageboard:river:annotate' => "%s has had a new comment posted on their message board.",
-	        'messageboard:river:create' => "%s added the message board widget.",
-	        'messageboard:river:update' => "%s updated their message board widget.",
-	        'messageboard:river:added' => "%s posted on",
-		    'messageboard:river:messageboard' => "message board",
+$english = array(
 
-			
-		/**
-		 * Status messages
-		 */
-	
-			'messageboard:posted' => "You successfully posted on the message board.",
-			'messageboard:deleted' => "You successfully deleted the message.",
-	
-		/**
-		 * Email messages
-		 */
-	
-			'messageboard:email:subject' => 'You have a new message board comment!',
-			'messageboard:email:body' => "You have a new message board comment from %s. It reads:
+	/**
+	 * Menu items and titles
+	 */
+
+	'messageboard:board' => "Message board",
+	'messageboard:messageboard' => "message board",
+	'messageboard:viewall' => "View all",
+	'messageboard:postit' => "Post",
+	'messageboard:history:title' => "History",
+	'messageboard:none' => "There is nothing on this message board yet",
+	'messageboard:num_display' => "Number of messages to display",
+	'messageboard:desc' => "This is a message board that you can put on your profile where other users can comment.",
+
+	'messageboard:user' => "%s's message board",
+
+	'messageboard:replyon' => 'reply on',
+	'messageboard:history' => "history",
+
+	/**
+	 * Message board widget river
+	 **/
+
+	'messageboard:river:annotate' => "%s has had a new comment posted on their message board.",
+	'messageboard:river:create' => "%s added the message board widget.",
+	'messageboard:river:update' => "%s updated their message board widget.",
+	'messageboard:river:added' => "%s posted on",
+	'messageboard:river:messageboard' => "message board",
+
+
+	/**
+	 * Status messages
+	 */
+
+	'messageboard:posted' => "You successfully posted on the message board.",
+	'messageboard:deleted' => "You successfully deleted the message.",
+
+	/**
+	 * Email messages
+	 */
+
+	'messageboard:email:subject' => 'You have a new message board comment!',
+	'messageboard:email:body' => "You have a new message board comment from %s. It reads:
 
 			
 %s
@@ -58,20 +58,18 @@ To view %s's profile, click here:
 	%s
 
 You cannot reply to this email.",
-	
-		/**
-		 * Error messages
-		 */
-	
-			'messageboard:blank' => "Sorry; you need to actually put something in the message area before we can save it.",
-			'messageboard:notfound' => "Sorry; we could not find the specified item.",
-			'messageboard:notdeleted' => "Sorry; we could not delete this message.",
-			'messageboard:somethingwentwrong' => "Something went wrong when trying to save your message, make sure you actually wrote a message.",
-	     
-			'messageboard:failure' => "An unexpected error occurred when adding your message. Please try again.",
-	
-	);
-					
-	add_translation("en",$english);
-
-?>
\ No newline at end of file
+
+	/**
+	 * Error messages
+	 */
+
+	'messageboard:blank' => "Sorry; you need to actually put something in the message area before we can save it.",
+	'messageboard:notfound' => "Sorry; we could not find the specified item.",
+	'messageboard:notdeleted' => "Sorry; we could not delete this message.",
+	'messageboard:somethingwentwrong' => "Something went wrong when trying to save your message, make sure you actually wrote a message.",
+
+	'messageboard:failure' => "An unexpected error occurred when adding your message. Please try again.",
+
+);
+
+add_translation("en", $english);