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.

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

un-localize the conditional statement #1296

Merged
merged 1 commit into from
Nov 8, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/EventEditor.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@
$iEventID = 0;
$iErrors = 0;

if (!$sAction) { $sAction = gettext('Create Event'); }
if (!$sAction) { $sAction = 'Create Event'; }

//
// process the action inputs
//
if ($sAction==gettext('Create Event') && !empty($tyid)){
if ($sAction=='Create Event' && !empty($tyid)){
//
// user is coming from the event types screen and thus there
// is no existing event in the event_event table
Expand Down Expand Up @@ -233,7 +233,7 @@
$iEventStatus=0;
$iTypeID = $type_id;
}
else if ($sAction = gettext('Edit') && !empty($sOpp))
else if ($sAction = 'Edit' && !empty($sOpp))
{
// Get data for the form as it now exists..
$EventExists = 1;
Expand Down
4 changes: 2 additions & 2 deletions src/ListEvents.php
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@
<td>
<form name="EditEvent" action="EventEditor.php" method="POST">
<input type="hidden" name="EID" value="<?= $aEventID[$row] ?>">
<button type="submit" name="Action" title="<?= gettext('Edit') ?>" value="<?= gettext("Edit") ?>" data-tooltip class="btn btn-default btn-sm">
<button type="submit" name="Action" title="<?= gettext('Edit') ?>" value="Edit" data-tooltip class="btn btn-default btn-sm">
<i class='fa fa-pencil'></i>
</button>
</form>
Expand All @@ -251,7 +251,7 @@
<td>
<form name="DeleteEvent" action="ListEvents.php" method="POST">
<input type="hidden" name="EID" value="<?= $aEventID[$row] ?>">
<button type="submit" name="Action" title="<?=gettext("Delete") ?>" data-tooltip value="<?= gettext("Delete") ?>" class="btn btn-danger btn-sm" onClick="return confirm('Deleting an event will also delete all attendance counts for that event. Are you sure you want to DELETE Event ID: <?= $aEventID[$row] ?>')">
<button type="submit" name="Action" title="<?=gettext("Delete") ?>" data-tooltip value="Delete" class="btn btn-danger btn-sm" onClick="return confirm('Deleting an event will also delete all attendance counts for that event. Are you sure you want to DELETE Event ID: <?= $aEventID[$row] ?>')">
Copy link
Contributor

Choose a reason for hiding this comment

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

This should have get trxt

<i class='fa fa-trash'></i>
</button>
</form>
Expand Down