Merge branch 'master' into new-design

diff --cc src/templates/donate/messages/christmas-3.html
Simple merge

diff --cc src/templates/donate/messages/christmas-4.html
Simple merge

diff --cc src/templates/donate/messages/christmas-4.txt
index a57f962b5935a466eb3c357d0f6569574c8047bb,d420bf5432cf55886874d7611491860b5932dcca..5feefe166d2bf7f4ef59a3878dfeff3117d3a7e6
--- 1/src/templates/donate/messages/christmas-4.txt
--- 2/src/templates/donate/messages/christmas-4.txt
+++ b/src/templates/donate/messages/christmas-4.txt
@@@ -4,24 -4,23 +4,23 @@@ Subject: {{ _("Wishing You a Happy an
  Precedence: bulk
  X-Auto-Response-Suppress: OOF
  
 -{{ _("Hello %s,") % account.first_name }}
 +Dear Friends of IPFire,
  
- I’m writing to you, about to sign off for Christmas, filled with pride for our
- great project and gratitude for our wonderful supporters.
+ Did you see the highlights of 2023 we shared on our socials? If you didn’t, check our our
+ Mastodon (https://social.ipfire.org/@news), Twitter (https://twitter.com/ipfire) and our
+ LinkedIn (https://www.linkedin.com/company/ipfire) to see some of our favourite users
+ stories sent in by our friends and colleagues using IPFire.
  
- This has been a challenging but enjoyable year and I’d like to thank you for
- the support you’ve shown, whether through your contributions to the project,
- your feedback or your donations, our project wouldn’t have such an impact
- without people like you!
+ I wanted to take the opportunity to thank you for all of your support in 2023 and thank you
+ in advance for your continued support as we head into 2024. As you know, we’re the only
+ remaining truly Open Source Linux-based firewall and it is important to us not just to
+ continue to develop this great project, but also to remain Open Source and available to all.
+ Our mission is to continue to provide the same level of service with continued enhancements
+ and better usability and all of this requires the continued to support of our fantastic users.
  
- As ever, thank you to my fellow IPFire team members and contributors for your
- efforts to make our project the best it can be
- Everyone has worked super-hard this year so whatever you’re celebrating this
- December, I wish the very best for you and your families over the festive
- break and may you have a happy and prosperous New Year.
- 
- If you haven’t yet donated to the project, it isn’t too late -
- you can donate via the link below.
+ If you’d like to help us kick off 2024 the right way, please click the link where
+ you can donate to our project. Every donation is appreciated as it contributes to the
+ continued success of our project and helps us keep our software open to all.
  
    https://www.ipfire.org/donate
  

diff --cc src/web/donate.py
index 3d87e2a6472b99472bba16862052bdb6e494078e,37bb2c1c03c4f29521cb7b308b50800e159fdbed..bae215745af82879887c0c510f22a932b4f9e427
--- 1/src/web/donate.py
--- 2/src/web/donate.py
+++ b/src/web/donate.py
@@@ -3,16 -3,23 +3,23 @@@
  import iso3166
  import tornado.web
  
 -from . import auth
  from . import base
  
 -class DonateHandler(auth.CacheMixin, base.BaseHandler):
+ SKUS = {
+       "monthly"   : "IPFIRE-DONATION-MONTHLY",
+       "quarterly" : "IPFIRE-DONATION-QUARTERLY",
+       "yearly"    : "IPFIRE-DONATION-YEARLY",
+ }
+ DEFAULT_SKU = "IPFIRE-DONATION"
+ 
 +class DonateHandler(base.BaseHandler):
        def get(self):
 -              country = self.current_country_code
 +              if self.current_user:
 +                      country = self.current_user.country_code
 +              else:
 +                      country = self.current_country_code
  
                # Get defaults
 -              first_name = self.get_argument("first_name", None)
 -              last_name = self.get_argument("last_name", None)
                amount    = self.get_argument_float("amount", None)
                currency  = self.get_argument("currency", None)
                frequency = self.get_argument("frequency", None)