Revise site copy to keep up with ToS changes

[chadwhitacre]

Part of gratipay/inside.gratipay.com#432.

[chadwhitacre]

@mattbk at #4148 (comment):

If I get some time I'll dip into #4157 to move it along.

Cool, go for it. I started hacking locally but it's a mess.

[mattbk]

Sometimes I forget make test.

[mattbk]

Unfortunately I'm not sure what to do with the Aspen 302 errors.

[mattbk]

tests/py/test_pages.py::TestPages::test_about_payments FAILED
tests/py/test_pages.py::TestPages::test_about_payroll FAILED
The command "LD_LIBRARY_PATH=/usr/local/lib make bgrun test doc" exited with 2.

[mattbk]

🐢 🎉

[mattbk]

(Reticketed under #3326.)

Should we mention PayPal fees on pay out under the following?

WHAT ARE THE PAYMENT FEES?

Our credit card processor, Braintree, charges 2.9% + 30¢ per transaction. We upcharge ~users to cover this fee at cost, and Teams receive the face value of the payment. For example, we'll charge $20.91 to cover a $20 payment

[mattbk]

(Reticketed as #4227.)

"Payments" is confusing to someone new--is it money I give? Is it money I receive? Especially at about/features/, it goes from "giving" to "payments."

Can we use a different word? "Payins"?

[mattbk]

At the moment, "Features" reads like an FAQ and includes stuff that should be on "Pricing." Maybe "Features" could be "FAQ" (with pricing moved).

"Where do payments go?" is another confusing use of payments, because in this case it applies only to giving to the Gratipay Project.

[mattbk]

The discussion around "Payments" nomenclature was at gratipay/inside.gratipay.com#117. I'm okay with it, but maybe we need a ticket on breaking site copy up into

• what is helpful for givers and
• what is helpful for project owners

[mattbk]

If we're going to keep this copy, then search should search projects as well:

HOW DO I GIVE MONEY?
Browse or search for a project you want to give to, and then look for the prompt.

[chadwhitacre]

I noticed under #4217 that we mention "open work" on CONTRIBUTING.md. We should probably revise that here as well.

[mattbk]

Oops, crossed the streams there.

[mattbk]

Have to go, needs to be fixed more.

[chadwhitacre]

crossed the streams there.

You said that was bad, Egon!

[mattbk]

Also mentioned in readme. Done already.

[chadwhitacre]

I changed the base to put this in line behind #4130 for #4221.

[chadwhitacre]

Rebased to remove merges and reversions; was 7648e98.

[chadwhitacre]

Well that's a first—did we run out of entropy? 😳

[chadwhitacre]

=================================== FAILURES ===================================
______________________________ TestHtml.test_200 _______________________________
self = <test_stats.TestHtml testMethod=test_200>
    def test_200(self):
>       fake_data.populate_db(self.db, 5, 5, 1)
tests/py/test_stats.py:84: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
gratipay/utils/fake_data.py:352: in populate_db
    payment_instructions.append(fake_payment_instruction(db, participant, team))
gratipay/utils/fake_data.py:173: in fake_payment_instruction
    ctime=faker.date_time_between(start_date)
env/lib/python2.7/site-packages/faker/providers/date_time.py:314: in date_time_between
    timestamp = random.randint(start_date, end_date)
/opt/python/2.7.12/lib/python2.7/random.py:242: in randint
    return self.randrange(a, b+1)
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
self = <random.Random object at 0xcbe670>, start = 1481307351.0
stop = 1481043792.0, step = 1, _int = <type 'int'>
_maxwidth = 9007199254740992L
    def randrange(self, start, stop=None, step=1, _int=int, _maxwidth=1L<<BPF):
        """Choose a random item from range(start, stop[, step]).
    
            This fixes the problem with randint() which includes the
            endpoint; in Python this is usually not what you want.
    
            """
    
        # This code is a bit messy to make it fast for the
        # common case while still doing adequate error checking.
        istart = _int(start)
        if istart != start:
            raise ValueError, "non-integer arg 1 for randrange()"
        if stop is None:
            if istart > 0:
                if istart >= _maxwidth:
                    return self._randbelow(istart)
                return _int(self.random() * istart)
            raise ValueError, "empty range for randrange()"
    
        # stop argument supplied.
        istop = _int(stop)
        if istop != stop:
            raise ValueError, "non-integer stop for randrange()"
        width = istop - istart
        if step == 1 and width > 0:
            # Note that
            #     int(istart + self.random()*width)
            # instead would be incorrect.  For example, consider istart
            # = -2 and istop = 0.  Then the guts would be in
            # -2.0 to 0.0 exclusive on both ends (ignoring that random()
            # might return 0.0), and because int() truncates toward 0, the
            # final result would be -1 or 0 (instead of -2 or -1).
            #     istart + int(self.random()*width)
            # would also be incorrect, for a subtler reason:  the RHS
            # can return a long, and then randrange() would also return
            # a long, but we're supposed to return an int (for backward
            # compatibility).
    
            if width >= _maxwidth:
                return _int(istart + self._randbelow(width))
            return _int(istart + _int(self.random()*width))
        if step == 1:
>           raise ValueError, "empty range for randrange() (%d,%d, %d)" % (istart, istop, width)
E           ValueError: empty range for randrange() (1481307351,1481043792, -263559)
/opt/python/2.7.12/lib/python2.7/random.py:218: ValueError

[chadwhitacre]

Not a loss of entropy, looks rather to be date-related in fake data ...

[chadwhitacre]

Alright @mattbk et al., you good with the latest commits? I'm ready to go if you are ...

[mattbk]

Looks good. I'm pushing the button.

ETA: Hey, stuff is still happening!

[chadwhitacre]

AUP is messed up:

[mattbk]

That happened to me at one point as well.

[chadwhitacre]

The "Apply for a project" button is broken for me now I think?

[chadwhitacre]

The "Apply for a project" button is broken for me now I think?

Due to bea2912, along with Travis failures. Backed that out.

[mattbk]

Good thing I didn't push the button.

[chadwhitacre]

:-)

I'm going over the ToS HTML formatting ...

[chadwhitacre]

My Vim wasn't formatting the Markdown lists properly.

http://superuser.com/questions/236138/how-can-i-get-vim-to-indent-all-the-lines-in-a-list-item-not-just-the-second

[chadwhitacre]

Okay, @mattbk. How about now? :-)

[chadwhitacre]

@mattbk Oh! Can you try "Squash and merge" with this one? Make sure you edit the commit message to remove all of the extra messages besides the first.

[chadwhitacre]

/me tries to stop tinkering ... 😊

[mattbk]

I tried in d0f6b94 via the command line because I didn't realize it could be done here...

[mattbk]

...so I'm not sure how to make this PR reflect that.

[chadwhitacre]

Ah, sorry, I should've been more clear. Maybe we should rebase d0f6b94 off of #4221, and then redo the squash-and-merge using the GitHub UI, so GitHub knows what we did?

[mattbk]

Yeah, I'll see what I can do.

[chadwhitacre]

@mattbk Try git rebase -i head^^ locally, on the relax-open-work-requirement branch? That should pop up an editor with further instructions. head^^ specifies the commit two prior to head.

[chadwhitacre]

!m @mattbk