From dac99ce35c9d3b885f7cc2584493812923303b3d Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 15 Sep 2010 01:00:42 -0600 Subject: [PATCH] removed more references to EQ --- bin/import_ward_data | 2 +- inc/class.tc.inc.php | 12 ++++++------ setup/phpgw_en.lang | 2 +- setup/phpgw_fr.lang | 2 +- setup/phpgw_sv.lang | 2 +- tc.spec | 2 +- templates/default/admin.tpl | 8 +++----- templates/default/att_update.tpl | 2 +- templates/default/vis_update.tpl | 2 +- 9 files changed, 16 insertions(+), 18 deletions(-) diff --git a/bin/import_ward_data b/bin/import_ward_data index 70f500e..57a7f51 100755 --- a/bin/import_ward_data +++ b/bin/import_ward_data @@ -474,7 +474,7 @@ sub update_tc_visit_table #print "family_id = $family_id\n"; #print "comp_id = $comp_id\n"; - # ignore visits that weren't done by the EQ + # ignore visits that weren't done by the quorum if ($comp_id == 0) { next; } # retrieve the month header if not already done diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php index b578561..fd885ae 100644 --- a/inc/class.tc.inc.php +++ b/inc/class.tc.inc.php @@ -290,7 +290,7 @@ class tc $query_id = $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->num_rows($query_id) == 0) { // We did not find any visits made by the currently assigned companionship, - // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit) + // look for visits made by any other companionship other than 0. (0 == Presidency Visit) $sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' ". " AND companionship!=0". " AND family=". $family_id; @@ -492,7 +492,7 @@ class tc $query_id = $this->db2->query($sql,__LINE__,__FILE__); if($this->db2->num_rows($query_id) == 0) { // We did not find any visits made by the currently assigned companionship, - // look for visits made by any other companionship other than 0. (0 == EQ Presidency Visit) + // look for visits made by any other companionship other than 0. (0 == Presidency Visit) $sql = "SELECT * FROM tc_visit WHERE date >= '$month_start' AND date <= '$month_end' ". " AND companionship!=0". " AND family=". $family_id; @@ -1352,7 +1352,7 @@ class tc $year = date('Y'); - // Get the EQ President + // Get the President $sql = "SELECT * FROM tc_presidency where president=1 and valid=1"; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { @@ -1449,7 +1449,7 @@ class tc $total_indivs=0; $indivs_with_yearly_ppi=0; - // Display a scheduling table for the EQ President + // Display a scheduling table for the President $table_data=""; $appt_table_data=""; $table_title = "District ".$district_number.": ".$district_name.": All indivs with Yearly PPI Not Completed"; $appt_table_title = "District ".$district_number.": ".$district_name.": Yearly PPI Appointment Slots"; @@ -2137,7 +2137,7 @@ class tc $appt_header_row.= "Location"; $appt_table_data = ""; - // Find out what the EQ Presidency ID is + // Find out what the President ID is $sql = "SELECT * FROM tc_presidency where president=1 and valid=1"; $this->db->query($sql,__LINE__,__FILE__); if($this->db->next_record()) { @@ -4147,7 +4147,7 @@ class tc $this->t->pfp('adminhandle','admin'); } - // Now save off the data needed for an EQ Presidency Table Update + // Now save off the data needed for a Presidency Table Update $sql = "SELECT * FROM tc_presidency where valid=1"; $this->db->query($sql,__LINE__,__FILE__); diff --git a/setup/phpgw_en.lang b/setup/phpgw_en.lang index 41a5875..02a8daa 100644 --- a/setup/phpgw_en.lang +++ b/setup/phpgw_en.lang @@ -1 +1 @@ -eq common en EQ +tc common en TC diff --git a/setup/phpgw_fr.lang b/setup/phpgw_fr.lang index 7cc3ceb..4b36c71 100644 --- a/setup/phpgw_fr.lang +++ b/setup/phpgw_fr.lang @@ -1 +1 @@ -eq common fr EQ +tc common fr TC diff --git a/setup/phpgw_sv.lang b/setup/phpgw_sv.lang index 1b63b18..dffdaa5 100644 --- a/setup/phpgw_sv.lang +++ b/setup/phpgw_sv.lang @@ -1 +1 @@ -eq common sv EQ +tc common sv TC diff --git a/tc.spec b/tc.spec index 1e88ce7..1f38427 100644 --- a/tc.spec +++ b/tc.spec @@ -51,6 +51,6 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/%{phpgwdirname} %changelog -- EQ App Update +- TC App Update # end of file diff --git a/templates/default/admin.tpl b/templates/default/admin.tpl index a8a3cdf..31de491 100644 --- a/templates/default/admin.tpl +++ b/templates/default/admin.tpl @@ -47,7 +47,7 @@
- Update the EQ Presidency Table + Update the Presidency Table

@@ -56,14 +56,12 @@
Notes:
- The District is a drop-down list. Please assign a unique district number per district supervisor. -
- The President, Counselor, Secretary, and EQ Presidency fields are boolean value (true|false) flags. +
- The President, Counselor, Secretary, and Presidency fields are boolean value (true|false) flags.
- If a member of the presidency is not a District Leader, make sure to set their "District=0".
- If a district leader is not a member of the presidency, add them without setting any other flags except the district.
- You can only add 1 new presidency member at a time (1 per each update request to the table). -
- Make sure you have 1 EQ Presidency member that is marked as EQ Presidency=1 with no Elder selected. -
This entry is used to email the entire presidency, and its email address should cause that to happen.

- +
diff --git a/templates/default/att_update.tpl b/templates/default/att_update.tpl index 2719796..62219b5 100644 --- a/templates/default/att_update.tpl +++ b/templates/default/att_update.tpl @@ -10,7 +10,7 @@
- Note: All individuals serving in the EQ Presidency, Young Men, Sunday School, or Primary + Note: All individuals serving in the Presidency, Young Men, Sunday School, or Primary
have been automarked as attending. Feel free to adjust this accordingly.
diff --git a/templates/default/vis_update.tpl b/templates/default/vis_update.tpl index eb23b39..f43912e 100644 --- a/templates/default/vis_update.tpl +++ b/templates/default/vis_update.tpl @@ -15,7 +15,7 @@ + -- 2.34.1
Companionship:   -