diff --git a/CHANGELOG.md b/CHANGELOG.md index d6e84f2..5945415 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 6.3.2 + +- No longer sets `DEFAULT_LOCALE` to `en` by default; leaves this value unset. + # 6.3.1 - Removed DB_POOL from the ConfigMap as we should never have to override this. diff --git a/Chart.yaml b/Chart.yaml index bda99a2..64c3184 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time # you make changes to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 6.3.1 +version: 6.3.2 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/templates/configmap-env.yaml b/templates/configmap-env.yaml index b6b8e7c..83cca23 100644 --- a/templates/configmap-env.yaml +++ b/templates/configmap-env.yaml @@ -25,7 +25,9 @@ data: REPLICA_DB_PASS: {{ .Values.postgresql.readReplica.auth.password }} {{- end }} PREPARED_STATEMENTS: {{ .Values.mastodon.preparedStatements | quote }} + {{- if .Values.mastodon.locale }} DEFAULT_LOCALE: {{ .Values.mastodon.locale }} + {{- end }} {{- if .Values.elasticsearch.enabled }} ES_ENABLED: "true" ES_PRESET: {{ .Values.elasticsearch.preset | default "single_node_cluster" | quote }} diff --git a/values.yaml b/values.yaml index 726148e..492b2bd 100644 --- a/values.yaml +++ b/values.yaml @@ -110,8 +110,12 @@ mastodon: # Node(s) on which we will deploy this job nodeSelector: {} + # Sets the default locale for this server. + # NOTICE: This will force this locale on every user who is not logged in, and + # the instance will no longer do any local detection for clients. # -- available locales: https://github.com/mastodon/mastodon/blob/main/config/application.rb#L71 - locale: en + locale: + local_domain: mastodon.local # -- Use of WEB_DOMAIN requires careful consideration: https://docs.joinmastodon.org/admin/config/#federation # You must redirect the path LOCAL_DOMAIN/.well-known/ to WEB_DOMAIN/.well-known/ as described