From 8b4c8297b1469dd83f537cc0f26b4fb2d69d7fb3 Mon Sep 17 00:00:00 2001
From: james <james>
Date: Thu, 11 Feb 2010 22:35:57 +0000
Subject: [PATCH] Use Youth Science Canada (or YSC) instead of YSF

---
 admin/cwsfregister.php      | 10 +++++-----
 admin/fair_stats.php        |  6 +++---
 admin/index.php             |  2 +-
 admin/reports_fairs.inc.php |  4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/admin/cwsfregister.php b/admin/cwsfregister.php
index baa84e8..37455e4 100644
--- a/admin/cwsfregister.php
+++ b/admin/cwsfregister.php
@@ -153,13 +153,13 @@ include "xml.inc.php";
 		// echo "curl close <br />";
 		curl_close ($ch); /// close the curl session
 
-		echo i18n("The YSF Registration Server said:")."<br />";
+		echo i18n("The YSC Registration Server said:")."<br />";
 		echo notice($datastream);
 	}
 	else
 	{
 		echo error("CURL Support Missing");
-		echo i18n("Your PHP installation does not support CURL.  You will need to login to the YSF system as the regional coodinator and upload the XML data manually");
+		echo i18n("Your PHP installation does not support CURL.  You will need to login to the YSC system as the regional coodinator and upload the XML data manually");
 	}
 	send_footer();
 	exit;
@@ -203,7 +203,7 @@ include "xml.inc.php";
 	{
 		$award=mysql_fetch_object($q);
 		echo "<b>".i18n("CWSF Award").":</b> ".$award->name."<br />";
-		echo i18n("Please review the list of winning projects/students below.  If it is all correct then you can click the 'Register for CWSF' button at the bottom of the page to send the information to YSF");
+		echo i18n("Please review the list of winning projects/students below.  If it is all correct then you can click the 'Register for CWSF' button at the bottom of the page to send the information to YSC");
 		echo "<br />";
 		echo "<br />";
 		$winners=get_cwsf_award_winners();
@@ -303,7 +303,7 @@ include "xml.inc.php";
 			xmlCreateRecurse($reg);
 			$xmldata=$output;
 
-			echo "<h3>".i18n("The following data will be sent to YSF")."</h3>";
+			echo "<h3>".i18n("The following data will be sent to Youth Science Canada")."</h3>";
 			echo "<form method=\"post\" action=\"cwsfregister.php\">";
 			echo "<input type=\"hidden\" name=\"action\" value=\"register\">";
 			echo "<textarea rows=\"15\" cols=\"80\" name=\"xml\">";
@@ -311,7 +311,7 @@ include "xml.inc.php";
 			echo "</textarea>";
 			echo "<br />";
 			echo "<br />";
-			echo i18n("Warning!  You can only use this feature once, and it will send whatever data is listed above.  If you try to submit this data a second time to YSF it will not work.  So please make sure everything is correct before submitting!");
+			echo i18n("Warning!  You can only use this feature once, and it will send whatever data is listed above.  If you try to submit this data a second time to YSC it will not work.  So please make sure everything is correct before submitting!");
 			echo "<br />";
 			echo "<br />";
 			echo "<input type=\"submit\" value=\"".i18n("Register for CWSF")."\">";
diff --git a/admin/fair_stats.php b/admin/fair_stats.php
index 4d63788..657ecb1 100644
--- a/admin/fair_stats.php
+++ b/admin/fair_stats.php
@@ -40,7 +40,7 @@
  function stats_to_ysc($fair, $stats) 
  {
 	if($fair['type'] == 'ysc') {
-		/* Map data into YSF tags */
+		/* Map data into YSC tags */
 	 	$y=array();
 		$y["numschoolstotal"]=$stats['schools_total'];
 		$y["numschoolsactive"]=$stats['schools_active'];
@@ -126,7 +126,7 @@
 //		$year = $config['FAIRYEAR'];
 	} else {
 		echo error("CURL Support Missing");
-		echo i18n("Your PHP installation does not support CURL.  You will need to login to the YSF system as the regional coodinator and upload the XML data manually");
+		echo i18n("Your PHP installation does not support CURL.  You will need to login to the YSC system as the regional coodinator and upload the XML data manually");
 		send_footer();
 		exit;
 	}
@@ -336,7 +336,7 @@
 	echo '<td><textarea name="address" rows="4" cols="60">'.htmlspecialchars($stats['address']).'</textarea></td>';
 	echo '<tr><td>'.i18n('Fair Budget').':</td>';
 	echo "<td>$<input type=text name=\"budget\" value=\"{$stats['budget']}\"></td></tr>";
-	echo '<tr><td>'.i18n('YSF Affiliation Complete').'?</td>';
+	echo '<tr><td>'.i18n('Youth Science Canada Affiliation Complete').'?</td>';
 	echo '<td><select name="ysf_affiliation_complete">';
 	$sel = $stats['ysf_affiliation_complete'] == 'N' ? 'selected="selected"' : '';
 	echo " <option value=\"N\" $sel >No</option>";
diff --git a/admin/index.php b/admin/index.php
index 668e797..63d0abd 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -87,7 +87,7 @@
  }
  echo "  <td><a href=\"winners.php\">".theme_icon("enter_winning_projects")."<br />".i18n("Enter Winning Projects")."</a></td>";
  echo "  <td><a href=\"cwsfregister.php\">".theme_icon("one-click_cwsf_registration")."<br />".i18n("One-Click CWSF Registration")."</a></td>";
- echo "  <td><a href=\"fair_stats.php?abbrv=YSC\">".theme_icon("one-click_ysf_affiliation_stats")."<br />".i18n("One-Click YSF Affiliation Stats")."</a></td>";
+ echo "  <td><a href=\"fair_stats.php?abbrv=YSC\">".theme_icon("one-click_ysf_affiliation_stats")."<br />".i18n("One-Click YSC Affiliation Stats")."</a></td>";
  echo "  <td><a href=\"fair_stats.php\">".theme_icon("fair_stats")."<br />".i18n("Upload Statistics")."</a></td>";
  echo " </tr>\n";
  echo "</table>\n";
diff --git a/admin/reports_fairs.inc.php b/admin/reports_fairs.inc.php
index 39d0d8a..824832c 100644
--- a/admin/reports_fairs.inc.php
+++ b/admin/reports_fairs.inc.php
@@ -70,8 +70,8 @@ $report_fairs_fields = array(
 		'table' => 'fairs_stats.address',
 		'components' => array('fairs_stats')), 
 	'fairstats_ysf_affiliation_complete' => array (
-		'name' => 'Fair Stats -- YSF Affilitation Complete',
-		'header' => 'YSF Affilitation Complete',
+		'name' => 'Fair Stats -- YSC Affilitation Complete',
+		'header' => 'YSC Affilitation Complete',
 		'width' => 1,
 		'table' => 'fairs_stats.ysf_affiliation_complete',
 		'components' => array('fairs_stats')),