<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[4967] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments: WordCamp Payments: Internationalize strings</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/4967">4967</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/4967","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-02-21 00:03:58 +0000 (Tue, 21 Feb 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>WordCamp Payments: Internationalize strings
I also converted uses of non-escapted i18n functions -- e.g., `__()` -- to their escaped counterparts -- e.g., `esc_html__()`.
Fixes 2229
Props thomas-vitale</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludesbudgettoolphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/budget-tool.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludesreimbursementrequestphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludessponsorinvoicephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/sponsor-invoice.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludeswordcampbudgetsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewsbudgettoolmainphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/budget-tool/main.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestinputcountryphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-country.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestinputselectphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-select.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxgeneralphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-general.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxpaymentphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-payment.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxstatusphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-status.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxvendorphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-vendor.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewsreimbursementrequestmetaboxexpensesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-expenses.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewsreimbursementrequestmetaboxnotesphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-notes.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewsreimbursementrequestmetaboxstatusphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-status.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewssponsorinvoicemetaboxstatusphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/sponsor-invoice/metabox-status.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewssponsorpaymentmainphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/sponsor-payment/main.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludesbudgettoolphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/budget-tool.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/budget-tool.php 2017-02-21 00:03:53 UTC (rev 4966)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/budget-tool.php 2017-02-21 00:03:58 UTC (rev 4967)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,7 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function admin_menu() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_submenu_page( 'wordcamp-budget', __( 'WordCamp Budget', 'wordcamporg' ), __( 'Budget', 'wordcamporg' ), 'manage_options', 'wordcamp-budget' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_submenu_page( 'wordcamp-budget', esc_html__( 'WordCamp Budget', 'wordcamporg' ), esc_html__( 'Budget', 'wordcamporg' ), 'manage_options', 'wordcamp-budget' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wcb_render_budget_page', array( __CLASS__, 'render' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> register_setting( 'wcb_budget_noop', 'wcb_budget_noop', array( __CLASS__, 'validate' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php 2017-02-21 00:03:53 UTC (rev 4966)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php 2017-02-21 00:03:58 UTC (rev 4967)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,21 +41,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function register_post_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> $labels = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => _x( 'Vendor Payments', 'post type general name', 'wordcamporg' ),
- 'singular_name' => _x( 'Vendor Payment', 'post type singular name', 'wordcamporg' ),
- 'menu_name' => _x( 'Vendor Payments', 'admin menu', 'wordcamporg' ),
- 'name_admin_bar' => _x( 'Vendor Payment', 'add new on admin bar', 'wordcamporg' ),
- 'add_new' => _x( 'Add New', 'payment', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => esc_html_x( 'Vendor Payments', 'post type general name', 'wordcamporg' ),
+ 'singular_name' => esc_html_x( 'Vendor Payment', 'post type singular name', 'wordcamporg' ),
+ 'menu_name' => esc_html_x( 'Vendor Payments', 'admin menu', 'wordcamporg' ),
+ 'name_admin_bar' => esc_html_x( 'Vendor Payment', 'add new on admin bar', 'wordcamporg' ),
+ 'add_new' => esc_html_x( 'Add New', 'payment', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'add_new_item' => __( 'Add New Vendor Payment', 'wordcamporg' ),
- 'new_item' => __( 'New Vendor Payment', 'wordcamporg' ),
- 'edit_item' => __( 'Edit Vendor Payment', 'wordcamporg' ),
- 'view_item' => __( 'View Vendor Payment', 'wordcamporg' ),
- 'all_items' => __( 'Vendor Payments', 'wordcamporg' ),
- 'search_items' => __( 'Search Vendor Payments', 'wordcamporg' ),
- 'parent_item_colon' => __( 'Parent Vendor Payments:', 'wordcamporg' ),
- 'not_found' => __( 'No Vendor Payments found.', 'wordcamporg' ),
- 'not_found_in_trash' => __( 'No Vendor Payments found in Trash.', 'wordcamporg' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'add_new_item' => esc_html__( 'Add New Vendor Payment', 'wordcamporg' ),
+ 'new_item' => esc_html__( 'New Vendor Payment', 'wordcamporg' ),
+ 'edit_item' => esc_html__( 'Edit Vendor Payment', 'wordcamporg' ),
+ 'view_item' => esc_html__( 'View Vendor Payment', 'wordcamporg' ),
+ 'all_items' => esc_html__( 'Vendor Payments', 'wordcamporg' ),
+ 'search_items' => esc_html__( 'Search Vendor Payments', 'wordcamporg' ),
+ 'parent_item_colon' => esc_html__( 'Parent Vendor Payments:', 'wordcamporg' ),
+ 'not_found' => esc_html__( 'No Vendor Payments found.', 'wordcamporg' ),
+ 'not_found_in_trash' => esc_html__( 'No Vendor Payments found in Trash.', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status(
</span><span class="cx" style="display: block; padding: 0 10px"> 'paid',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Paid', 'post', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Paid', 'post', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop( 'Paid <span class="count">(%s)</span>', 'Paid <span class="count">(%s)</span>', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status(
</span><span class="cx" style="display: block; padding: 0 10px"> 'unpaid',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Unpaid', 'post', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Unpaid', 'post', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop( 'Unpaid <span class="count">(%s)</span>', 'Unpaid <span class="count">(%s)</span>', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -100,7 +100,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status(
</span><span class="cx" style="display: block; padding: 0 10px"> 'incomplete',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Incomplete', 'post', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Incomplete', 'post', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop( 'Incomplete <span class="count">(%s)</span>', 'Incomplete <span class="count">(%s)</span>', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box(
</span><span class="cx" style="display: block; padding: 0 10px"> 'submitdiv',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Status', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'Status', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array( $this, 'render_status_metabox' ),
</span><span class="cx" style="display: block; padding: 0 10px"> self::POST_TYPE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'side',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +129,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcp_general_info',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'General Information', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'General Information', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array( $this, 'render_general_metabox' ),
</span><span class="cx" style="display: block; padding: 0 10px"> self::POST_TYPE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'normal',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,13 +138,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $introduction_message = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>%s</p> <p>%s</p>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Direct Deposit or Wire is the fastest way to pay a vendor. Checks and credit card payments can take 3-5 days for us and/or the bank to process.', 'wordcamporg' ),
- __( 'Each wire transfer costs us processing fees, so please try to avoid multiple wire requests for one vendor.', 'wordcamporg' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'Direct Deposit or Wire is the fastest way to pay a vendor. Checks and credit card payments can take 3-5 days for us and/or the bank to process.', 'wordcamporg' ),
+ esc_html__( 'Each wire transfer costs us processing fees, so please try to avoid multiple wire requests for one vendor.', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcp_payment_details',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Payment Details', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'Payment Details', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array( $this, 'render_payment_metabox' ),
</span><span class="cx" style="display: block; padding: 0 10px"> self::POST_TYPE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'normal',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,14 +157,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcp_vendor_details',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Vendor Details', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'Vendor Details', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array( $this, 'render_vendor_metabox' ),
</span><span class="cx" style="display: block; padding: 0 10px"> self::POST_TYPE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'normal',
</span><span class="cx" style="display: block; padding: 0 10px"> 'high'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_meta_box( 'wcp_log', __( 'Log', 'wordcamporg' ), array( $this, 'render_log_metabox' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_meta_box( 'wcp_log', esc_html__( 'Log', 'wordcamporg' ), array( $this, 'render_log_metabox' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> self::POST_TYPE, 'normal', 'high' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,14 +219,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editable_statuses = array( 'auto-draft', 'draft', 'wcb-incomplete' );
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user_can_edit_request = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $submit_text = _x( 'Update', 'payment request', 'wordcamporg' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $submit_text = esc_html_x( 'Update', 'payment request', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $submit_note = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'manage_network' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user_can_edit_request = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( in_array( $post->post_status, $editable_statuses ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $submit_text = __( 'Submit for Review', 'wordcamporg' );
- $submit_note = __( 'Once submitted for review, this request can not be edited.', 'wordcamporg' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $submit_text = esc_html__( 'Submit for Review', 'wordcamporg' );
+ $submit_note = esc_html__( 'Once submitted for review, this request can not be edited.', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $current_user_can_edit_request = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -831,12 +831,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_columns( $_columns ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $columns = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cb' => $_columns['cb'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'author' => __( 'Author' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'author' => esc_html__( 'Author' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => $_columns['title'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'date' => $_columns['date'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'due_by' => __( 'Due by', 'wordcamporg' ),
- 'vendor_name' => __( 'Vendor', 'wordcamporg' ),
- 'payment_amount' => __( 'Amount', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'due_by' => esc_html__( 'Due by', 'wordcamporg' ),
+ 'vendor_name' => esc_html__( 'Vendor', 'wordcamporg' ),
+ 'payment_amount' => esc_html__( 'Amount', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $columns;
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludesreimbursementrequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php 2017-02-21 00:03:53 UTC (rev 4966)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/reimbursement-request.php 2017-02-21 00:03:58 UTC (rev 4967)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,20 +33,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function register_post_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> $labels = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => _x( 'Reimbursement Requests', 'general reimbursement requests', 'wordcamporg' ),
- 'singular_name' => _x( 'Reimbursement Request', 'post type singular name', 'wordcamporg' ),
- 'menu_name' => _x( 'Reimbursement Requests', 'admin menu', 'wordcamporg' ),
- 'name_admin_bar' => _x( 'Reimbursement Requests', 'add new on admin bar', 'wordcamporg' ),
- 'add_new' => _x( 'Add New', 'reimbursement request', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => esc_html_x( 'Reimbursement Requests', 'general reimbursement requests', 'wordcamporg' ),
+ 'singular_name' => esc_html_x( 'Reimbursement Request', 'post type singular name', 'wordcamporg' ),
+ 'menu_name' => esc_html_x( 'Reimbursement Requests', 'admin menu', 'wordcamporg' ),
+ 'name_admin_bar' => esc_html_x( 'Reimbursement Requests', 'add new on admin bar', 'wordcamporg' ),
+ 'add_new' => esc_html_x( 'Add New', 'reimbursement request', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'add_new_item' => __( 'Add New Reimbursement Request', 'wordcamporg' ),
- 'new_item' => __( 'New Reimbursement Request', 'wordcamporg' ),
- 'edit_item' => __( 'Edit Reimbursement Request', 'wordcamporg' ),
- 'view_item' => __( 'View Reimbursement Request', 'wordcamporg' ),
- 'all_items' => __( 'Reimbursements', 'wordcamporg' ),
- 'search_items' => __( 'Search Reimbursement Requests', 'wordcamporg' ),
- 'not_found' => __( 'No Reimbursement Requests found.', 'wordcamporg' ),
- 'not_found_in_trash' => __( 'No Reimbursement Requests found in Trash.', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'add_new_item' => esc_html__( 'Add New Reimbursement Request', 'wordcamporg' ),
+ 'new_item' => esc_html__( 'New Reimbursement Request', 'wordcamporg' ),
+ 'edit_item' => esc_html__( 'Edit Reimbursement Request', 'wordcamporg' ),
+ 'view_item' => esc_html__( 'View Reimbursement Request', 'wordcamporg' ),
+ 'all_items' => esc_html__( 'Reimbursements', 'wordcamporg' ),
+ 'search_items' => esc_html__( 'Search Reimbursement Requests', 'wordcamporg' ),
+ 'not_found' => esc_html__( 'No Reimbursement Requests found.', 'wordcamporg' ),
+ 'not_found_in_trash' => esc_html__( 'No Reimbursement Requests found in Trash.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcbrr_submitted',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Submitted', 'post', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Submitted', 'post', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop( 'Submitted <span class="count">(%s)</span>', 'Submitted <span class="count">(%s)</span>', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcbrr_info_requested',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Information Requested', 'post', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Information Requested', 'post', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop( 'Information Requested <span class="count">(%s)</span>', 'Information Requested <span class="count">(%s)</span>', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcbrr_rejected',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Rejected', 'post', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Rejected', 'post', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop( 'Rejected <span class="count">(%s)</span>', 'Rejected <span class="count">(%s)</span>', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcbrr_in_process',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Payment in Process', 'post', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Payment in Process', 'post', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop( 'Payment in Process <span class="count">(%s)</span>', 'Payment in Process <span class="count">(%s)</span>', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcbrr_paid',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Paid', 'post', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Paid', 'post', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop( 'Paid <span class="count">(%s)</span>', 'Paid <span class="count">(%s)</span>', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +147,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box(
</span><span class="cx" style="display: block; padding: 0 10px"> 'submitdiv',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Status', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'Status', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __NAMESPACE__ . '\render_status_metabox',
</span><span class="cx" style="display: block; padding: 0 10px"> POST_TYPE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'side',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcbrr_notes',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Notes', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'Notes', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __NAMESPACE__ . '\render_notes_metabox',
</span><span class="cx" style="display: block; padding: 0 10px"> POST_TYPE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'side',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +165,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcbrr_general_information',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'General Information', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'General Information', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __NAMESPACE__ . '\render_general_information_metabox',
</span><span class="cx" style="display: block; padding: 0 10px"> POST_TYPE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'normal',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,13 +174,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $introduction_message = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>%s</p> <p>%s</p>',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'This is where you can give us information on how we can reimburse you for approved expenses that you paid out-of-pocket.', 'wordcamporg' ),
- __( 'Each wire transfer and check costs us processing fees, so if you have multiple out-of-pocket expenses, please try to group them into one reimbursement request.', 'wordcamporg' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'This is where you can give us information on how we can reimburse you for approved expenses that you paid out-of-pocket.', 'wordcamporg' ),
+ esc_html__( 'Each wire transfer and check costs us processing fees, so if you have multiple out-of-pocket expenses, please try to group them into one reimbursement request.', 'wordcamporg' )
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcbrr_payment_information',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Payment Information', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'Payment Information', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array( $wcp_payment_request, 'render_payment_metabox' ), // todo centralize this instead of using directly from another module
</span><span class="cx" style="display: block; padding: 0 10px"> POST_TYPE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'normal',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,7 +195,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcbrr_expenses',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Expenses', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'Expenses', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __NAMESPACE__ . '\render_expenses_metabox',
</span><span class="cx" style="display: block; padding: 0 10px"> POST_TYPE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'normal',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +204,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcp_log',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Log', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'Log', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __NAMESPACE__ . '\render_log_metabox',
</span><span class="cx" style="display: block; padding: 0 10px"> POST_TYPE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'normal',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,14 +280,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editable_statuses = array( 'auto-draft', 'draft', 'wcb-incomplete' );
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user_can_edit_request = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $submit_text = _x( 'Update', 'payment request', 'wordcamporg' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $submit_text = esc_html_x( 'Update', 'payment request', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $submit_note = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'manage_network' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $current_user_can_edit_request = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( in_array( $post->post_status, $editable_statuses ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $submit_text = __( 'Submit for Review', 'wordcamporg' );
- $submit_note = __( 'Once submitted for review, this request can not be edited.', 'wordcamporg' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $submit_text = esc_html__( 'Submit for Review', 'wordcamporg' );
+ $submit_note = esc_html__( 'Once submitted for review, this request can not be edited.', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $current_user_can_edit_request = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $request_id = get_current_blog_id() . '-' . $post->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> $requested_by = \WordCamp_Budgets::get_requester_name( $post->post_author );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $update_text = current_user_can( 'manage_network' ) ? __( 'Update Request', 'wordcamporg' ) : __( 'Send Request', 'wordcamporg' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $update_text = current_user_can( 'manage_network' ) ? esc_html__( 'Update Request', 'wordcamporg' ) : esc_html__( 'Send Request', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( __DIR__ ) . '/views/reimbursement-request/metabox-status.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,12 +349,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_reimbursement_reasons() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'last-minute-purchase' => __( 'Last-minute purchase', 'wordcamporg' ),
- 'vendor-required-cash' => __( 'Vendor required cash payment', 'wordcamporg' ),
- 'payment-on-delivery' => __( 'Vendor required payment at delivery', 'wordcamporg' ),
- 'convenience' => __( 'Organizer convenience', 'wordcamporg' ),
- 'central-missed-payment' => __( "Payment by Central didn't come through", 'wordcamporg' ),
- 'other' => __( 'Other (describe in next field)', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'last-minute-purchase' => esc_html__( 'Last-minute purchase', 'wordcamporg' ),
+ 'vendor-required-cash' => esc_html__( 'Vendor required cash payment', 'wordcamporg' ),
+ 'payment-on-delivery' => esc_html__( 'Vendor required payment at delivery', 'wordcamporg' ),
+ 'convenience' => esc_html__( 'Organizer convenience', 'wordcamporg' ),
+ 'central-missed-payment' => esc_html__( "Payment by Central didn't come through", 'wordcamporg' ),
+ 'other' => esc_html__( 'Other (describe in next field)', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludessponsorinvoicephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/sponsor-invoice.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/sponsor-invoice.php 2017-02-21 00:03:53 UTC (rev 4966)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/sponsor-invoice.php 2017-02-21 00:03:58 UTC (rev 4967)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,20 +34,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function register_post_type() {
</span><span class="cx" style="display: block; padding: 0 10px"> $labels = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => _x( 'Sponsor Invoices', 'general sponsor invoices', 'wordcamporg' ),
- 'singular_name' => _x( 'Sponsor Invoice', 'post type singular name', 'wordcamporg' ),
- 'menu_name' => _x( 'Sponsor Invoices', 'admin menu', 'wordcamporg' ),
- 'name_admin_bar' => _x( 'Sponsor Invoices', 'add new on admin bar', 'wordcamporg' ),
- 'add_new' => _x( 'Add New', 'invoice', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => esc_html_x( 'Sponsor Invoices', 'general sponsor invoices', 'wordcamporg' ),
+ 'singular_name' => esc_html_x( 'Sponsor Invoice', 'post type singular name', 'wordcamporg' ),
+ 'menu_name' => esc_html_x( 'Sponsor Invoices', 'admin menu', 'wordcamporg' ),
+ 'name_admin_bar' => esc_html_x( 'Sponsor Invoices', 'add new on admin bar', 'wordcamporg' ),
+ 'add_new' => esc_html_x( 'Add New', 'invoice', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'add_new_item' => __( 'Add New Sponsor Invoice', 'wordcamporg' ),
- 'new_item' => __( 'New Invoice', 'wordcamporg' ),
- 'edit_item' => __( 'Edit Invoice', 'wordcamporg' ),
- 'view_item' => __( 'View Invoice', 'wordcamporg' ),
- 'all_items' => __( 'Sponsor Invoices', 'wordcamporg' ),
- 'search_items' => __( 'Search Invoices', 'wordcamporg' ),
- 'not_found' => __( 'No invoice found.', 'wordcamporg' ),
- 'not_found_in_trash' => __( 'No invoice found in Trash.', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'add_new_item' => esc_html__( 'Add New Sponsor Invoice', 'wordcamporg' ),
+ 'new_item' => esc_html__( 'New Invoice', 'wordcamporg' ),
+ 'edit_item' => esc_html__( 'Edit Invoice', 'wordcamporg' ),
+ 'view_item' => esc_html__( 'View Invoice', 'wordcamporg' ),
+ 'all_items' => esc_html__( 'Sponsor Invoices', 'wordcamporg' ),
+ 'search_items' => esc_html__( 'Search Invoices', 'wordcamporg' ),
+ 'not_found' => esc_html__( 'No invoice found.', 'wordcamporg' ),
+ 'not_found_in_trash' => esc_html__( 'No invoice found in Trash.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,9 +71,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_custom_statuses() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'wcbsi_submitted' => __( 'Submitted', 'wordcamporg' ),
- 'wcbsi_approved' => __( 'Sent', 'wordcamporg' ),
- 'wcbsi_paid' => __( 'Paid', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'wcbsi_submitted' => esc_html__( 'Submitted', 'wordcamporg' ),
+ 'wcbsi_approved' => esc_html__( 'Sent', 'wordcamporg' ),
+ 'wcbsi_paid' => esc_html__( 'Paid', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,7 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcbsi_submitted',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Submitted', 'post', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Submitted', 'post', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop( 'Submitted <span class="count">(%s)</span>', 'Submitted <span class="count">(%s)</span>', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcbsi_approved',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Sent', 'post', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Sent', 'post', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop( 'Sent <span class="count">(%s)</span>', 'Sent <span class="count">(%s)</span>', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcbsi_paid',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Paid', 'post', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Paid', 'post', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop( 'Paid <span class="count">(%s)</span>', 'Paid <span class="count">(%s)</span>', 'wordcamporg' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'publicly_queryable' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -123,7 +123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box(
</span><span class="cx" style="display: block; padding: 0 10px"> 'submitdiv',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Status', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'Status', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __NAMESPACE__ . '\render_status_metabox',
</span><span class="cx" style="display: block; padding: 0 10px"> POST_TYPE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'side',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcbsi_sponsor_invoice',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Sponsor Invoice', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'Sponsor Invoice', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> __NAMESPACE__ . '\render_sponsor_invoice_metabox',
</span><span class="cx" style="display: block; padding: 0 10px"> POST_TYPE,
</span><span class="cx" style="display: block; padding: 0 10px"> 'normal',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,7 +248,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function render_status_metabox( $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_field( 'status', 'status_nonce' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $delete_text = EMPTY_TRASH_DAYS ? __( 'Move to Trash' ) : __( 'Delete Permanently' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $delete_text = EMPTY_TRASH_DAYS ? esc_html__( 'Move to Trash' ) : esc_html__( 'Delete Permanently' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * We can't use current_user_can( 'edit_post', N ) in this case, because the restriction only applies when
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,11 +430,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_columns( $_columns ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $columns = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cb' => $_columns['cb'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'author' => __( 'Author' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'author' => esc_html__( 'Author' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'title' => $_columns['title'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'date' => $_columns['date'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sponsor_name' => __( 'Sponsor', 'wordcamporg' ),
- 'payment_amount' => __( 'Amount', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sponsor_name' => esc_html__( 'Sponsor', 'wordcamporg' ),
+ 'payment_amount' => esc_html__( 'Amount', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $columns;
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludeswordcampbudgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php 2017-02-21 00:03:53 UTC (rev 4966)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/wordcamp-budgets.php 2017-02-21 00:03:58 UTC (rev 4967)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Uses core's draft status too.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'wcb-incomplete', array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Incomplete', 'payment request', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Incomplete', 'payment request', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'protected' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'wcb-pending-approval', array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Pending Approval', 'payment request', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Pending Approval', 'payment request', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'protected' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'wcb-approved', array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Approved', 'payment request', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Approved', 'payment request', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'protected' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'wcb-pending-payment', array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Payment Sent', 'payment request', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Payment Sent', 'payment request', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'protected' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'wcb-paid', array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Paid', 'payment request', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Paid', 'payment request', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'protected' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'wcb-failed', array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Failed', 'payment request', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Failed', 'payment request', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'protected' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -88,7 +88,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'wcb-cancelled', array (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'label' => _x( 'Cancelled', 'payment request', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => esc_html_x( 'Cancelled', 'payment request', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'protected' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'label_count' => _nx_noop(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,8 +108,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function register_budgets_menu() {
</span><span class="cx" style="display: block; padding: 0 10px"> add_menu_page(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'WordCamp Budget', 'wordcamporg' ),
- __( 'Budget', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'WordCamp Budget', 'wordcamporg' ),
+ esc_html__( 'Budget', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'manage_options',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamp-budget',
</span><span class="cx" style="display: block; padding: 0 10px"> function() { do_action( 'wcb_render_budget_page' ); },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,8 +144,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wordcamp-budgets',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcbLocalizedStrings', // todo merge into WordCampBudgets var
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'uploadModalTitle' => __( 'Attach Supporting Documentation', 'wordcamporg' ),
- 'uploadModalButton' => __( 'Attach Files', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'uploadModalTitle' => esc_html__( 'Attach Supporting Documentation', 'wordcamporg' ),
+ 'uploadModalButton' => esc_html__( 'Attach Files', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -745,16 +745,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_payment_categories() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'after-party' => __( 'After Party', 'wordcamporg' ),
- 'audio-visual' => __( 'Audio Visual', 'wordcamporg' ),
- 'camera-shipping' => __( 'Camera Shipping', 'wordcamporg' ),
- 'food-beverages' => __( 'Food & Beverage', 'wordcamporg' ),
- 'office-supplies' => __( 'Office Supplies', 'wordcamporg' ),
- 'signage-badges' => __( 'Signage & Badges', 'wordcamporg' ),
- 'speaker-event' => __( 'Speaker Event', 'wordcamporg' ),
- 'swag' => __( 'Swag (t-shirts, stickers, etc)', 'wordcamporg' ),
- 'venue' => __( 'Venue', 'wordcamporg' ),
- 'other' => __( 'Other', 'wordcamporg' ), // This one is intentionally last, regardless of alphabetical order
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'after-party' => esc_html__( 'After Party', 'wordcamporg' ),
+ 'audio-visual' => esc_html__( 'Audio Visual', 'wordcamporg' ),
+ 'camera-shipping' => esc_html__( 'Camera Shipping', 'wordcamporg' ),
+ 'food-beverages' => esc_html__( 'Food & Beverage', 'wordcamporg' ),
+ 'office-supplies' => esc_html__( 'Office Supplies', 'wordcamporg' ),
+ 'signage-badges' => esc_html__( 'Signage & Badges', 'wordcamporg' ),
+ 'speaker-event' => esc_html__( 'Speaker Event', 'wordcamporg' ),
+ 'swag' => esc_html__( 'Swag (t-shirts, stickers, etc)', 'wordcamporg' ),
+ 'venue' => esc_html__( 'Venue', 'wordcamporg' ),
+ 'other' => esc_html__( 'Other', 'wordcamporg' ), // This one is intentionally last, regardless of alphabetical order
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewsbudgettoolmainphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/budget-tool/main.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/budget-tool/main.php 2017-02-21 00:03:53 UTC (rev 4966)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/budget-tool/main.php 2017-02-21 00:03:58 UTC (rev 4967)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,40 +19,40 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <svg width="20" height="20" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M640 768h512v-192q0-106-75-181t-181-75-181 75-75 181v192zm832 96v576q0 40-28 68t-68 28h-960q-40 0-68-28t-28-68v-576q0-40 28-68t68-28h32v-192q0-184 132-316t316-132 316 132 132 316v192h32q40 0 68 28t28 68z"/></svg>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span>Preliminary Budget</span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span><?php esc_html_e( 'Preliminary Budget', 'wordcamporg' ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( $budget['status'] == 'approved' ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( add_query_arg( 'wcb-view', 'approved' ) ); ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> class="nav-tab <?php if ( $view == 'approved' ) { ?>nav-tab-active<?php } ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <svg width="20" height="20" viewBox="0 0 1792 1792" xmlns="http://www.w3.org/2000/svg"><path d="M640 768h512v-192q0-106-75-181t-181-75-181 75-75 181v192zm832 96v576q0 40-28 68t-68 28h-960q-40 0-68-28t-28-68v-576q0-40 28-68t68-28h32v-192q0-184 132-316t316-132 316 132 132 316v192h32q40 0 68 28t28 68z"/></svg>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span>Approved Budget</span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span><?php esc_html_e( 'Approved Budget', 'wordcamporg' ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( add_query_arg( 'wcb-view', 'working' ) ); ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> class="nav-tab <?php if ( $view == 'working' ) { ?>nav-tab-active<?php } ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <span>Working Budget</span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <span><?php esc_html_e( 'Working Budget', 'wordcamporg' ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <!--<a href="#" class="nav-tab">Working Budget</a>-->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <!--<a href="#" class="nav-tab"><?php esc_html_e( 'Working Budget', 'wordcamporg' ); ?></a>-->
</ins><span class="cx" style="display: block; padding: 0 10px"> </h2>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $budget['status'] == 'draft' ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p style="max-width: 800px;">Welcome to your WordCamp budget, it's time to crunch some numbers! When you're done with the preliminary budget, hit the "Submit for Approval" button below – a WordCamp deputy will be notified and will review your work. If you're having trouble with these numbers, or if you have any questions, don't hesitate to reach out to your mentor or Central.</p>
- <?php elseif ( $budget['status'] == 'pending' ) : ?>
- <p style="max-width: 800px;">This budget has been submitted for approval. You will be notified when it is approved. Or not.</p>
- <?php elseif ( $budget['status'] == 'approved' && $view == 'approved' ) : ?>
- <p style="max-width: 800px;">This budget has been approved and can not be modified. Use the working budget if you'd like to play around with numbers.</p>
- <?php elseif ( $view == 'working' ) : ?>
- <p style="max-width: 800px;">Welcome to your working budget. Feel free to play around with numbers here. They will not affect your approved budget.</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p style="max-width: 800px;"><?php esc_html_e( 'Welcome to your WordCamp budget, it\'s time to crunch some numbers! When you\'re done with the preliminary budget, hit the "Submit for Approval" button below – a WordCamp deputy will be notified and will review your work. If you\'re having trouble with these numbers, or if you have any questions, don\'t hesitate to reach out to your mentor or Central.', 'wordcamporg' ); ?></p>
+ <?php elseif ( $budget['status'] == 'pending' ) : ?>
+ <p style="max-width: 800px;"><?php esc_html_e( 'This budget has been submitted for approval. You will be notified when it is reviewed.', 'wordcamporg' ); ?></p>
+ <?php elseif ( $budget['status'] == 'approved' && $view == 'approved' ) : ?>
+ <p style="max-width: 800px;"><?php esc_html_e( "This budget has been approved and cannot be modified. Use the working budget if you'd like to play around with numbers.", 'wordcamporg' ); ?></p>
+ <?php elseif ( $view == 'working' ) : ?>
+ <p style="max-width: 800px;"><?php esc_html_e( 'Welcome to your working budget. Feel free to play around with numbers here. They will not affect your approved budget.', 'wordcamporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="left">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2>Event Data</h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2><?php esc_html_e( 'Event Data', 'wordcamporg' ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table class="wcb-budget-container">
</span><span class="cx" style="display: block; padding: 0 10px"> <tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="wcb-group-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th style="width: 50%;">Name</th>
- <th style="width: 50%;">Value</th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th style="width: 50%;"><?php esc_html_e( 'Name', 'wordcamporg' ); ?></th>
+ <th style="width: 50%;"><?php esc_html_e( 'Value', 'wordcamporg' ); ?></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="wcb-meta-placeholder" style="display: none;">
</span><span class="cx" style="display: block; padding: 0 10px"> <td colspan="2"></td>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,43 +61,43 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="right">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2>Summary</h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2><?php esc_html_e( 'Summary', 'wordcamporg' ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="wcb-summary-placeholder"></div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="clear"></div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2>Expenses</h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2><?php esc_html_e( 'Expenses', 'wordcamporg' ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table class="wcb-budget-container">
</span><span class="cx" style="display: block; padding: 0 10px"> <tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="wcb-group-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th style="width: 20%;">Category</th>
- <th style="width: 40%;">Detail</th>
- <th style="width: 25%;" class="amount">Amount</th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th style="width: 20%;"><?php esc_html_e( 'Category', 'wordcamporg' ); ?></th>
+ <th style="width: 40%;"><?php esc_html_e( 'Detail', 'wordcamporg' ); ?></th>
+ <th style="width: 25%;" class="amount"><?php esc_html_e( 'Amount', 'wordcamporg' ); ?></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <th style="width: 15%;"></th>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="wcb-expense-placeholder">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $editable ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td colspan="4">New Expense Item</td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td colspan="4"><?php esc_html_e( 'New Expense Item', 'wordcamporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h2>Income</h2>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2><?php esc_html_e( 'Income', 'wordcamporg' ); ?></h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> <table class="wcb-budget-container">
</span><span class="cx" style="display: block; padding: 0 10px"> <tbody>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="wcb-group-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th style="width: 20%;">Category</th>
- <th style="width: 40%;">Detail</th>
- <th style="width: 25%;" class="amount">Amount</th>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th style="width: 20%;"><?php esc_html_e( 'Category', 'wordcamporg' ); ?></th>
+ <th style="width: 40%;"><?php esc_html_e( 'Detail', 'wordcamporg' ); ?></th>
+ <th style="width: 25%;" class="amount"><?php esc_html_e( 'Amount', 'wordcamporg' ); ?></th>
</ins><span class="cx" style="display: block; padding: 0 10px"> <th style="width: 15%;"></th>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="wcb-income-placeholder">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $editable ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td colspan="4">New Income Item</td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td colspan="4"><?php esc_html_e( 'New Income Item', 'wordcamporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </tbody>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,21 +109,21 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $budget['status'] == 'draft' ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="submit">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php submit_button( 'Save Draft', 'secondary', 'wcb-budget-save-draft', false ); ?>
- <?php submit_button( 'Save & Request Review', 'secondary', 'wcb-budget-request-review', false ); ?>
- <a href="<?php echo admin_url( 'admin.php?page=wordcamp-budget' ); ?>" class="button">Cancel Changes</a>
- <?php submit_button( 'Submit for Approval', 'primary', 'wcb-budget-submit', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( esc_html__( 'Save Draft', 'wordcamporg' ), 'secondary', 'wcb-budget-save-draft', false ); ?>
+ <?php submit_button( esc_html__( 'Save & Request Review', 'wordcamporg' ), 'secondary', 'wcb-budget-request-review', false ); ?>
+ <a href="<?php echo admin_url( 'admin.php?page=wordcamp-budget' ); ?>" class="button"><?php esc_html_e( 'Cancel Changes', 'wordcamporg' ); ?></a>
+ <?php submit_button( esc_html__( 'Submit for Approval', 'wordcamporg' ), 'primary', 'wcb-budget-submit', false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( $budget['status'] == 'pending' && current_user_can( 'wcb_approve_budget' ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="submit">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php submit_button( 'Approve', 'primary', 'wcb-budget-approve', false ); ?>
- <?php submit_button( 'Reject', 'primary', 'wcb-budget-reject', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( esc_html__( 'Approve', 'wordcamporg' ), 'primary', 'wcb-budget-approve', false ); ?>
+ <?php submit_button( esc_html__( 'Reject', 'wordcamporg' ), 'primary', 'wcb-budget-reject', false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( $budget['status'] == 'approved' && $view == 'working' ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="submit">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php submit_button( 'Update Working Budget', 'primary', 'wcb-budget-update-working', false ); ?>
- <a href="<?php echo admin_url( 'admin.php?page=wordcamp-budget&wcb-view=working' ); ?>" class="button">Cancel Changes</a>
- <?php submit_button( 'Reset to Approved Budget', 'secondary', 'wcb-budget-reset', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( esc_html__( 'Update Working Budget', 'wordcamporg' ), 'primary', 'wcb-budget-update-working', false ); ?>
+ <a href="<?php echo admin_url( 'admin.php?page=wordcamp-budget&wcb-view=working' ); ?>" class="button"><?php esc_html_e( 'Cancel Changes', 'wordcamporg' ); ?></a>
+ <?php submit_button( esc_html__( 'Reset to Approved Budget', 'wordcamporg' ), 'secondary', 'wcb-budget-reset', false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,19 +136,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <th style="width: 50%;"></th>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td>Income</td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Income', 'wordcamporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td class="amount">{{data.income}}</td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td>Expenses</td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Expenses', 'wordcamporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td class="amount">{{data.expenses}}</td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td>Variance</td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Variance', 'wordcamporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td class="amount <# if (data.variance_raw < 0) { #>wcb-negative<# } #>">{{data.variance}}</td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td>Cost Per Person Per Day</td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Cost Per Person Per Day', 'wordcamporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td class="amount">{{data.per_person}}</td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td></td>
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="amount">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if (data.variance_raw < 0) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="#" target="_blank" class="inspire">inspire me</a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="#" target="_blank" class="inspire"><?php esc_html_e( 'inspire me', 'wordcamporg' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <td style="width: 20%">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- Income
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Income', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" class="category" value="{{data.category}}" />
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,7 +218,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# if (data.type == 'expense') { #>
</span><span class="cx" style="display: block; padding: 0 10px"> {{wcb.categories[data.category]}}
</span><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- Income
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Income', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,8 +274,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <td style="width: 15%" class="actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if (wcb.editable) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <a href="#" class="move">Move</a>
- <a href="#" class="delete">Delete</a>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <a href="#" class="move"><?php esc_html_e( 'Move', 'wordcamporg' ); ?></a>
+ <a href="#" class="delete"><?php esc_html_e( 'Delete', 'wordcamporg' ); ?></a>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestinputcountryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-country.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-country.php 2017-02-21 00:03:53 UTC (rev 4966)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-country.php 2017-02-21 00:03:58 UTC (rev 4967)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> name="<?php echo esc_attr( $name ); ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> <?php __checked_selected_helper( $required, true, true, 'required' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> >
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="">(None)</option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value=""><?php esc_html_e( '(None)', 'wordcamporg' ); ?></option>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $options as $value => $option_label ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="<?php echo esc_attr( $value ); ?>" <?php selected( $value, $selected ); ?>><?php
</span><span class="cx" style="display: block; padding: 0 10px"> echo esc_html( $option_label['name'] );
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestinputselectphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-select.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-select.php 2017-02-21 00:03:53 UTC (rev 4966)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/input-select.php 2017-02-21 00:03:58 UTC (rev 4967)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php __checked_selected_helper( $required, true, true, 'required' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> >
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="null-select-one">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf( __( '-- Select a %s --', 'wordcamporg' ), $label ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php printf( esc_html__( '-- Select a %s --', 'wordcamporg' ), $label ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="null-separator1"></option>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxgeneralphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-general.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-general.php 2017-02-21 00:03:53 UTC (rev 4966)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-general.php 2017-02-21 00:03:58 UTC (rev 4967)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,29 +1,41 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->render_textarea_input( $post, 'Description', 'description' );
- $this->render_text_input( $post, 'Invoice Number', 'invoice_number' );
- $this->render_text_input( $post, 'Invoice date', 'invoice_date', '', 'date' );
- $this->render_text_input( $post, 'Requested date for payment/due by', 'due_by', '', 'date' );
- $this->render_text_input( $post, 'Amount', 'payment_amount', 'No commas, thousands separators or currency symbols. Ex. 1234.56' );
- $this->render_select_input( $post, 'Currency', 'currency' );
- $this->render_select_input( $post, 'Category', 'payment_category' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->render_textarea_input( $post, esc_html__( 'Description', 'wordcamporg' ), 'description' );
+ $this->render_text_input( $post, esc_html__( 'Invoice Number', 'wordcamporg' ), 'invoice_number' );
+ $this->render_text_input( $post, esc_html__( 'Invoice date', 'wordcamporg' ), 'invoice_date', '', 'date' );
+ $this->render_text_input( $post, esc_html__( 'Requested date for payment/due by', 'wordcamporg' ), 'due_by', '', 'date' );
+ $this->render_text_input( $post, esc_html__( 'Amount', 'wordcamporg' ), 'payment_amount', esc_html__( 'No commas, thousands separators or currency symbols. Ex. 1234.56', 'wordcamporg' ) );
+ $this->render_select_input( $post, esc_html__( 'Currency', 'wordcamporg' ), 'currency' );
+ $this->render_select_input( $post, esc_html__( 'Category', 'wordcamporg' ), 'payment_category' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $this->render_text_input(
</span><span class="cx" style="display: block; padding: 0 10px"> $post,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'Other Category',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'Other Category', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'other_category_explanation',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Please describe what category this request fits under.', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'Please describe what category this request fits under.', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'text',
</span><span class="cx" style="display: block; padding: 0 10px"> isset( $assigned_category->name ) && 'Other' == $assigned_category->name ? array() : array( 'hidden') // todo i18n, see notes in insert_default_terms()
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $this->render_files_input( $post, 'Files', 'files', __( 'Attach supporting documentation including invoices, contracts, or other vendor correspondence. If no supporting documentation is available, please indicate the reason in the notes below.', 'wordcamporg' ) ); ?>
- <?php $this->render_textarea_input( $post, 'Notes', 'general_notes', 'Any other details you want to share.', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $this->render_files_input(
+ $post,
+ esc_html__( 'Files', 'wordcamporg' ),
+ 'files',
+ esc_html__( 'Attach supporting documentation including invoices, contracts, or other vendor correspondence. If no supporting documentation is available, please indicate the reason in the notes below.', 'wordcamporg' )
+ ); ?>
+
+ <?php $this->render_textarea_input(
+ $post,
+ esc_html__( 'Notes', 'wordcamporg' ),
+ 'general_notes',
+ esc_html__( 'Any other details you want to share.', 'wordcamporg' ),
+ false
+ ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="wcb-form-required">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( '* required', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( '* required', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxpaymentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-payment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-payment.php 2017-02-21 00:03:53 UTC (rev 4966)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-payment.php 2017-02-21 00:03:58 UTC (rev 4967)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,89 +8,89 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $box['args']['show_vendor_requested_payment_method'] ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $this->render_textarea_input( $post, 'Did the vendor request a specific type of payment?', 'vendor_requested_payment_method', 'Add any relevant details', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $this->render_textarea_input( $post, esc_html__( 'Did the vendor request a specific type of payment?', 'wordcamporg' ), 'vendor_requested_payment_method', esc_html__( 'Add any relevant details', 'wordcamporg' ), false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif;?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $this->render_radio_input( $post, 'Payment Method', 'payment_method' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $this->render_radio_input( $post, esc_html__( 'Payment Method', 'wordcamporg' ), 'payment_method' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table id="payment_method_direct_deposit_fields" class="form-table payment_method_fields <?php echo 'Direct Deposit' == $selected_payment_method ? 'active' : 'hidden'; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $this->render_text_input( $post, 'Bank Name', 'ach_bank_name' ); ?>
- <?php $this->render_radio_input( $post, 'Account Type', 'ach_account_type' ); ?>
- <?php $this->render_text_input( $post, 'Routing Number', 'ach_routing_number' ); ?>
- <?php $this->render_text_input( $post, 'Account Number', 'ach_account_number' ); ?>
- <?php $this->render_text_input( $post, 'Account Holder Name', 'ach_account_holder_name' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $this->render_text_input( $post, esc_html__( 'Bank Name', 'wordcamporg' ), 'ach_bank_name' ); ?>
+ <?php $this->render_radio_input( $post, esc_html__( 'Account Type', 'wordcamporg' ), 'ach_account_type' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Routing Number', 'wordcamporg' ), 'ach_routing_number' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Account Number', 'wordcamporg' ), 'ach_account_number' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Account Holder Name', 'wordcamporg' ), 'ach_account_holder_name' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="payment_method_check_fields" class="form-table payment_method_fields <?php echo 'Check' == $selected_payment_method ? 'active' : 'hidden'; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <table>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $this->render_text_input( $post, 'Payable To', 'payable_to' ); ?>
- <?php $this->render_text_input( $post, 'Street Address', 'check_street_address' ); ?>
- <?php $this->render_text_input( $post, 'City', 'check_city' ); ?>
- <?php $this->render_text_input( $post, 'State / Province', 'check_state' ); ?>
- <?php $this->render_text_input( $post, 'ZIP / Postal Code', 'check_zip_code' ); ?>
- <?php $this->render_country_input( $post, 'Country', 'check_country' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $this->render_text_input( $post, esc_html__( 'Payable To', 'wordcamporg' ), 'payable_to' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Street Address', 'wordcamporg' ), 'check_street_address' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'City', 'wordcamporg' ), 'check_city' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'State / Province', 'wordcamporg' ), 'check_state' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'ZIP / Postal Code', 'wordcamporg' ), 'check_zip_code' ); ?>
+ <?php $this->render_country_input( $post, esc_html__( 'Country', 'wordcamporg' ), 'check_country' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p id="payment_method_credit_card_fields" class="description payment_method_fields <?php echo 'Credit Card' == $selected_payment_method ? 'active' : 'hidden'; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'Please make sure that you upload an authorization form above, if one is required by the vendor.', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Please make sure that you upload an authorization form above, if one is required by the vendor.', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="payment_method_wire_fields" class="form-table payment_method_fields <?php echo 'Wire' == $selected_payment_method ? 'active' : 'hidden'; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( "Beneficiary's Bank", 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Beneficiary’s Bank', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </h3>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $this->render_text_input( $post, 'Beneficiary’s Bank Name', 'bank_name' ); ?>
- <?php $this->render_text_input( $post, 'Beneficiary’s Bank Street Address', 'bank_street_address' ); ?>
- <?php $this->render_text_input( $post, 'Beneficiary’s Bank City', 'bank_city' ); ?>
- <?php $this->render_text_input( $post, 'Beneficiary’s Bank State / Province', 'bank_state' ); ?>
- <?php $this->render_text_input( $post, 'Beneficiary’s Bank ZIP / Postal Code', 'bank_zip_code' ); ?>
- <?php $this->render_country_input( $post, 'Beneficiary’s Bank Country', 'bank_country_iso3166' ); ?>
- <?php $this->render_text_input( $post, 'Beneficiary’s Bank SWIFT BIC', 'bank_bic' ); ?>
- <?php $this->render_text_input( $post, 'Beneficiary’s Account Number or IBAN', 'beneficiary_account_number' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $this->render_text_input( $post, esc_html__( 'Beneficiary’s Bank Name', 'wordcamporg' ), 'bank_name' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Beneficiary’s Bank Street Address', 'wordcamporg' ), 'bank_street_address' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Beneficiary’s Bank City', 'wordcamporg' ), 'bank_city' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Beneficiary’s Bank State / Province', 'wordcamporg' ), 'bank_state' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Beneficiary’s Bank ZIP / Postal Code', 'wordcamporg' ), 'bank_zip_code' ); ?>
+ <?php $this->render_country_input( $post, esc_html__( 'Beneficiary’s Bank Country', 'wordcamporg' ), 'bank_country_iso3166' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Beneficiary’s Bank SWIFT BIC', 'wordcamporg' ), 'bank_bic' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Beneficiary’s Account Number or IBAN', 'wordcamporg' ), 'beneficiary_account_number' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <hr />
</span><span class="cx" style="display: block; padding: 0 10px"> <h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( "Intermediary Bank", 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Intermediary Bank', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </h3>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $this->render_checkbox_input(
</span><span class="cx" style="display: block; padding: 0 10px"> $post,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Send this payment through an intermediary bank', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'Send this payment through an intermediary bank', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'needs_intermediary_bank'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table id="intermediary_bank_fields">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $this->render_text_input( $post, 'Intermediary Bank Name', 'interm_bank_name' ); ?>
- <?php $this->render_text_input( $post, 'Intermediary Bank Street Address', 'interm_bank_street_address' ); ?>
- <?php $this->render_text_input( $post, 'Intermediary Bank City', 'interm_bank_city' ); ?>
- <?php $this->render_text_input( $post, 'Intermediary Bank State / Province', 'interm_bank_state' ); ?>
- <?php $this->render_text_input( $post, 'Intermediary Bank ZIP / Postal Code', 'interm_bank_zip_code' ); ?>
- <?php $this->render_country_input( $post, 'Intermediary Bank Country', 'interm_bank_country_iso3166' ); ?>
- <?php $this->render_text_input( $post, 'Intermediary Bank SWIFT BIC', 'interm_bank_swift' ); ?>
- <?php $this->render_text_input( $post, 'Intermediary Bank Account', 'interm_bank_account' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $this->render_text_input( $post, esc_html__( 'Intermediary Bank Name', 'wordcamporg' ), 'interm_bank_name' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Intermediary Bank Street Address', 'wordcamporg' ), 'interm_bank_street_address' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Intermediary Bank City', 'wordcamporg' ), 'interm_bank_city' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Intermediary Bank State / Province', 'wordcamporg' ), 'interm_bank_state' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Intermediary Bank ZIP / Postal Code', 'wordcamporg' ), 'interm_bank_zip_code' ); ?>
+ <?php $this->render_country_input( $post, esc_html__( 'Intermediary Bank Country', 'wordcamporg' ), 'interm_bank_country_iso3166' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Intermediary Bank SWIFT BIC', 'wordcamporg' ), 'interm_bank_swift' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Intermediary Bank Account', 'wordcamporg' ), 'interm_bank_account' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <hr />
</span><span class="cx" style="display: block; padding: 0 10px"> <h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( "Beneficiary", 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( 'Beneficiary', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </h3>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php $this->render_text_input( $post, 'Beneficiary’s Name', 'beneficiary_name' ); ?>
- <?php $this->render_text_input( $post, 'Beneficiary’s Street Address', 'beneficiary_street_address' ); ?>
- <?php $this->render_text_input( $post, 'Beneficiary’s City', 'beneficiary_city' ); ?>
- <?php $this->render_text_input( $post, 'Beneficiary’s State / Province', 'beneficiary_state' ); ?>
- <?php $this->render_text_input( $post, 'Beneficiary’s ZIP / Postal Code', 'beneficiary_zip_code' ); ?>
- <?php $this->render_country_input( $post, 'Beneficiary’s Country', 'beneficiary_country_iso3166' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php $this->render_text_input( $post, esc_html__( 'Beneficiary’s Name', 'wordcamporg' ), 'beneficiary_name' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Beneficiary’s Street Address', 'wordcamporg' ), 'beneficiary_street_address' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Beneficiary’s City', 'wordcamporg' ), 'beneficiary_city' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Beneficiary’s State / Province', 'wordcamporg' ), 'beneficiary_state' ); ?>
+ <?php $this->render_text_input( $post, esc_html__( 'Beneficiary’s ZIP / Postal Code', 'wordcamporg' ), 'beneficiary_zip_code' ); ?>
+ <?php $this->render_country_input( $post, esc_html__( 'Beneficiary’s Country', 'wordcamporg' ), 'beneficiary_country_iso3166' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="wcb-form-required">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( '* required', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( '* required', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxstatusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-status.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-status.php 2017-02-21 00:03:53 UTC (rev 4966)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-status.php 2017-02-21 00:03:58 UTC (rev 4967)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4,7 +4,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $current_user_can_edit_request && ! current_user_can( 'manage_network' ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="minor-publishing-actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="save-action">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php submit_button( __( 'Save Draft', 'wordcamporg' ), 'button', 'wcb-save-draft', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( esc_html__( 'Save Draft', 'wordcamporg' ), 'button', 'wcb-save-draft', false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="spinner"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="clear"></div>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxvendorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-vendor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-vendor.php 2017-02-21 00:03:53 UTC (rev 4966)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-vendor.php 2017-02-21 00:03:58 UTC (rev 4967)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,17 +1,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->render_text_input( $post, 'Vendor Name', 'vendor_name' );
- $this->render_text_input( $post, 'Contact Person', 'vendor_contact_person' );
- $this->render_text_input( $post, 'Phone Number', 'vendor_phone_number', '', 'tel' );
- $this->render_text_input( $post, 'Email Address', 'vendor_email_address', '', 'email' );
- $this->render_text_input( $post, 'Street Address', 'vendor_street_address' );
- $this->render_text_input( $post, 'City', 'vendor_city' );
- $this->render_text_input( $post, 'State / Province', 'vendor_state' );
- $this->render_text_input( $post, 'ZIP / Postal Code', 'vendor_zip_code' );
- $this->render_country_input( $post, 'Country', 'vendor_country_iso3166' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->render_text_input( $post, __( 'Vendor Name', 'wordcamporg' ), 'vendor_name' );
+ $this->render_text_input( $post, __( 'Contact Person', 'wordcamporg' ), 'vendor_contact_person' );
+ $this->render_text_input( $post, __( 'Phone Number', 'wordcamporg' ), 'vendor_phone_number', '', 'tel' );
+ $this->render_text_input( $post, __( 'Email Address', 'wordcamporg' ), 'vendor_email_address', '', 'email' );
+ $this->render_text_input( $post, __( 'Street Address', 'wordcamporg' ), 'vendor_street_address' );
+ $this->render_text_input( $post, __( 'City', 'wordcamporg' ), 'vendor_city' );
+ $this->render_text_input( $post, __( 'State / Province', 'wordcamporg' ), 'vendor_state' );
+ $this->render_text_input( $post, __( 'ZIP / Postal Code', 'wordcamporg' ), 'vendor_zip_code' );
+ $this->render_country_input( $post, __( 'Country', 'wordcamporg' ), 'vendor_country_iso3166' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="wcb-form-required">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( '* required', 'wordcamporg' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php esc_html_e( '* required', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewsreimbursementrequestmetaboxexpensesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-expenses.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-expenses.php 2017-02-21 00:03:53 UTC (rev 4966)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-expenses.php 2017-02-21 00:03:58 UTC (rev 4967)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="spinner is-active"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php submit_button( __( 'Add Another Expense', 'wordcamporg' ), 'secondary', 'wcbrr-add-another-expense' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( esc_html__( 'Add Another Expense', 'wordcamporg' ), 'secondary', 'wcbrr-add-another-expense' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="wcb-form-required">
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewsreimbursementrequestmetaboxnotesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-notes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-notes.php 2017-02-21 00:03:53 UTC (rev 4966)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-notes.php 2017-02-21 00:03:58 UTC (rev 4967)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea id="wcbrr_new_note" name="wcbrr_new_note" class="large-text"></textarea>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Add Note', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'Add Note', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'secondary',
</span><span class="cx" style="display: block; padding: 0 10px"> 'wcbrr_add_note'
</span><span class="cx" style="display: block; padding: 0 10px"> ); ?>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewsreimbursementrequestmetaboxstatusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-status.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-status.php 2017-02-21 00:03:53 UTC (rev 4966)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/reimbursement-request/metabox-status.php 2017-02-21 00:03:58 UTC (rev 4967)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $current_user_can_edit_request && ! current_user_can( 'manage_network' ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="minor-publishing-actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="save-action">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php submit_button( __( 'Save Draft', 'wordcamporg' ), 'button', 'wcb-save-draft', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( esc_html__( 'Save Draft', 'wordcamporg' ), 'button', 'wcb-save-draft', false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="spinner"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="clear"></div>
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewssponsorinvoicemetaboxstatusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/sponsor-invoice/metabox-status.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/sponsor-invoice/metabox-status.php 2017-02-21 00:03:53 UTC (rev 4966)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/sponsor-invoice/metabox-status.php 2017-02-21 00:03:58 UTC (rev 4967)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( in_array( $post->post_status, array( 'auto-draft', 'draft' ), true ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="minor-publishing-actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="save-action">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php submit_button( __( 'Save Draft' ), 'secondary', 'wcb-save-draft', false ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php submit_button( esc_html__( 'Save Draft' ), 'secondary', 'wcb-save-draft', false ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,9 +51,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="publishing-action">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr( __( 'Send Invoice', 'wordcamporg' ) ) ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr( esc_html__( 'Send Invoice', 'wordcamporg' ) ) ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'Send Invoice', 'wordcamporg' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_html__( 'Send Invoice', 'wordcamporg' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'primary button-large',
</span><span class="cx" style="display: block; padding: 0 10px"> 'send-invoice',
</span><span class="cx" style="display: block; padding: 0 10px"> false,
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewssponsorpaymentmainphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/sponsor-payment/main.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/sponsor-payment/main.php 2017-02-21 00:03:53 UTC (rev 4966)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/sponsor-payment/main.php 2017-02-21 00:03:58 UTC (rev 4967)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,41 +7,41 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="container">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="content" class="wcorg-sponsor-payment" role="main">
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h1 class="entry-title">Sponsorship Payment</h1>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h1 class="entry-title"><?php esc_html_e( 'Sponsorship Payment', 'wordcamporg' ); ?></h1>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $data['errors'] ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $data['errors'] as $error ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><strong>Error:</strong> <?php echo esc_html( $error ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><strong><?php esc_html_e( 'Error:', 'wordcamporg' ); ?></strong> <?php echo esc_html( $error ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $data['step'] == STEP_SELECT_INVOICE ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>Use this form to pay your WordCamp sponsorship fee to WordPress Community Support, PBC. If you did not receive an invoice ID yet, please get in touch with the event's Sponsorships Coordinator for more information.</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'Use this form to pay your WordCamp sponsorship fee to WordPress Community Support, PBC. If you did not receive an invoice ID yet, please get in touch with the event\'s Sponsorships Coordinator for more information.', 'wordcamporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <form method="POST">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="step" value="<?php echo STEP_SELECT_INVOICE; ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="sponsor_payment_submit" value="1" />
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label>Event</label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><?php esc_html_e( 'Event', 'wordcamporg' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="control">
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="wordcamp_id">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="" disabled selected>Select a WordCamp</option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value="" disabled selected><?php esc_html_e( 'Select a WordCamp', 'wordcamporg' ); ?></option>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $data['wordcamps'] as $wordcamp ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="<?php echo esc_attr( $wordcamp->ID ); ?>"><?php echo esc_html( $wordcamp->post_title ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label>Invoice ID</label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><?php esc_html_e( 'Invoice ID', 'wordcamporg' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="control">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" name="invoice_id" />
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label>Currency</label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><?php esc_html_e( 'Currency', 'wordcamporg' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="control">
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="currency">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="" disabled selected>Select a Currency</option>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value="" disabled selected><?php esc_html_e( 'Select a Currency', 'wordcamporg' ); ?></option>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $data['currencies'] as $currency_key => $currency_name ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option value="<?php echo esc_attr( $currency_key ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_html( $currency_name ); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,35 +50,35 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label>Amount</label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><?php esc_html_e( 'Amount', 'wordcamporg' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="control">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="text" name="amount" />
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="clear"></div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="submit" value="Continue" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="submit" value="<?php esc_attr_e( 'Continue', 'wordcamporg' ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( $data['step'] == STEP_PAYMENT_DETAILS ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>Please review the details below and hit "Make a Payment" when you're ready.</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php esc_html_e( 'Please review the details below and hit "Make a Payment" when you\'re ready.', 'wordcamporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td>Invoice</td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Invoice', 'wordcamporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php echo esc_html( $data['payment']['invoice_id'] ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td>Event</td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Event', 'wordcamporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php echo esc_html( $data['payment']['wordcamp_obj']->post_title ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td>Currency</td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Currency', 'wordcamporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php echo esc_html( $data['payment']['currency'] ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <td>Amount</td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <td><?php esc_html_e( 'Amount', 'wordcamporg' ); ?></td>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><?php echo number_format( round( $data['payment']['amount'], 2 ), 2, '.', ' ' ); ?></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,22 +94,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> data-amount="<?php echo esc_attr( round( $data['payment']['amount'], 2 ) * 100 ); ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> data-currency="<?php echo esc_attr( $data['payment']['currency'] ); ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> data-name="WordPress Community Support, PBC"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- data-description="Event Sponsorship Payment"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ data-description="<?php esc_attr_e( 'Event Sponsorship Payment', 'wordcamporg' ); ?>"
</ins><span class="cx" style="display: block; padding: 0 10px"> data-image="https://stripe.com/img/documentation/checkout/marketplace.png"
</span><span class="cx" style="display: block; padding: 0 10px"> data-locale="auto"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- data-panel-label="Pay"
- data-label="Make a Payment"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ data-panel-label="<?php esc_attr_e( 'Pay', 'wordcamporg' ); ?>"
+ data-label="<?php esc_attr_e( 'Make a Payment', 'wordcamporg' ); ?>"
</ins><span class="cx" style="display: block; padding: 0 10px"> data-zip-code="true">
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( $data['step'] == STEP_PAYMENT_SUCCESS ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><strong>Success!</strong> Your payment has been received, thank you!</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><strong><?php esc_html_e( 'Success!', 'wordcamporg' ); ?></strong> <?php esc_html_e( 'Your payment has been received, thank you!', 'wordcamporg' ); ?></p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><a href="<?php echo esc_url( add_query_arg( 'again', 1 ) ); ?>">Make another payment</a></li>
- <li><a href="<?php echo esc_url( home_url( '/' ) ); ?>">Go back to Central</a></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li><a href="<?php echo esc_url( add_query_arg( 'again', 1 ) ); ?>"><?php esc_html_e( 'Make another payment', 'wordcamporg' ); ?></a></li>
+ <li><a href="<?php echo esc_url( home_url( '/' ) ); ?>"><?php esc_html_e( 'Go back to Central', 'wordcamporg' ); ?></a></li>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre>
</div>
</div>
</body>
</html>