Merge pull request #2268 from liberapay/various

liberapay/payin/cron.py

@@ -334,7 +334,7 @@ def execute_scheduled_payins():
                     force_email=True,
                 )
                 counts['renewal_unauthorized'] += 1
-                return
+                continue
             if payin.status == 'failed' and route.status == 'expired':
                 can_retry = db.one("""
                     SELECT count(*) > 0

liberapay/utils/cbor.py

@@ -29,10 +29,10 @@ def encode_date(encoder, value):
 
 
 def decode_date(decoder, value, shareable_index=None):
-    if type(value) == str:
+    if type(value) is str:
         # We used to encode dates as strings. The original spec allowed it.
         return date(*map(int, value.split('-')))
-    elif type(value) == int:
+    elif type(value) is int:
         return EPOCH + timedelta(days=value)
     else:
         raise TypeError("expected str or int, got %r" % type(value))

www/about/payment-processors.spt

@@ -17,7 +17,7 @@ title = _("Payment Processors")
 <ul>
     <li>{{ _("The payment processing fees are usually lower with Stripe than with PayPal.") }}</li>
     <li>{{ _("Stripe allows renewing donations automatically, whereas PayPal currently requires donors to confirm every payment.") }}</li>
-    <li>{{ _("Donations through Stripe can be secret, whereas PayPal always allows donors and recipients to see each other's names and email addresses.") }}}</li>
+    <li>{{ _("Donations through Stripe can be secret, whereas PayPal always allows donors and recipients to see each other's names and email addresses.") }}</li>
     <li>{{ _("Stripe allows donating to multiple creators at once in some cases, whereas PayPal always requires separate payments.") }}</li>
     <li>{{ _("PayPal payments require redirecting the donor to PayPal's website, whereas Stripe is integrated into Liberapay.") }}</li>
     <li>{{ _("Stripe makes SEPA Direct Debits easy for European donors.") }}</li>

www/admin/schedules.spt

@@ -118,9 +118,9 @@ title = "Scheduled Payments Admin"
             % else
             <td class="text-muted">n/a</td>
             % endif
-            % set percent_automatic_executed = row.n_automatic_executed / row.n_all * 100
+            % set percent_automatic_executed = row.n_automatic_executed / row.n_automatic * 100
             <td{% if row.n_automatic >= 100 and percent_automatic_executed < 90 and row.execution_date < today %} class="warning" {% endif %}>{{ '%.1f' % percent_automatic_executed }}</td>
-            % set percent_manual_executed = row.n_manual_executed / row.n_all * 100
+            % set percent_manual_executed = row.n_manual_executed / row.n_manual * 100
             <td>{{ '%.1f' % percent_manual_executed }}</td>
             % set percent_blocked = row.n_blocked / row.n_all * 100
             <td{% if row.n_all >= 100 and percent_blocked >= 15 %} class="warning" {% endif %}>{{ '%.1f' % percent_blocked }}</td>