Merge branch 'develop' into release/3.17.0

.github/workflows/discourse.yml

@@ -0,0 +1,18 @@
+name: Post release topic on Discourse
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  post:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: roots/discourse-topic-github-release-action@c30dc233349b7c6f24f52fb1c659cc64f13b5474
+      with:
+        discourse-api-key: ${{ secrets.DISCOURSE_RELEASES_API_KEY }}
+        discourse-base-url: https://aleph.discourse.group/
+        discourse-category: 5
+        discourse-tags:
+          release
+          aleph

CONTRIBUTING.md

@@ -34,7 +34,7 @@ If, after reviewing the list (or selecting an issue to work on) you'd like to re
 
 ### Forking and Branching
 
-All new development work needs to happen on a branch. If this is your first time, you'll not have the ability to create branches directly from Aleph so will need to fork the repo. Once you've done this create an issue branch and commit all you changes to this. Make sure you set up [commit signing](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits) beforehand.
+The Aleph team uses the Gitflow method of branching and merging. If you are not familiar with Gitflow then you can [read all about it here](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow). All new development work needs to happen on a branch. If this is your first time, you'll not have the ability to create branches directly from Aleph so will need to fork the repo. Once you've done this create an issue branch and commit all you changes to this. Make sure you set up [commit signing](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits) beforehand.
 
 ### Pull Requests
 
@@ -54,7 +54,7 @@ Aleph uses two main branches. The **develop** branch is for any new work that ne
 
 ### Code Formatting and Linting
 
-We use automatic code formatters and linters to keep our code consistent and to spot bugs and style issues early in the process. For Python code, we use  [black](https://black.readthedocs.io/en/stable/) and [ruff](https://beta.ruff.rs/). Our JavaScript code base uses [Prettier](https://prettier.io) and [ESLint](https://eslint.org/).
+We use automatic code formatters and linters to keep our code consistent and to spot bugs and style issues early in the process. For Python code, we use [black](https://black.readthedocs.io/en/stable/) and [ruff](https://beta.ruff.rs/). Our JavaScript code base uses [Prettier](https://prettier.io) and [ESLint](https://eslint.org/).
 
 When you open a pull request, your changes are automatically checked for consistency with our code formatting and linting rules. You can also run the checks in your local development environment. If you aren’t familiar with these tools yet, don’t worry. You can open a pull request even if your changes don’t pass these checks.
 

README.rst

@@ -29,6 +29,14 @@ in touch:
 
 * https://docs.aleph.occrp.org/get-in-touch
 
+Aleph Development
+-----------------
+
+If you're looking to get involved with the development of Aleph, please check the `CONTRIBUTING.md` file for details on how to get started.
+
+⚠️ **IMPORTANT** ⚠️ 
+The default branch in this GitHub repository is "develop". The develop branch contains unreleased, unstable code. For stable releases, please check out the `list of releases <https://github.com/alephdata/aleph/releases>`_ or switch to the `main branch <https://github.com/alephdata/aleph/tree/main>`_.
+
 Release process
 ---------------
 

aleph/core.py

@@ -46,7 +46,13 @@
 def determine_locale():
     try:
         options = SETTINGS.UI_LANGUAGES
-        locale = request.accept_languages.best_match(options)
+        if str(request.accept_languages) == "*":
+            # For #3704: if any language is fine pick the default one
+            locale = SETTINGS.DEFAULT_LANGUAGE
+        else:
+            locale = request.accept_languages.best_match(
+                options, default=SETTINGS.DEFAULT_LANGUAGE
+            )
         locale = locale or str(babel.default_locale)
     except RuntimeError:
         locale = str(babel.default_locale)

requirements.txt

@@ -9,7 +9,7 @@ normality==2.5.0
 pantomime==0.6.1
 
 # Flask ecosystem
-Flask==2.3.3
+Flask==3.0.3
 Flask-SQLAlchemy==3.0.5
 Flask-Mail==0.9.1
 Flask-Migrate==4.0.7
@@ -22,7 +22,7 @@ authlib==0.15.5
 
 elasticsearch==7.17.0
 marshmallow==3.21.1
-gunicorn[eventlet]==21.2.0
+gunicorn[eventlet]==22.0.0
 jsonschema==4.22.0
 apispec==6.3.1
 apispec-webframeworks==0.5.2