Skip to content
This repository has been archived by the owner on Feb 8, 2018. It is now read-only.

prepare for work on teams #4009

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions gratipay/models/participant/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -334,14 +334,6 @@ def clear_payment_instructions(self, cursor):
self.set_payment_instruction(team, '0.00', update_self=False, cursor=cursor)


def clear_takes(self, cursor):
"""Leave all teams by zeroing all takes.
"""
for team, nmembers in self.get_old_teams():
t = Participant.from_username(team)
t.set_take_for(self, Decimal(0), self, cursor)


def clear_personal_information(self, cursor):
"""Clear personal information such as statements.
"""
Expand Down Expand Up @@ -1095,22 +1087,6 @@ def get_teams(self, only_approved=False, cursor=None):
return teams


def get_old_teams(self):
"""Return a list of old-style teams this user was a member of.
"""
return self.db.all("""

SELECT team AS name
, ( SELECT count(*)
FROM current_takes
WHERE team=x.team
) AS nmembers
FROM current_takes x
WHERE member=%s;

""", (self.username,))


def insert_into_communities(self, is_member, name, slug):
participant_id = self.id
self.db.run("""
Expand Down Expand Up @@ -1528,8 +1504,6 @@ def take_over(self, account, have_confirmation=False):

if this_is_others_last_login_account:

other.clear_takes(cursor)

# Take over tips.
# ===============

Expand Down
123 changes: 71 additions & 52 deletions i18n/core/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,20 @@ msgstr ""
msgid "Follow this link if you want to view or modify your payments:"
msgstr ""

msgid "Identity Viewed"
msgstr ""

msgid ""
"This is a transactional email to let you know that {a_viewer}{viewer}{_a} "
"viewed your identity information for {a_country}{country_name}{_a} on "
"Gratipay."
msgstr ""

msgid ""
"This is a transactional email to let you know that {viewer} viewed your "
"identity information for {country_name} on Gratipay."
msgstr ""

msgid "Connect to {0} on Gratipay?"
msgstr "Mit {0} auf Gratipay verbinden?"

Expand Down Expand Up @@ -1012,58 +1026,6 @@ msgstr ""
msgid "Sorry, there is already a team using '{}'."
msgstr ""

msgid "Identity Verification"
msgstr "Identitätsüberprüfung"

msgid "Invalid date of birth."
msgstr "Ungültiges Geburtsdatum."

msgid "Unable to verify your identity"
msgstr ""

msgid ""
"Your identity is verified, which means you may add a {0}bank account{1}."
msgstr "Ihre Identität wurde bestätigt. Sie können nun Ihr {0}Bankkonto hinzufügen{1}."

msgid "Your Legal Name"
msgstr "Dein offizieller Name"

msgid "Address"
msgstr "Adresse"

msgid "Address (second line)"
msgstr "Adresse (Zusatz)"

msgid "City"
msgstr "Stadt"

msgid "State or Province"
msgstr "Land oder Region"

msgid "ZIP or Postal Code"
msgstr "Postleitzahl"

msgid "Country"
msgstr "Land"

msgid "non-US?"
msgstr "außerhalb der USA?"

msgid "Contact Phone Number"
msgstr "Telefonnummer"

msgid "Date of Birth"
msgstr "Geburtsdatum"

msgid "YYYY-MM-DD"
msgstr "JJJJ-MM-TT"

msgid "Last four SSN digits"
msgstr "Letzte 4 Sozialversicherungsnummerstellen"

msgid "(Not required)"
msgstr "(Nicht erforderlich)"

msgid "You don't have a profile statement in this language yet."
msgstr "Sie haben noch kein Statement in dieser Sprache geschrieben"

Expand Down Expand Up @@ -1265,6 +1227,60 @@ msgstr "Rechnung"
msgid "No transactions to show."
msgstr "Es gibt keine Transaktionen zu anzeigen."

msgid "ID Type"
msgstr ""

msgid "Tax ID"
msgstr ""

msgid "Passport"
msgstr ""

msgid "Driver's License"
msgstr ""

msgid "ID Number"
msgstr ""

msgid "Full Legal Name"
msgstr ""

msgid "Date of Birth"
msgstr "Geburtsdatum"

msgid "Address, Line 1"
msgstr ""

msgid "Address, Line 2"
msgstr ""

msgid "City"
msgstr "Stadt"

msgid "Region (State, Province)"
msgstr ""

msgid "Postcode (ZIP)"
msgstr ""

msgid "Danger Zone"
msgstr ""

msgid "Remove This Identity"
msgstr ""

msgid "Identities"
msgstr ""

msgid "Verified"
msgstr ""

msgid "Add Identity"
msgstr ""

msgid "Which Country?"
msgstr ""

msgid "The address cannot be empty."
msgstr ""

Expand Down Expand Up @@ -1313,6 +1329,9 @@ msgstr "CVV"
msgid "This verification code is invalid."
msgstr "Der Bestätigungscode ist falsch."

msgid "ZIP or Postal Code"
msgstr "Postleitzahl"

msgid ""
"To minimize processing fees, we charge your credit card at least $10 at a "
"time. {0}Read more ...{1}"
Expand Down
123 changes: 71 additions & 52 deletions i18n/core/eo.po
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,20 @@ msgstr ""
msgid "Follow this link if you want to view or modify your payments:"
msgstr ""

msgid "Identity Viewed"
msgstr ""

msgid ""
"This is a transactional email to let you know that {a_viewer}{viewer}{_a} "
"viewed your identity information for {a_country}{country_name}{_a} on "
"Gratipay."
msgstr ""

msgid ""
"This is a transactional email to let you know that {viewer} viewed your "
"identity information for {country_name} on Gratipay."
msgstr ""

msgid "Connect to {0} on Gratipay?"
msgstr "Konektu al {0} en Gratipay?"

Expand Down Expand Up @@ -1003,58 +1017,6 @@ msgstr ""
msgid "Sorry, there is already a team using '{}'."
msgstr ""

msgid "Identity Verification"
msgstr "Identokontrolo"

msgid "Invalid date of birth."
msgstr ""

msgid "Unable to verify your identity"
msgstr ""

msgid ""
"Your identity is verified, which means you may add a {0}bank account{1}."
msgstr ""

msgid "Your Legal Name"
msgstr "Via laŭleĝa nomo"

msgid "Address"
msgstr ""

msgid "Address (second line)"
msgstr ""

msgid "City"
msgstr "Urbo"

msgid "State or Province"
msgstr "Ŝtato aŭ provinco"

msgid "ZIP or Postal Code"
msgstr "Poŝtkodo (ZIP en Usono)"

msgid "Country"
msgstr "Lando"

msgid "non-US?"
msgstr "non-Usono?"

msgid "Contact Phone Number"
msgstr "Kontakta telefonnumero"

msgid "Date of Birth"
msgstr "Naskiĝdato"

msgid "YYYY-MM-DD"
msgstr ""

msgid "Last four SSN digits"
msgstr "Lasta kvar ciferoj de SSN"

msgid "(Not required)"
msgstr "(Ne bezonata)"

msgid "You don't have a profile statement in this language yet."
msgstr "Vi ne havas profilon en tiu lingvo ankoraŭ."

Expand Down Expand Up @@ -1256,6 +1218,60 @@ msgstr "Kvitanco"
msgid "No transactions to show."
msgstr ""

msgid "ID Type"
msgstr ""

msgid "Tax ID"
msgstr ""

msgid "Passport"
msgstr ""

msgid "Driver's License"
msgstr ""

msgid "ID Number"
msgstr ""

msgid "Full Legal Name"
msgstr ""

msgid "Date of Birth"
msgstr "Naskiĝdato"

msgid "Address, Line 1"
msgstr ""

msgid "Address, Line 2"
msgstr ""

msgid "City"
msgstr "Urbo"

msgid "Region (State, Province)"
msgstr ""

msgid "Postcode (ZIP)"
msgstr ""

msgid "Danger Zone"
msgstr ""

msgid "Remove This Identity"
msgstr ""

msgid "Identities"
msgstr ""

msgid "Verified"
msgstr ""

msgid "Add Identity"
msgstr ""

msgid "Which Country?"
msgstr ""

msgid "The address cannot be empty."
msgstr ""

Expand Down Expand Up @@ -1304,6 +1320,9 @@ msgstr "CVV"
msgid "This verification code is invalid."
msgstr ""

msgid "ZIP or Postal Code"
msgstr "Poŝtkodo (ZIP en Usono)"

msgid ""
"To minimize processing fees, we charge your credit card at least $10 at a "
"time. {0}Read more ...{1}"
Expand Down
Loading