Merge pull request #71 from YunoHost-Apps/testing

Testing

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.14.2~ynh1
+**Shipped version:** 4.15~ynh1
 
 **Demo:** https://hosted.weblate.org/
 

README_fr.md

@@ -17,7 +17,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.14.2~ynh1
+**Version incluse :** 4.15~ynh1
 
 **Démo :** https://hosted.weblate.org/
 

conf/settings.py

@@ -92,10 +92,9 @@ DATABASES = {
     }
 }
 
-BASE_DIR = "__FINALPATH__"
+# Data directory, you can use following for the development purposes:
-
+# os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "data")
-# Data directory
+DATA_DIR = os.path.join("__FINALPATH__", "data")
-DATA_DIR = os.path.join(BASE_DIR, "data")
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@@ -205,7 +204,7 @@ STATICFILES_FINDERS = (
 )
 
 # Make this unique, and don't share it with anybody.
-# You can generate it using weblate/examples/generate-secret-key
+# You can generate it using weblate-generate-secret-key
 SECRET_KEY = "__KEY__"
 
 TEMPLATES = [
@@ -229,13 +228,21 @@ TEMPLATES = [
 
 # GitHub username and token for sending pull requests.
 # Please see the documentation for more details.
-GITHUB_USERNAME = __GITHUB_USERNAME__
+GITHUB_CREDENTIALS = {
-GITHUB_TOKEN = __GITHUB_TOKEN__
+    "api.github.com": {
+        "username": "__GITHUB_USERNAME__",
+        "token": "__GITHUB_TOKEN__",
+    }
+}
 
 # GitLab username and token for sending merge requests.
 # Please see the documentation for more details.
-GITLAB_USERNAME = __GITLAB_USERNAME__
+GITLAB_CREDENTIALS = {
-GITLAB_TOKEN = __GITLAB_TOKEN__
+    "gitlab.com": {
+        "username": "__GITLAB_USERNAME__",
+        "token": "__GITLAB_TOKEN__",
+    }
+}
 
 # Authentication configuration
 AUTHENTICATION_BACKENDS = (
@@ -638,6 +645,7 @@ SESSION_COOKIE_SECURE = ENABLE_HTTPS
 SESSION_COOKIE_HTTPONLY = True
 # SSL redirect
 SECURE_SSL_REDIRECT = ENABLE_HTTPS
+SECURE_SSL_HOST = SITE_DOMAIN
 # Sent referrrer only for same origin links
 SECURE_REFERRER_POLICY = "same-origin"
 # SSL redirect URL exemption list
@@ -648,6 +656,8 @@ SESSION_COOKIE_AGE_AUTHENTICATED = 1209600
 SESSION_COOKIE_SAMESITE = "Lax"
 # Increase allowed upload size
 DATA_UPLOAD_MAX_MEMORY_SIZE = 50000000
+# Allow more fields for case with a lot of subscriptions in profile
+DATA_UPLOAD_MAX_NUMBER_FIELDS = 2000
 
 # Apply session coookie settings to language cookie as ewll
 LANGUAGE_COOKIE_SECURE = SESSION_COOKIE_SECURE
@@ -800,6 +810,7 @@ CRISPY_TEMPLATE_PACK = "bootstrap3"
 #     "weblate.addons.generate.PseudolocaleAddon",
 #     "weblate.addons.generate.PrefillAddon",
 #     "weblate.addons.json.JSONCustomizeAddon",
+#     "weblate.addons.xml.XMLCustomizeAddon",
 #     "weblate.addons.properties.PropertiesSortAddon",
 #     "weblate.addons.git.GitSquashAddon",
 #     "weblate.addons.removal.RemoveComments",
@@ -835,6 +846,7 @@ CACHES = {
             "CONNECTION_POOL_KWARGS": {},
         },
         "KEY_PREFIX": "weblate",
+        "TIMEOUT": 3600,
     },
     "avatar": {
         "BACKEND": "django.core.cache.backends.filebased.FileBasedCache",

manifest.json

@@ -6,7 +6,7 @@
         "en": "Translation platform using Git and Python",
         "fr": "Plateforme de traduction utilisant Git et Python"
     },
-    "version": "4.14.2~ynh1",
+    "version": "4.15~ynh1",
     "url": "https://weblate.org",
     "upstream": {
         "license": "AGPL-3.0",
@@ -66,7 +66,10 @@
                     "en": "Choose the forge you use",
                     "fr": "Choisissez la forge que vous utilisez"
                 },
-                "choices": ["GitHub", "GitLab"],
+                "choices": [
+                    "GitHub",
+                    "GitLab"
+                ],
                 "default": "GitHub"
             },
             {

scripts/_common.sh

@@ -33,15 +33,15 @@ fi
 
 set_forge_variables() {
 	if [ $used_forge = "GitHub" ] ; then
-		github_username="\"$forge_username\""
+		github_username="$forge_username"
-		github_token="\"$forge_token\""
+		github_token="$forge_token"
 		gitlab_username="None"
 		gitlab_token="None"
 	else
 		github_username="None"
 		github_token="None"
-		gitlab_username="\"$forge_username\""
+		gitlab_username="$forge_username"
-		gitlab_token="\"$forge_token\""
+		gitlab_token="$forge_token"
 	fi
 }