From 830da54d2917bcfa5cd5c66f3cfee786be109c36 Mon Sep 17 00:00:00 2001
From: Ben Sturmfels <ben@sturm.com.au>
Date: Sat, 15 Apr 2023 16:47:41 +1000
Subject: [PATCH] Further update branding and organisation details

---
 pinaxcon/proposals/models.py                        |  2 +-
 pinaxcon/settings.py                                |  6 +++---
 .../templates/registrasion/_invoice_details.html    | 13 ++++++-------
 .../registrasion/emails/invoice_created/subject.txt |  2 +-
 .../registrasion/emails/invoice_updated/subject.txt |  2 +-
 .../registrasion/stripe/credit_card_payment.html    |  5 ++---
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/pinaxcon/proposals/models.py b/pinaxcon/proposals/models.py
index 8e5d97a5..8a2480b0 100644
--- a/pinaxcon/proposals/models.py
+++ b/pinaxcon/proposals/models.py
@@ -68,7 +68,7 @@ class Proposal(ProposalBase):
 
     recording_release = models.BooleanField(
         default=True,
-        help_text="I allow Linux Australia to release any recordings of "
+        help_text="I allow Software Freedom Conservancy to release any recordings of "
         "presentations covered by this proposal, on YouTube under the "
         "standard YouTube licence, and on other platforms under the "
         "Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International "
diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index 4620908b..59976578 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -125,9 +125,9 @@ else:
 
 ALLOWED_HOSTS = ['127.0.0.1', 'localhost', '*']
 
-TIME_ZONE = "Australia/Sydney"
-DATE_FORMAT = "j F Y"
-LANGUAGE_CODE = "en-au"
+TIME_ZONE = "US/Pacific"
+DATE_FORMAT = "F j Y"
+LANGUAGE_CODE = "en-us"
 
 SITE_ID = int(os.environ.get("SITE_ID", 1))
 USE_I18N = True
diff --git a/pinaxcon/templates/registrasion/_invoice_details.html b/pinaxcon/templates/registrasion/_invoice_details.html
index 42c921fb..6f3bb2a3 100644
--- a/pinaxcon/templates/registrasion/_invoice_details.html
+++ b/pinaxcon/templates/registrasion/_invoice_details.html
@@ -2,8 +2,8 @@
 {% load lca2018_tags %}
 
 <h2>Tax Invoice/Statement</h2>
-<h3>Linux Australia</h3>
-<h4>ABN 56 987 117 479</h4>
+<h3>Software Freedom Conservancy</h3>
+{# <h4>ABN 56 987 117 479</h4> #}
 
 <p>
   Enquiries: please e-mail <a href="mailto:{{ settings.CONFERENCE_EMAIL }}">{{ settings.CONFERENCE_EMAIL }}</a>
@@ -80,11 +80,10 @@
 
 <hr />
 
-<p>{% conference_name %} is a project of Linux Australia, Inc.</p>
+<p>{% conference_name %} is a project of Software Freedom Conservancy Inc.</p>
 
 <p>
-  GPO Box 4788 <br />
-  Sydney NSW 2001 <br />
-  Australia <br />
-  ABN 56 987 117 479 <br />
+  137 MONTAGUE ST STE 380 <br />
+  Brooklyn, NY 11201-3548 <br />
+  {# ABN 56 987 117 479 <br /> #}
 <p>
diff --git a/pinaxcon/templates/registrasion/emails/invoice_created/subject.txt b/pinaxcon/templates/registrasion/emails/invoice_created/subject.txt
index 55c6fa25..b3bc362a 100644
--- a/pinaxcon/templates/registrasion/emails/invoice_created/subject.txt
+++ b/pinaxcon/templates/registrasion/emails/invoice_created/subject.txt
@@ -1 +1 @@
-{% load i18n %}Invoice {{ invoice.id }} from Linux Australia
+{% load i18n %}Invoice {{ invoice.id }} from Software Freedom Conservancy
diff --git a/pinaxcon/templates/registrasion/emails/invoice_updated/subject.txt b/pinaxcon/templates/registrasion/emails/invoice_updated/subject.txt
index 223203ad..0614e00c 100644
--- a/pinaxcon/templates/registrasion/emails/invoice_updated/subject.txt
+++ b/pinaxcon/templates/registrasion/emails/invoice_updated/subject.txt
@@ -1 +1 @@
-{% load i18n %}{{ invoice.get_status_display }} -- Invoice {{ invoice.id }} from Linux Australia
+{% load i18n %}{{ invoice.get_status_display }} -- Invoice {{ invoice.id }} from Software Freedom Conservancy
diff --git a/pinaxcon/templates/registrasion/stripe/credit_card_payment.html b/pinaxcon/templates/registrasion/stripe/credit_card_payment.html
index 2d8a8046..f0ac8052 100644
--- a/pinaxcon/templates/registrasion/stripe/credit_card_payment.html
+++ b/pinaxcon/templates/registrasion/stripe/credit_card_payment.html
@@ -70,9 +70,8 @@
 <p>Pay your invoice with your Visa, Mastercard, or American Express credit or debit card. Card payments are processed by <a href="https://stripe.com">Stripe</a>.</p>
 
   <p>
-    No data on this form is retained by {% conference_name %}, rather it is
-    sent to Stripe. In particular, credit card details are not sent
-    to Linux Australia. You must allow JavaScript from <code>js.stripe.com</code> and <code>stripe.network</code> to complete payment.
+    No data or credit card details on this form are retained by {% conference_name %}, rather it is
+    sent directly to Stripe. You must allow JavaScript from <code>js.stripe.com</code> and <code>stripe.network</code> to complete payment.
   </p>
 
   <p>You have <strong>${{ invoice.balance_due }}</strong> remaining to pay on this invoice.</p>