Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Colon clear #2 #1250

Merged
merged 13 commits into from
Nov 4, 2016
Merged

Colon clear #2 #1250

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9853fd9
Fix typo in header (#1152)
vboctor Oct 17, 2016
82a47bb
Update Branching Strategy.
crossan007 Oct 19, 2016
ffc673c
fix 1180 (#1185)
crossan007 Oct 23, 2016
e792028
Update messages.po (POEditor.com)
DawoudIO Oct 23, 2016
bc02536
added docker size
DawoudIO Oct 23, 2016
2895f11
Added docker clone counter
DawoudIO Oct 23, 2016
e4b5a2f
update badges
DawoudIO Oct 23, 2016
14c43dd
2.3.0 RC to master
DawoudIO Oct 31, 2016
2d94e0a
Merge remote-tracking branch 'refs/remotes/ChurchCRM/master' into Chu…
saulowulhynek Oct 31, 2016
22b40ed
Colon Clear #2
saulowulhynek Oct 31, 2016
7a66204
Update Dashboard.php
DawoudIO Nov 4, 2016
0b77de2
Update SundaySchoolClassView.php
DawoudIO Nov 4, 2016
b0ab9d0
Merge branch 'develop' into Colon-Clear-#2
DawoudIO Nov 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Include/Header-function.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ function Header_modals() {
<h4 class="modal-title"><?= gettext("ERROR!") ?></h4>
</div>
<div class="modal-body">
<p><?= gettext("Error making API Call to:") ?> <span id="APIEndpoint"></span></p>
<p><?= gettext("Error making API Call to") ?>: <span id="APIEndpoint"></span></p>

<p><?= gettext("Error text:") ?> <span id="APIErrorText"></span></p>
<p><?= gettext("Error text") ?>: <span id="APIErrorText"></span></p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal"><?= gettext("Close") ?></button>
Expand All @@ -82,7 +82,7 @@ function Header_modals() {
<div class="container-fluid">
<div class="row">
<div class="col-xl-3">
<label for="issueTitle"><?= gettext("Enter a Title for your bug / feature report:") ?> </label>
<label for="issueTitle"><?= gettext("Enter a Title for your bug / feature report") ?>: </label>
</div>
<div class="col-xl-3">
<input type="text" name="issueTitle" style="width:100%">
Expand Down
16 changes: 8 additions & 8 deletions src/Include/LabelFunctions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function FontSelect($fieldname)
sort($fontnames);

echo "<tr>";
echo "<td class=\"LabelColumn\">" . gettext("Font:") . "</td>";
echo "<td class=\"LabelColumn\">" . gettext("Font") . ":</td>";
echo "<td class=\"TextColumn\">";
echo "<select name=\"$fieldname\">";
foreach ($fontnames as $n) {
Expand All @@ -61,7 +61,7 @@ function FontSizeSelect($fieldname)
{
$sizes = array("default", 6, 7, 8, 9, 10, 11, 12, 14, 16, 18);
echo "<tr>";
echo "<td class=\"LabelColumn\"> " . gettext("Font Size:") . "</td>";
echo "<td class=\"LabelColumn\"> " . gettext("Font Size") . ":</td>";
echo "<td class=\"TextColumn\">";
echo "<select name=\"$fieldname\">";
foreach ($sizes as $s) {
Expand All @@ -79,7 +79,7 @@ function LabelSelect($fieldname)
{
$labels = array("Tractor", "5160", "5161", "5162", "5163", "5164", "8600", "L7163");
echo "<tr>";
echo "<td class=\"LabelColumn\">" . gettext("Label Type:") . "</td>";
echo "<td class=\"LabelColumn\">" . gettext("Label Type") . ":</td>";
echo "<td class=\"TextColumn\">";
echo "<select name=\"$fieldname\">";
foreach ($labels as $l) {
Expand Down Expand Up @@ -114,7 +114,7 @@ function LabelGroupSelect($fieldname)

function ToParentsOfCheckBox($fieldname)
{
echo "<tr><td class=\"LabelColumn\">" . gettext("To the parents of:") . "</td>";
echo "<tr><td class=\"LabelColumn\">" . gettext("To the parents of") . ":</td>";
echo "<td class=\"TextColumn\">";
echo "<input name=\"$fieldname\" type=\"checkbox\" ";
echo "id=\"ToParent\" value=\"1\" ";
Expand All @@ -129,14 +129,14 @@ function StartRowStartColumn()
{
echo '
<tr>
<td class="LabelColumn">' . gettext("Start Row:") . '
<td class="LabelColumn">' . gettext("Start Row") . ':
</td>
<td class="TextColumn">
<input type="text" name="startrow" id="startrow" maxlength="2" size="3" value="1">
</td>
</tr>
<tr>
<td class="LabelColumn">' . gettext("Start Column:") . '
<td class="LabelColumn">' . gettext("Start Column") . ':
</td>
<td class="TextColumn">
<input type="text" name="startcol" id="startcol" maxlength="2" size="3" value="1">
Expand All @@ -148,7 +148,7 @@ function IgnoreIncompleteAddresses()
{
echo '
<tr>
<td class="LabelColumn">' . gettext("Ignore Incomplete<br>Addresses:") . '
<td class="LabelColumn">' . gettext("Ignore Incomplete<br>Addresses") . ':
</td>
<td class="TextColumn">
<input type="checkbox" name="onlyfull" id="onlyfull" value="1" checked>
Expand All @@ -160,7 +160,7 @@ function LabelFileType()
{
echo '
<tr>
<td class="LabelColumn">' . gettext("File Type:") . '
<td class="LabelColumn">' . gettext("File Type") . ':
</td>
<td class="TextColumn">
<select name="filetype">
Expand Down
6 changes: 3 additions & 3 deletions src/email/Dashboard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
<h3 class="box-title"><?= gettext("Email Export") ?></h3>
</div>
<div class="box-body">
<?= gettext("You can import the generated CSV file to external email system.
For MailChimp see:") ?> <a href="http://kb.mailchimp.com/lists/growth/import-subscribers-to-a-list"
<?= gettext("You can import the generated CSV file to external email system.") ?>:
For MailChimp see <a href="http://kb.mailchimp.com/lists/growth/import-subscribers-to-a-list"
target="_blank"><?= gettext("import subscribers to a list.") ?></a>
<br/><br/>

Expand All @@ -55,7 +55,7 @@
<div class="col-lg-4 col-md-2 col-sm-2">
<div class="box">
<div class="box-header">
<h3 class="box-title"><?= gettext("List:") ?> <?= $list["name"] ?></h3>
<h3 class="box-title"><?= gettext("List") ?>: <?= $list["name"] ?></h3>
</div>
<div class="box-body">
<?
Expand Down
2 changes: 1 addition & 1 deletion src/sundayschool/SundaySchoolClassView.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class="fa fa-send-o"></i><?= gettext('Email') ?></a>
<span class="sr-only"><?= gettext("Toggle Dropdown") ?></span>
</button>
<ul class="dropdown-menu" role="menu">
<?php generateGroupRoleEmailDropdown($roleEmails, "mailto:") ?>
<?php generateGroupRoleEmailDropdown($roleEmails, "mailto") ?>:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that is not a gettext ... this used for email links

</ul>
</div>

Expand Down
26 changes: 13 additions & 13 deletions src/sundayschool/SundaySchoolReports.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,68 +144,68 @@
</tr>

<tr>
<td><?= gettext("Fiscal Year:") ?></td>
<td><?= gettext("Fiscal Year") ?>:</td>
<td class="TextColumnWithBottomBorder">
<?php PrintFYIDSelect($iFYID, "FYID") ?>
</td>
</tr>

<tr>
<td><?= gettext("First Sunday:") ?></td>
<td><?= gettext("First Sunday") ?>:</td>
<td><input type="text" name="FirstSunday" value="<?= $dFirstSunday ?>" maxlength="10" id="FirstSunday" size="11" class="date-picker"></td>
</tr>

<tr>
<td><?= gettext("Last Sunday:") ?></td>
<td><?= gettext("Last Sunday") ?>:</td>
<td><input type="text" name="LastSunday" value="<?= $dLastSunday ?>" maxlength="10" id="LastSunday" size="11" class="date-picker"></td>
</tr>

<tr>
<td><?= gettext("No Sunday School:") ?></td>
<td><?= gettext("No Sunday School") ?>:</td>
<td><input type="text" name="NoSchool1" value="<?= $dNoSchool1 ?>" maxlength="10" id="NoSchool1" size="11" class="date-picker"></td>
</tr>

<tr>
<td><?= gettext("No Sunday School:") ?></td>
<td><?= gettext("No Sunday School") ?>:</td>
<td><input type="text" name="NoSchool2" value="<?= $dNoSchool2 ?>" maxlength="10" id="NoSchool2" size="11" class="date-picker"></td>
</tr>

<tr>
<td><?= gettext("No Sunday School:") ?></td>
<td><?= gettext("No Sunday School") ?>:</td>
<td><input type="text" name="NoSchool3" value="<?= $dNoSchool3 ?>" maxlength="10" id="NoSchool3" size="11" class="date-picker"></td>
</tr>

<tr>
<td><?= gettext("No Sunday School:") ?></td>
<td><?= gettext("No Sunday School") ?>:</td>
<td><input type="text" name="NoSchool4" value="<?= $dNoSchool4 ?>" maxlength="10" id="NoSchool4" size="11" class="date-picker"></td>
</tr>

<tr>
<td><?= gettext("No Sunday School:") ?></td>
<td><?= gettext("No Sunday School") ?>:</td>
<td><input type="text" name="NoSchool5" value="<?= $dNoSchool5 ?>" maxlength="10" id="NoSchool5" size="11" class="date-picker"></td>
</tr>

<tr>
<td><?= gettext("No Sunday School:") ?></td>
<td><?= gettext("No Sunday School") ?>:</td>
<td><input type="text" name="NoSchool6" value="<?= $dNoSchool6 ?>" maxlength="10" id="NoSchool6" size="11" class="date-picker"></td>
</tr>

<tr>
<td><?= gettext("No Sunday School:") ?></td>
<td><?= gettext("No Sunday School") ?>:</td>
<td><input type="text" name="NoSchool7" value="<?= $dNoSchool7 ?>" maxlength="10" id="NoSchool7" size="11" class="date-picker"></td>
</tr>

<tr>
<td><?= gettext("No Sunday School:") ?></td>
<td><?= gettext("No Sunday School") ?>:</td>
<td><input type="text" name="NoSchool8" value="<?= $dNoSchool8 ?>" maxlength="10" id="NoSchool8" size="11" class="date-picker"></td>
</tr>

<tr>
<td><?= gettext("Extra Students:") ?></td>
<td><?= gettext("Extra Students") ?>:</td>
<td><input type="text" name="ExtraStudents" value="<?= $iExtraStudents ?>" id="ExtraStudents" size="11">&nbsp;</td>
</tr>
<tr>
<td><?= gettext("Extra Teachers:") ?></td>
<td><?= gettext("Extra Teachers") ?>:</td>
<td><input type="text" name="ExtraTeachers" value="<?= $iExtraTeachers ?>" id="ExtraTeachers" size="11">&nbsp;</td>
</tr>
<tr>
Expand Down