diff --git a/conf/settings.py b/conf/settings.py index 5643e8d..2b9a054 100644 --- a/conf/settings.py +++ b/conf/settings.py @@ -151,8 +151,8 @@ LANGUAGES = ( ("th", "ไทย"), ("tr", "Türkçe"), ("uk", "Українська"), - ("zh-hans", "简体字"), - ("zh-hant", "正體字"), + ("zh-hans", "简体中文"), + ("zh-hant", "正體中文"), ) SITE_ID = 1 @@ -242,7 +242,7 @@ AUTHENTICATION_BACKENDS = ( "social_core.backends.email.EmailAuth", # "social_core.backends.google.GoogleOAuth2", # "social_core.backends.github.GithubOAuth2", - # "social_core.backends.bitbucket.BitbucketOAuth", + # "social_core.backends.bitbucket.BitbucketOAuth2", # "social_core.backends.suse.OpenSUSEOpenId", # "social_core.backends.ubuntu.UbuntuOpenId", # "social_core.backends.fedora.FedoraOpenId", @@ -266,9 +266,9 @@ SOCIAL_AUTH_GITHUB_TEAM_KEY = "" SOCIAL_AUTH_GITHUB_TEAM_SECRET = "" SOCIAL_AUTH_GITHUB_TEAM_ID = "" -SOCIAL_AUTH_BITBUCKET_KEY = "" -SOCIAL_AUTH_BITBUCKET_SECRET = "" -SOCIAL_AUTH_BITBUCKET_VERIFIED_EMAILS_ONLY = True +SOCIAL_AUTH_BITBUCKET_OAUTH2_KEY = "" +SOCIAL_AUTH_BITBUCKET_OAUTH2_SECRET = "" +SOCIAL_AUTH_BITBUCKET_OAUTH2_VERIFIED_EMAILS_ONLY = True SOCIAL_AUTH_FACEBOOK_KEY = "" SOCIAL_AUTH_FACEBOOK_SECRET = "" @@ -902,6 +902,7 @@ if REQUIRE_LOGIN: # rf"{URL_PREFIX}/js/i18n/$", # JavaScript localization # rf"{URL_PREFIX}/contact/$", # Optional for contact form # rf"{URL_PREFIX}/legal/(.*)$", # Optional for legal app +# rf"{URL_PREFIX}/avatar/(.*)$", # Optional for avatars # ) # Silence some of the Django system checks diff --git a/manifest.json b/manifest.json index 03e927a..3f0d826 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Translation platform using Git and Python", "fr": "Plateforme de traduction utilisant Git et Python" }, - "version": "4.11.2~ynh2", + "version": "4.12~ynh1", "url": "https://weblate.org", "upstream": { "license": "AGPL-3.0", diff --git a/scripts/_common.sh b/scripts/_common.sh index 27d6532..ba6b277 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -18,7 +18,7 @@ borgbackup_dependencies="libacl1-dev libacl1 libssl-dev liblz4-dev libzstd-dev l pkg_dependencies="$weblate_dependencies $borgbackup_dependencies" # Weblate's version for PIP and settings file -weblate_version="4.11.2" +weblate_version="4.12" debian_maj_version=$(sed 's/\..*//' /etc/debian_version)