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

Jump to bottom

Changes occurrences of Cancelled to Canceled #554

Open
wants to merge 4 commits into
base: production
Choose a base branch
from
Open

Changes occurrences of Cancelled to Canceled #554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8eb70f4
Change occurrences of Cancelled to Canceled.
rmarksrandallreilly Aug 20, 2020
195ec02
Correct indention alignment.
rmarksrandallreilly Aug 20, 2020
927fb68
More indention alignments.
rmarksrandallreilly Aug 20, 2020
a68a866
Revert some changes where 'cancelled' is a part of a status name or v…
rmarksrandallreilly Aug 21, 2020
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
4 changes: 2 additions & 2 deletions .docker/data/wordcamp_dev.sql
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions public_html/wp-content/plugins/camptix-invoices/camptix-invoices.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ function register_tix_invoice() {

register_post_status( 'cancelled',
array(
'label' => _x( 'Cancelled', 'post', 'wordcamporg' ),
'label' => _x( 'Canceled', 'post', 'wordcamporg' ),
'public' => true,
'show_in_admin_all_list' => false,
'show_in_admin_status_list' => true,
'label_count' => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'wordcamporg' ),
'label_count' => _n_noop( 'Canceled <span class="count">(%s)</span>', 'Canceled <span class="count">(%s)</span>', 'wordcamporg' ),
)
);
}
Expand Down Expand Up @@ -121,9 +121,9 @@ function ctx_append_post_status_list() {
$cancelled_selected = '';
$status = '';
$refunded = __( 'refunded', 'wordcamporg' );
$cancelled = __( 'cancelled', 'wordcamporg' );
$cancelled = __( 'canceled', 'wordcamporg' );
$refunded_status = _x( 'Refunded', 'post', 'wordcamporg' );
$cancelled_status = _x( 'Cancelled', 'post', 'wordcamporg' );
$cancelled_status = _x( 'Canceled', 'post', 'wordcamporg' );

if ( 'tix_invoice' === $post->post_type ) {

Expand Down Expand Up @@ -166,7 +166,7 @@ function ctx_display_custom_statuses( $states, $post ) {

if ( 'cancelled' !== $arg ) {
if ( 'cancelled' === $post->post_status ) {
return array( _x( 'Cancelled', 'post', 'wordcamporg' ) );
return array( _x( 'Canceled', 'post', 'wordcamporg' ) );
}
}

Expand All @@ -187,7 +187,7 @@ function ctx_append_post_status_bulk_edit() {
<script>
jQuery( document ).ready( function($) {
$( ".inline-edit-status select " ).append("<option value=\"<?php echo esc_attr( __( 'refunded', 'wordcamporg' ) ); ?>\"><?php echo esc_html_x( 'Refunded', 'post', 'wordcamporg' ); ?></option>" );
$( ".inline-edit-status select " ).append("<option value=\"<?php echo esc_attr( __( 'cancelled', 'wordcamporg' ) ); ?>\"><?php echo esc_html_x( 'Cancelled', 'post', 'wordcamporg' ); ?></option>" );
$( ".inline-edit-status select " ).append("<option value=\"<?php echo esc_attr( __( 'cancelled', 'wordcamporg' ) ); ?>\"><?php echo esc_html_x( 'Canceled', 'post', 'wordcamporg' ); ?></option>" );
});
</script>
<?php
Expand Down Expand Up @@ -225,7 +225,7 @@ function ctx_invoice_link( $post ) {
*/
function ctx_register_invoice_metabox( $post ) {

$non_editable_statuses = array( 'publish', 'cancelled', 'refunded' );
$non_editable_statuses = array( 'publish', 'canceled', 'refunded' );
if ( in_array( $post->post_status, $non_editable_statuses, true ) ) {
add_meta_box(
'ctx_invoice_metabox',
Expand Down Expand Up @@ -447,7 +447,7 @@ function ctx_generate_invoice_document( $invoice_id ) {
return;
}

if ( ! in_array( get_post_status( $invoice_id ), array( 'publish', 'cancelled', 'refunded' ), true ) ) {
if ( ! in_array( get_post_status( $invoice_id ), array( 'publish', 'canceled', 'refunded' ), true ) ) {
return;
}

Expand Down
6 changes: 3 additions & 3 deletions public_html/wp-content/plugins/camptix/addons/payment-paypal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ function get_status_from_string( $payment_status ) {
$statuses = array(
'Completed' => CampTix_Plugin::PAYMENT_STATUS_COMPLETED,
'Pending' => CampTix_Plugin::PAYMENT_STATUS_PENDING,
'Cancelled' => CampTix_Plugin::PAYMENT_STATUS_CANCELLED,
'Canceled' => CampTix_Plugin::PAYMENT_STATUS_CANCELLED,
'Failed' => CampTix_Plugin::PAYMENT_STATUS_FAILED,
'Denied' => CampTix_Plugin::PAYMENT_STATUS_FAILED,
'Refunded' => CampTix_Plugin::PAYMENT_STATUS_REFUNDED,
Expand All @@ -410,7 +410,7 @@ function get_status_from_string( $payment_status ) {
* Handle a canceled payment
*
* Runs when the user cancels their payment during checkout at PayPal.
* his will simply tell CampTix to put the created attendee drafts into to Cancelled state.
* his will simply tell CampTix to put the created attendee drafts into to Canceled state.
*
* @return int One of the CampTix_Plugin::PAYMENT_STATUS_{status} constants
*/
Expand Down Expand Up @@ -480,7 +480,7 @@ function payment_cancel() {
}
}

// Set the associated attendees to cancelled.
// Set the associated attendees to canceled.
return $camptix->payment_result( $payment_token, CampTix_Plugin::PAYMENT_STATUS_CANCELLED );
}

Expand Down
18 changes: 9 additions & 9 deletions public_html/wp-content/plugins/camptix/camptix.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,8 +1126,8 @@ function register_post_types() {

function register_post_statuses() {
register_post_status( 'cancel', array(
'label' => _x( 'Cancelled', 'post', 'wordcamporg' ),
'label_count' => _n_noop( 'Cancelled <span class="count">(%s)</span>', 'Cancelled <span class="count">(%s)</span>', 'wordcamporg' ),
'label' => _x( 'Canceled', 'post', 'wordcamporg' ),
'label_count' => _n_noop( 'Canceled <span class="count">(%s)</span>', 'Canceled <span class="count">(%s)</span>', 'wordcamporg' ),
'public' => false,
'protected' => true,
'show_in_admin_all_list' => true,
Expand Down Expand Up @@ -1172,7 +1172,7 @@ function display_post_states( $states, $post ) {
$states['failed'] = __( 'Failed', 'wordcamporg' );

if ( $post->post_status == 'cancel' && get_query_var( 'post_status' ) != 'cancel' )
$states['cancelled'] = __( 'Cancelled', 'wordcamporg' );
$states['cancelled'] = __( 'Canceled', 'wordcamporg' );

if ( $post->post_status == 'refund' && get_query_var( 'post_status' ) != 'refund' )
$states['cancelled'] = __( 'Refunded', 'wordcamporg' );
Expand Down Expand Up @@ -3943,7 +3943,7 @@ function metabox_attendee_submitdiv() {
<?php endif; ?>
<option <?php selected( $post->post_status, 'publish' ); ?> value="publish"><?php _e( 'Published', 'wordcamporg' ); ?></option>
<option <?php selected( $post->post_status, 'refund' ); ?> value="refund"><?php _e( 'Refunded', 'wordcamporg' ); ?></option>
<option <?php selected( $post->post_status, 'cancel' ); ?> value="cancel"><?php _e( 'Cancelled', 'wordcamporg' ); ?></option>
<option <?php selected( $post->post_status, 'cancel' ); ?> value="cancel"><?php _e( 'Canceled', 'wordcamporg' ); ?></option>
</select>
<a href="#post_status" class="save-post-status hide-if-no-js button"><?php esc_html_e( 'OK', 'wordcamporg' ); ?></a>
<a href="#post_status" class="cancel-post-status hide-if-no-js button-cancel"><?php esc_html_e( 'Cancel', 'wordcamporg' ); ?></a>
Expand Down Expand Up @@ -4022,7 +4022,7 @@ function append_post_status_bulk_edit() {
$statuses = array(
'publish' => _x( 'Published', 'post', 'wordcamporg' ),
'refund' => _x( 'Refunded', 'post', 'wordcamporg' ),
'cancel' => _x( 'Cancelled', 'post', 'wordcamporg' ),
'cancel' => _x( 'Canceled', 'post', 'wordcamporg' ),
);

?>
Expand Down Expand Up @@ -4893,7 +4893,7 @@ function save_ticket_post( $post_id ) {
update_post_meta( $post_id, 'tix_quantity', $ticket_quantity );

delete_post_meta( $post_id, 'tix_reservation', $reservations[$cancel_token] );
$this->log( 'Cancelled a reservation.', $post_id, $reservations[$cancel_token] );
$this->log( 'Canceled a reservation.', $post_id, $reservations[$cancel_token] );
}
}
}
Expand Down Expand Up @@ -5388,7 +5388,7 @@ function form_start() {
}

if ( isset( $redirected_error_flags['payment_cancelled'] ) ) {
$this->error( __( 'Your payment has been cancelled. Feel free to try again!', 'wordcamporg' ) );
$this->error( __( 'Your payment has been canceled. Feel free to try again!', 'wordcamporg' ) );
}

if ( isset( $redirected_error_flags['invalid_edit_token'] ) ) {
Expand All @@ -5400,7 +5400,7 @@ function form_start() {
}

if ( isset( $redirected_error_flags['invalid_reservation'] ) ) {
$this->error( __( 'Sorry, but the reservation you are trying to use has been cancelled or has expired.', 'wordcamporg' ) );
$this->error( __( 'Sorry, but the reservation you are trying to use has been canceled or has expired.', 'wordcamporg' ) );
}

do_action( 'camptix_form_start_errors', $redirected_error_flags );
Expand Down Expand Up @@ -6418,7 +6418,7 @@ function form_refund_request() {

</tbody>
</table>
<p class="tix-description"><?php _e( 'Refunds can take up to several days to process. All of the tickets you purchased in the original transaction will be cancelled. We are not able to provide partial refunds and/or refunds to a different account than the original purchaser. You must agree to these terms before requesting a refund.', 'wordcamporg' ); ?></p>
<p class="tix-description"><?php _e( 'Refunds can take up to several days to process. All of the tickets you purchased in the original transaction will be canceled. We are not able to provide partial refunds and/or refunds to a different account than the original purchaser. You must agree to these terms before requesting a refund.', 'wordcamporg' ); ?></p>
<p class="tix-submit">
<label><input type="checkbox" name="tix_refund_request_confirmed" value="1"> <?php _e( 'I agree to the above terms', 'wordcamporg' ); ?></label>
<input type="submit" value="<?php esc_attr_e( 'Send Request', 'wordcamporg' ); ?>" />
Expand Down
14 changes: 7 additions & 7 deletions public_html/wp-content/plugins/camptix/languages/camptix-da_DK.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,13 +406,13 @@ msgstr ""

#: camptix.php:1010
msgctxt "post"
msgid "Cancelled"
msgid "Canceled"
msgstr ""

#: camptix.php:1011
msgctxt "camptix"
msgid "Cancelled <span class=\"count\">(%s)</span>"
msgid_plural "Cancelled <span class=\"count\">(%s)</span>"
msgid "Canceled <span class=\"count\">(%s)</span>"
msgid_plural "Canceled <span class=\"count\">(%s)</span>"
msgstr[0] ""
msgstr[1] ""

Expand Down Expand Up @@ -461,7 +461,7 @@ msgid "Failed"
msgstr "Fejl"

#: camptix.php:1058
msgid "Cancelled"
msgid "Canceled"
msgstr "Annuller"

#: camptix.php:1061
Expand Down Expand Up @@ -1478,7 +1478,7 @@ msgid "Your access token does not seem to be valid."
msgstr "Din access token er ikke gyldig."

#: camptix.php:4469
msgid "Your payment has been cancelled. Feel free to try again!"
msgid "Your payment has been canceled. Feel free to try again!"
msgstr ""
"Din betaling er blevet annulleret, du er velkommen til at komme tilbage og "
"prøve igen senere!"
Expand All @@ -1498,7 +1498,7 @@ msgstr ""

#: camptix.php:4478
msgid ""
"Sorry, but the reservation you are trying to use has been cancelled or has "
"Sorry, but the reservation you are trying to use has been canceled or has "
"expired."
msgstr ""
"Beklager, den reservation du prøver at bruge er blevet annulleret eller er "
Expand Down Expand Up @@ -1704,7 +1704,7 @@ msgstr "Begrundelse for rufundering"
#: camptix.php:5298
msgid ""
"Refunds can take up to several days to process. All of the tickets you "
"purchased in the original transaction will be cancelled. We are not able to "
"purchased in the original transaction will be canceled. We are not able to "
"provide partial refunds and/or refunds to a different account than the "
"original purchaser. You must agree to these terms before requesting a refund."
msgstr ""
Expand Down
12 changes: 6 additions & 6 deletions public_html/wp-content/plugins/camptix/languages/camptix-de_DE.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,12 +408,12 @@ msgid "E-mails (debug)"
msgstr "E-Mails (debug)"

#: ../camptix.php:1010 ../camptix.php:1058
msgid "Cancelled"
msgid "Canceled"
msgstr "Abgebrochen"

#: ../camptix.php:1011
#, php-format
msgid "Cancelled <span class=\"count\">(%s)</span>"
msgid "Canceled <span class=\"count\">(%s)</span>"
msgstr "Abgebrochen <span class=\"count\">(%s)</span>"

#: ../camptix.php:1019 ../camptix.php:1055
Expand Down Expand Up @@ -1471,7 +1471,7 @@ msgid "Your access token does not seem to be valid."
msgstr "Dein Zugangstoken ist ungültig."

#: ../camptix.php:4458
msgid "Your payment has been cancelled. Feel free to try again!"
msgid "Your payment has been canceled. Feel free to try again!"
msgstr "Deine Zahlung wurde abgebrochen. Du darfst es gerne erneut versuchen!"

#: ../camptix.php:4461
Expand All @@ -1487,7 +1487,7 @@ msgstr ""

#: ../camptix.php:4467
msgid ""
"Sorry, but the reservation you are trying to use has been cancelled or has expired."
"Sorry, but the reservation you are trying to use has been canceled or has expired."
msgstr "Die gewählte Reservierung wurde zurückgenommen oder ist abgelaufen."

#: ../camptix.php:4484 ../camptix.php:4663
Expand Down Expand Up @@ -1689,7 +1689,7 @@ msgstr "Erstattungsgrund"
#: ../camptix.php:5287
msgid ""
"Refunds can take up to several days to process. All of the tickets you purchased in "
"the original transaction will be cancelled. We are not able to provide partial refunds "
"the original transaction will be canceled. We are not able to provide partial refunds "
"and/or refunds to a different account than the original purchaser. You must agree to "
"these terms before requesting a refund."
msgstr ""
Expand Down Expand Up @@ -1789,7 +1789,7 @@ msgstr "%s wird von dieser Zahlungsmethode nicht unterstützt."
#~ "Zahlung zugeordnet werden."

#~ msgctxt "post"
#~ msgid "Cancelled"
#~ msgid "Canceled"
#~ msgstr "Abgebrochen"

#~ msgctxt "post"
Expand Down
14 changes: 7 additions & 7 deletions public_html/wp-content/plugins/camptix/languages/camptix-he_IL.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -495,14 +495,14 @@ msgstr ""
# @ camptix
#: camptix.php:1009
msgctxt "post"
msgid "Cancelled"
msgid "Canceled"
msgstr ""

# @ camptix
#: camptix.php:1010
msgctxt "camptix"
msgid "Cancelled <span class=\"count\">(%s)</span>"
msgid_plural "Cancelled <span class=\"count\">(%s)</span>"
msgid "Canceled <span class=\"count\">(%s)</span>"
msgid_plural "Canceled <span class=\"count\">(%s)</span>"
msgstr[0] ""
msgstr[1] ""

Expand Down Expand Up @@ -560,7 +560,7 @@ msgstr ""

# @ camptix
#: camptix.php:1057
msgid "Cancelled"
msgid "Canceled"
msgstr ""

# @ camptix
Expand Down Expand Up @@ -1636,7 +1636,7 @@ msgstr "מחרוזת הגישה לא תקינה."

# @ camptix
#: camptix.php:4316
msgid "Your payment has been cancelled. Feel free to try again!"
msgid "Your payment has been canceled. Feel free to try again!"
msgstr ""

# @ camptix
Expand All @@ -1654,7 +1654,7 @@ msgstr ""
# @ camptix
#: camptix.php:4325
msgid ""
"Sorry, but the reservation you are trying to use has been cancelled or has "
"Sorry, but the reservation you are trying to use has been canceled or has "
"expired."
msgstr ""

Expand Down Expand Up @@ -1890,7 +1890,7 @@ msgstr ""
#: camptix.php:5140
msgid ""
"Refunds can take up to several days to process. All purchased tickets will "
"be cancelled. Partial refunds and refunds to a different account than the "
"be canceled. Partial refunds and refunds to a different account than the "
"original purchaser, are unavailable. You have to agree to these terms before "
"requesting a refund."
msgstr ""
Expand Down
Loading