From 651d6235a4f6aa574370caf9200318bdb14161b2 Mon Sep 17 00:00:00 2001 From: james Date: Wed, 16 Jul 2008 17:23:53 +0000 Subject: [PATCH] Add config options for Province/State and Postal Code/Zip Code --- admin/award_sponsors.php | 4 ++-- admin/judges_info.php | 4 ++-- admin/reports_awards.inc.php | 8 ++++---- admin/reports_committees.inc.php | 8 ++++---- admin/reports_judges.inc.php | 8 ++++---- admin/reports_judges.php | 4 ++-- admin/reports_mailinglabels_generator.php | 4 ++-- admin/reports_schools.inc.php | 10 +++++----- admin/reports_students.inc.php | 18 +++++++++--------- admin/schools.php | 4 ++-- admin/schoolsimport.php | 2 +- admin/student_editor.php | 4 ++-- admin/students_info.php | 4 ++-- common.inc.php | 3 ++- db/db.code.version.txt | 2 +- judge.class.php | 4 ++-- register_judges_personal.php | 4 ++-- register_participants_students.php | 4 ++-- schoolaccess.php | 4 ++-- user_personal.php | 6 +++--- 20 files changed, 55 insertions(+), 54 deletions(-) diff --git a/admin/award_sponsors.php b/admin/award_sponsors.php index 32c70e73..99fd7af7 100644 --- a/admin/award_sponsors.php +++ b/admin/award_sponsors.php @@ -108,10 +108,10 @@ echo "".i18n("Organization Name")."organization)."\" size=\"60\" maxlength=\"128\" />\n"; echo "".i18n("Address")."address)."\" size=\"60\" maxlength=\"64\" />\n"; echo "".i18n("City")."city)."\" size=\"32\" maxlength=\"32\" />\n"; - echo "".i18n("Province").""; + echo "".i18n($config['provincestate']).""; emit_province_selector("province_code",$r->province_code); echo "\n"; - echo "".i18n("Postal Code")."postalcode\" size=\"8\" maxlength=\"7\" />\n"; + echo "".i18n($config['postalzip'])."postalcode\" size=\"8\" maxlength=\"7\" />\n"; echo "".i18n("Phone")."phone)."\" size=\"16\" maxlength=\"32\" />\n"; echo "".i18n("Fax")."fax)."\" size=\"16\" maxlength=\"32\" />\n"; echo "".i18n("Email")."email)."\" size=\"60\" maxlength=\"128\" />\n"; diff --git a/admin/judges_info.php b/admin/judges_info.php index 262c3845..1e28ccd0 100644 --- a/admin/judges_info.php +++ b/admin/judges_info.php @@ -71,7 +71,7 @@ $preferencechoices=array( echo "\n"; echo "\n"; echo " ".i18n("Address 1")."$judgeinfo->address\n"; - echo " ".i18n("Province")."$judgeinfo->province"; + echo " ".i18n($config['provincestate'])."$judgeinfo->province"; echo "\n"; echo "\n"; echo "\n"; @@ -80,7 +80,7 @@ $preferencechoices=array( echo "\n"; echo "\n"; - echo " ".i18n("Postal Code")."$judgeinfo->postalcode\n"; + echo " ".i18n($config['postalzip'])."$judgeinfo->postalcode\n"; echo " ".i18n("Phone (Work)")."$judgeinfo->phonework ext $judgeinfo->phoneworkext\n"; echo ""; diff --git a/admin/reports_awards.inc.php b/admin/reports_awards.inc.php index 9d29f8bf..86a1e112 100644 --- a/admin/reports_awards.inc.php +++ b/admin/reports_awards.inc.php @@ -90,14 +90,14 @@ $report_awards_fields = array( 'table' => 'award_sponsors.city' ), 'sponsor_province' => array( - 'name' => 'Sponsor -- Province', - 'header' => 'Sp. Province', + 'name' => 'Sponsor -- '.$config['provincestate'], + 'header' => 'Sp. '.$config['provincestate'], 'width' => 0.75, 'table' => 'award_sponsors.province_code' ), 'sponsor_postal' => array( - 'name' => 'Sponsor -- Postal Code', - 'header' => 'Sp. Postal', + 'name' => 'Sponsor -- '.$config['postalzip'], + 'header' => 'Sp. '.$config['postalzip'], 'width' => 0.75, 'table' => 'award_sponsors.postalcode' ), diff --git a/admin/reports_committees.inc.php b/admin/reports_committees.inc.php index eca69a11..104e3945 100644 --- a/admin/reports_committees.inc.php +++ b/admin/reports_committees.inc.php @@ -78,14 +78,14 @@ $report_committees_fields = array( 'table' => 'users.city' ), 'province' => array( - 'name' => 'Committee Member -- Address Province', - 'header' => 'Province', + 'name' => 'Committee Member -- Address '.$config['provincestate'], + 'header' => $config['provincestate'], 'width' => 0.75, 'table' => 'users.province' ), 'postal' => array( - 'name' => 'Committee Member -- Address Postal Code', - 'header' => 'Postal', + 'name' => 'Committee Member -- Address '.$config['postalzip'], + 'header' => $config['postalzip'], 'width' => 0.75, 'table' => 'users.postalcode' ), diff --git a/admin/reports_judges.inc.php b/admin/reports_judges.inc.php index 531917eb..5657e5f9 100644 --- a/admin/reports_judges.inc.php +++ b/admin/reports_judges.inc.php @@ -69,14 +69,14 @@ $report_judges_fields = array( 'table' => 'judges.city' ), 'province' => array( - 'name' => 'Judge -- Address Province', - 'header' => 'Province', + 'name' => 'Judge -- Address '.$config['provincestate'], + 'header' => $config['provincestate'], 'width' => 0.75, 'table' => 'judges.province' ), 'postal' => array( - 'name' => 'Judge -- Address Postal Code', - 'header' => 'Postal', + 'name' => 'Judge -- Address '.$config['postalzip'], + 'header' => $config['postalzip'], 'width' => 0.75, 'table' => 'judges.postalcode' ), diff --git a/admin/reports_judges.php b/admin/reports_judges.php index 0e930c1a..50d49b85 100644 --- a/admin/reports_judges.php +++ b/admin/reports_judges.php @@ -61,8 +61,8 @@ $table['header']=array( i18n("ID"), i18n("Address 1"), i18n("Address 2"), i18n("City"), - i18n("Province"), - i18n("Postal Code"), + i18n($config['provincestate']), + i18n($config['postalzip']), i18n("Highest PostSecDeg"), i18n("Professional Quals"), i18n("Expertise Other")); diff --git a/admin/reports_mailinglabels_generator.php b/admin/reports_mailinglabels_generator.php index 7b44a43b..8580134a 100644 --- a/admin/reports_mailinglabels_generator.php +++ b/admin/reports_mailinglabels_generator.php @@ -139,8 +139,8 @@ if($report) i18n("C/O"), i18n("Address"), i18n("City"), - i18n("Province"), - i18n("Postal Code")); + i18n($config['provincestate']), + i18n($config['postalzip'])); } while($r=mysql_fetch_object($q)) diff --git a/admin/reports_schools.inc.php b/admin/reports_schools.inc.php index c27d054a..6eabc95d 100644 --- a/admin/reports_schools.inc.php +++ b/admin/reports_schools.inc.php @@ -65,20 +65,20 @@ $report_schools_fields = array( 'table' => 'schools.city' ), 'school_province' => array( - 'name' => 'School Address -- Province', - 'header' => 'Province', + 'name' => 'School Address -- '.$config['provincestate'], + 'header' => $config['provincestate'], 'width' => 0.75, 'table' => 'schools.province_code' ), 'school_city_prov' => array( - 'name' => 'School Address -- City, Province (for mailing)', + 'name' => 'School Address -- City, '.$config['provincestate'].' (for mailing)', 'header' => 'City', 'width' => 1.5, 'table' => "CONCAT(schools.city, ', ', schools.province_code)" ), 'school_postal' => array( - 'name' => 'School Address -- Postal Code', - 'header' => 'Postal', + 'name' => 'School Address -- '.$config['postalzip'], + 'header' => $config['postalzip'], 'width' => 0.75, 'table' => 'schools.postalcode' ), diff --git a/admin/reports_students.inc.php b/admin/reports_students.inc.php index fc5d90bc..5ca02037 100644 --- a/admin/reports_students.inc.php +++ b/admin/reports_students.inc.php @@ -300,14 +300,14 @@ $report_students_fields = array( 'table' => 'students.city' ), 'province' => array( - 'name' => 'Student Address -- Province', - 'header' => 'Province', + 'name' => 'Student Address -- '.$config['provincestate'], + 'header' => $config['provincestate'], 'width' => 0.75, 'table' => 'students.province' ), 'postal' => array( - 'name' => 'Student Address -- Postal Code', - 'header' => 'Postal', + 'name' => 'Student Address -- '.$config['postalzip'], + 'header' => $config['postalzip'], 'width' => 0.75, 'table' => 'students.postalcode' ), @@ -370,20 +370,20 @@ $report_students_fields = array( 'table' => 'schools.city' ), 'school_province' => array( - 'name' => 'School Address -- Province', - 'header' => 'Province', + 'name' => 'School Address -- '.$config['provincestate'], + 'header' => $config['provincestate'], 'width' => 0.75, 'table' => 'schools.province_code' ), 'school_city_prov' => array( - 'name' => 'School Address -- City, Province (for mailing)', + 'name' => 'School Address -- City, '.$config['provincestate'].' (for mailing)', 'header' => 'City', 'width' => 1.5, 'table' => "CONCAT(schools.city, ', ', schools.province_code)" ), 'school_postal' => array( - 'name' => 'School Address -- Postal Code', - 'header' => 'Postal', + 'name' => 'School Address -- '.$config['postalzip'], + 'header' => $config['postalzip'], 'width' => 0.75, 'table' => 'schools.postalcode' ), diff --git a/admin/schools.php b/admin/schools.php index bb96465e..7c2f125d 100644 --- a/admin/schools.php +++ b/admin/schools.php @@ -138,10 +138,10 @@ echo "".i18n("School District")."district)."\" size=\"60\" maxlength=\"64\" />\n"; echo "".i18n("Address")."address)."\" size=\"60\" maxlength=\"64\" />\n"; echo "".i18n("City")."city)."\" size=\"32\" maxlength=\"32\" />\n"; - echo "".i18n("Province").""; + echo "".i18n($config['provincestate']).""; emit_province_selector("province_code",$r->province_code); echo "\n"; - echo "".i18n("Postal Code")."postalcode\" size=\"8\" maxlength=\"7\" />\n"; + echo "".i18n($config['postalzip'])."postalcode\" size=\"8\" maxlength=\"7\" />\n"; echo "".i18n("Phone")."phone)."\" size=\"16\" maxlength=\"16\" />\n"; echo "".i18n("Fax")."fax)."\" size=\"16\" maxlength=\"16\" />\n"; echo "".i18n("Principal")."principal)."\" size=\"60\" maxlength=\"64\" />\n"; diff --git a/admin/schoolsimport.php b/admin/schoolsimport.php index 43a6b570..54fb25c0 100644 --- a/admin/schoolsimport.php +++ b/admin/schoolsimport.php @@ -104,7 +104,7 @@ echo i18n("Choose the CSV file containing the school information. The COLUMNS of the file must contain the following information, in this exact order, separated by comma's (,) with fields optionally enclosed by quotes (\"):"); echo "
"; echo "
"; - echo i18n("School Name, School Lang, School Level, Board, District, Phone, Fax, Address, City, Province, Postal Code, Principal, School Email, Science Head, Science Head Email, Science Head Phone, Access Code, Registration Password, Project Limit, Project Limit Per(total or agecategory)"); + echo i18n("School Name, School Lang, School Level, Board, District, Phone, Fax, Address, City, %1, %2, Principal, School Email, Science Head, Science Head Email, Science Head Phone, Access Code, Registration Password, Project Limit, Project Limit Per(total or agecategory)",array(i18n($config['provincestate']),i18n($config['postalzip']))); echo "
"; echo "
"; diff --git a/admin/student_editor.php b/admin/student_editor.php index 4656daf0..c64abe44 100644 --- a/admin/student_editor.php +++ b/admin/student_editor.php @@ -241,12 +241,12 @@ if($config['participant_student_personal']=="yes") { echo "\n"; echo " ".i18n("Address")."address\" />".REQUIREDFIELD."\n"; - echo " ".i18n("Province").""; + echo " ".i18n($config['provincestate']).""; emit_province_selector("province[$x]",$studentinfo->province); echo REQUIREDFIELD."\n"; echo "\n"; echo "\n"; - echo " ".i18n("Postal Code")."postalcode\" />".REQUIREDFIELD."\n"; + echo " ".i18n($config['postalzip'])."postalcode\" />".REQUIREDFIELD."\n"; echo " ".i18n("Phone")."phone\" />".REQUIREDFIELD."\n"; echo "\n"; diff --git a/admin/students_info.php b/admin/students_info.php index 77c760f5..5b81dfdb 100644 --- a/admin/students_info.php +++ b/admin/students_info.php @@ -65,8 +65,8 @@ echo "\n"; echo "\n"; echo "\n"; - echo " ".i18n("Province")."$studentinfo->province"; - echo " ".i18n("Postal Code")."$studentinfo->postalcode\n"; + echo " ".i18n($config['provincestate'])."$studentinfo->province"; + echo " ".i18n($config['postalzip'])."$studentinfo->postalcode\n"; echo "\n"; echo "\n"; echo " ".i18n("Medical Information")."$studentinfo->medicalalert"; diff --git a/common.inc.php b/common.inc.php index fba4ae2a..c21416ea 100644 --- a/common.inc.php +++ b/common.inc.php @@ -809,6 +809,7 @@ function emit_time_selector($name,$selected="") function emit_province_selector($name,$selected="",$extra="") { + global $config; $q=mysql_query("SELECT * FROM provinces ORDER BY province"); if(mysql_num_rows($q)==1) { @@ -819,7 +820,7 @@ function emit_province_selector($name,$selected="",$extra="") else { echo "\n"; echo "\n"; echo " ".i18n("Address 1")."address\" />".REQUIREDFIELD."\n"; -echo " ".i18n("Province").""; +echo " ".i18n($config['provincestate']).""; emit_province_selector("province",$judgeinfo->province,"onchange=\"fieldChanged()\""); echo REQUIREDFIELD."\n"; echo "\n"; @@ -111,7 +111,7 @@ echo " ".i18n("Phone (Home)")."\n"; echo "\n"; -echo " ".i18n("Postal Code")."postalcode\" />".REQUIREDFIELD."\n"; +echo " ".i18n($config['postalzip'])."postalcode\" />".REQUIREDFIELD."\n"; echo " ".i18n("Phone (Work)")."phonework\" /> extphoneworkext\" />\n"; echo ""; diff --git a/register_participants_students.php b/register_participants_students.php index 457d5e1e..1d5b9f10 100644 --- a/register_participants_students.php +++ b/register_participants_students.php @@ -332,12 +332,12 @@ if($config['participant_student_personal']=="yes") { echo "\n"; echo " ".i18n("Address")."address\" />".REQUIREDFIELD."\n"; - echo " ".i18n("Province").""; + echo " ".i18n($config['provincestate']).""; emit_province_selector("province[$x]",$studentinfo->province); echo REQUIREDFIELD."\n"; echo "\n"; echo "\n"; - echo " ".i18n("Postal Code")."postalcode\" />".REQUIREDFIELD."\n"; + echo " ".i18n($config['postalzip'])."postalcode\" />".REQUIREDFIELD."\n"; echo " ".i18n("Phone")."phone\" />".REQUIREDFIELD."\n"; echo "\n"; diff --git a/schoolaccess.php b/schoolaccess.php index 6eb6ddf6..93279799 100644 --- a/schoolaccess.php +++ b/schoolaccess.php @@ -100,10 +100,10 @@ if($_SESSION['schoolid'] && $_SESSION['schoolaccesscode']) // echo "Registration Passwordregistration_password\" type=text name=\"registration_password\" size=\"20\">"; echo "".i18n("Address")."address\" type=text name=address size=40>"; echo "".i18n("City")."city\" type=text name=city size=30>"; - echo "".i18n("Province").""; + echo "".i18n($config['provincestate']).""; emit_province_selector("province_code",$school->province_code); echo "\n"; - echo "".i18n("Postal Code")."postalcode\" type=text name=postalcode size=10>"; + echo "".i18n($config['postalzip'])."postalcode\" type=text name=postalcode size=10>"; echo "".i18n("Phone Number")."phone\" type=text name=phone size=30>"; echo "".i18n("Fax Number")."fax\" type=text name=fax size=30>"; echo "".i18n("Science Teacher")."sciencehead\" type=text name=sciencehead size=40>"; diff --git a/user_personal.php b/user_personal.php index 448a1137..b2bd471e 100644 --- a/user_personal.php +++ b/user_personal.php @@ -42,7 +42,7 @@ 'address' => array('name' => 'Address 1'), 'address2' => array('name' => 'Address 2'), 'city' => array('name' => 'City'), - 'province' => array('name' => 'Province'), + 'province' => array('name' => $config['provincestate']), 'organization' => array('name' => 'Organization'), 'sex' => array('name' => 'Gender'), 'firstaid' => array ('name' => 'First Aid Training', @@ -61,7 +61,7 @@ 'fax' => array('name' => 'Fax', 'regexp' => '^[1-9][0-9]{2}-[1-9][0-9]{2}-[0-9]{4}$', 'format' => '\'NNN-NNN-NNNN\'',), - 'postalcode' => array('name' => 'Postal Code', + 'postalcode' => array('name' => $config['postalzip'], 'regexp' => '^(([A-Z][0-9][A-Z] [0-9][A-Z][0-9])|([0-9]{5}))$', 'format' => '\'ANA NAN\' or \'NNNNN\'',), @@ -280,7 +280,7 @@ echo "\n"; echo "\n"; item($u, 'address2'); if(in_array('province', $fields)) { - echo ''.i18n('Province').': '; + echo ''.i18n($config['provincestate']).': '; echo ''; emit_province_selector("province",$u['province'],"onchange=\"fieldChanged()\""); if(in_array('province', $required)) echo REQUIREDFIELD;