v3.7.1 Merge pull request #282 from membermatters/dev

Dev
membermatters · Aug 22, 2024 · 29e2fe7 · 29e2fe7
2 parents 251e4fe + 0cc97f6
commit 29e2fe7
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v3.7.1] - 2024-08-23
+
+### Added
+
+- Added support for specifying system timezone with MM_TIME_ZONE env var
+- Added support for specifying system locale with MM_LANGAUGE_CODE env var
+
+### Updated
+
+- README.md to include [Pawprint Prototyping](https://pawprintprototyping.org/)
 
 ## [v3.7.0] - 2024-08-11
 

diff --git a/README.md b/README.md
@@ -134,3 +134,4 @@ Feel free to add your organisation to this list (via a pull request) if you're a
 * [BMS (Brisbane Makerspace)](https://brisbanemaker.space) (October 2021) - Brisbane's friendliest community workshop based in Brisbane, QLD, Australia.
 * [Make Monmouth](https://www.makemonmouth.co.uk/) (November 2023) - A community makerspace based in Monmouth, Wales, UK.
 * [SparkCC](https://www.sparkcc.org) (September 2021) - A community of makers on the NSW Central Coast based in Palmdale, NSW, Australia.
+* [Pawprint Prototyping](https://pawprintprototyping.org/) (October 2021) - non-profit hackerspace in Santa Clara, California, USA.  A lot of us are also animals on the internet 🐾.
diff --git a/docs/POST_INSTALL_STEPS.md b/docs/POST_INSTALL_STEPS.md
@@ -72,7 +72,11 @@ However, as noted below, currencies will use a hardcoded value set by a configur
 
 > NOTE: the `SITE_LOCALE_CURRENCY` option is what determines how the currency is displayed. This is "hardcoded" as a 
 > config option to prevent a currency/billing amount being displayed incorrectly. If your locale isn't directly 
-> supported, please open an issue or check below as your currency may already be supported under a different locale.
+> supported, please open an issue or check below as your currency may already be supported under a different locale.o
+
+> NOTE: If you want to set the *server* timezone and language, export `MM_TIME_ZONE=<your area>/<your country>` and 
+> `MM_LANGAUGE_CODE=<your-language-code>` before launching the server component.  If you do not set these variables,
+> the server logs will default to `Australia/Brisbane` as the timezone and `en-au` as the default language.
  
 #### Locale Options
 * `en-AU` - full translation available, currency format `$12.50`.

diff --git a/memberportal/membermatters/settings.py b/memberportal/membermatters/settings.py
@@ -330,9 +330,9 @@
 # Internationalization
 # https://docs.djangoproject.com/en/2.0/topics/i18n/
 
-LANGUAGE_CODE = "en-au"
+LANGUAGE_CODE = os.getenv("MM_LANGUAGE_CODE", "en-au")
 
-TIME_ZONE = "Australia/Brisbane"
+TIME_ZONE = os.getenv("MM_TIME_ZONE", "Australia/Brisbane")
 USE_I18N = True
 USE_L10N = True
 USE_TZ = True

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "membermatters",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "devDependencies": {
     "eslint-webpack-plugin": "^3.1.1",
     "husky": "^6.0.0",

diff --git a/src-frontend/package.json b/src-frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "3.7.0",
+  "version": "3.7.1",
   "description": "The MemberMatters frontend",
   "productName": "MemberMatters",
   "author": "Jaimyn Mayer <[email protected]>",