From c0adb044bca9e414e6c6834e1d3d36ab4122d99b Mon Sep 17 00:00:00 2001 From: Kay0u Date: Thu, 21 Apr 2022 17:30:02 +0200 Subject: [PATCH 1/2] 4.12 --- conf/settings.py | 13 +++++++------ manifest.json | 2 +- scripts/_common.sh | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) 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) From 01b62bc2aa8a70f8f4bd113feacd1608f9eec742 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 21 Apr 2022 15:30:19 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cb7ca9c..a08517b 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Weblate is a libre web-based translation tool with tight version control integration. It provides two user interfaces, propagation of translations across components, quality checks and automatic linking to source files. -**Shipped version:** 4.11.2~ynh2 +**Shipped version:** 4.12~ynh1 **Demo:** https://hosted.weblate.org/ diff --git a/README_fr.md b/README_fr.md index e0a8b07..76b5712 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Weblate est un outil de traduction libre avec une intégration étroite du contrôle de version. Il fournit deux interfaces utilisateur, la propagation des traductions entre les composants, les contrôles de qualité et la liaison automatique aux fichiers source. -**Version incluse :** 4.11.2~ynh2 +**Version incluse :** 4.12~ynh1 **Démo :** https://hosted.weblate.org/