Merge pull request #1 from Sashi20/master

Modify text displayed  in completed labs and labs in progress page

3 files changed, 8 insertions, 9 deletions

diff --git a/bulk_approval.inc b/bulk_approval.inc
index 8c7acda..99148a0 100755
--- a/bulk_approval.inc
+++ b/bulk_approval.inc
@@ -621,7 +621,7 @@ FOSSEE,IIT Bombay', array(
                     $email_body = array(
                         0 => t('
 
-Dear !user_name,
+Dear ' . $proposal_data->name . ',
 
 We regret to inform you that all the uploaded Experiments of your Lab with following details have been deleted permanently.
 
@@ -633,8 +633,8 @@ Reason for dis-approval: ' . $form_state['values']['message'] . '
 
 Best Wishes,
 
-!site_name Team,
-FOSSEE,IIT Bombay', array(
+!site_name Team
+FOSSEE, IIT Bombay', array(
                             '!site_name' => variable_get('site_name', ''),
                             '!user_name' => $user_data->name
                         ))
diff --git a/email.inc b/email.inc
index 0fb290d..30d4f62 100755
--- a/email.inc
+++ b/email.inc
@@ -286,8 +286,7 @@ FOSSEE, IIT Bombay', array(
                 'body' => t('
 Dear ' . $proposal_data->name . ',
 
-We regret to inform you that your proposal for lab migration with the following
-details has been disapproved due to the following reason.
+We regret to inform you that your proposal for lab migration with the following details has been disapproved due to the following reason.
 
 Reason for disapproval: ' . $proposal_data->message . '
 
@@ -478,11 +477,11 @@ University/Institute: ' . $proposal_data->university . '
 City: ' . $proposal_data->city . '
 State: ' . $proposal_data->state . '
 
-Solution for this lab has been provided by' . $solution_provider_user . '
+Solution for this lab has been provided by ' . $solution_provider_user . '
 
 List of experiments: ' . $experiment_list . '
 
-Your Lab solution is now available at following link to download.
+Your lab solution is now available at following link to download.
 
 https://r.fossee.in/lab-migration/lab-migration-run/' . $proposal_data->id . '
 
diff --git a/lab_details.inc b/lab_details.inc
index b847f98..6d05ccd 100755
--- a/lab_details.inc
+++ b/lab_details.inc
@@ -10,7 +10,7 @@ function lab_migration_completed_labs_all()
     //$result = db_query($query);
     if ($result->rowCount() == 0)
       {
-        $output .= "We will in process to update lab migration data";
+        $output .= "We are in the process of updating the lab migration data. ";
       }
     else
       {
@@ -51,7 +51,7 @@ function lab_migration_labs_progress_all()
     $result = $query->execute();
     if ($result->rowCount() == 0)
       {
-        $page_content .= "We will in process to update lab migration data";
+        $page_content .= "We are in the process of updating the lab migration data. ";
       }
     else
       {