Merge branch 'patch-1' into 'develop'

Adding arabic translation

See merge request !302

.gitlab-ci.yml

@@ -4,7 +4,8 @@ variables:
   IMAGE_LATEST: $IMAGE_NAME:latest
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/pip-cache"
   PYTHONDONTWRITEBYTECODE: "true"
-
+  REVIEW_DOMAIN: preview.funkwhale.audio
+  REVIEW_INSTANCE_URL: https://demo.funkwhale.audio
 
 stages:
   - review
@@ -28,16 +29,16 @@ review_front:
     # this is to ensure we don't have any errors in the output,
     # cf https://code.eliotberriot.com/funkwhale/funkwhale/issues/169
     - INSTANCE_URL=$REVIEW_INSTANCE_URL yarn run build | tee /dev/stderr | (! grep -i 'ERROR in')
-    - mkdir -p /static/front/$CI_BUILD_REF_SLUG
-    - cp -r dist/* /static/front/$CI_BUILD_REF_SLUG
+    - mkdir -p /static/front/$CI_PROJECT_PATH_SLUG-$CI_BUILD_REF_SLUG
+    - cp -r dist/* /static/front/$CI_PROJECT_PATH_SLUG-$CI_BUILD_REF_SLUG
   cache:
-    key: "$CI_PROJECT_ID__front_dependencies"
+    key: "funkwhale__front_dependencies"
     paths:
       - front/node_modules
       - front/yarn.lock
   environment:
-    name: review/front-$CI_BUILD_REF_NAME
-    url: http://front-$CI_BUILD_REF_SLUG.$REVIEW_DOMAIN
+    name: review/front/$CI_PROJECT_PATH_SLUG-$CI_BUILD_REF_SLUG
+    url: http://front-$CI_PROJECT_PATH_SLUG-$CI_BUILD_REF_SLUG.$REVIEW_DOMAIN
     on_stop: stop_front_review
   only:
     - branches
@@ -47,14 +48,14 @@ review_front:
 stop_front_review:
   stage: review
   script:
-    - rm -rf /static/front/$CI_BUILD_REF_SLUG/
+    - rm -rf /static/front/$CI_PROJECT_PATH_SLUG-$CI_BUILD_REF_SLUG/
   variables:
     GIT_STRATEGY: none
   when: manual
   only:
     - branches
   environment:
-    name: review/front-$CI_BUILD_REF_NAME
+    name: review/front/$CI_PROJECT_PATH_SLUG-$CI_BUILD_REF_SLUG
     action: stop
   tags:
     - funkwhale-review
@@ -78,11 +79,11 @@ review_docs:
       - "$PIP_CACHE_DIR"
   script:
     - ./build_docs.sh
-    - mkdir -p /static/docs/$CI_BUILD_REF_SLUG
-    - cp -r $CI_PROJECT_DIR/public/* /static/docs/$CI_BUILD_REF_SLUG
+    - mkdir -p /static/docs/$CI_PROJECT_PATH_SLUG-$CI_BUILD_REF_SLUG
+    - cp -r $CI_PROJECT_DIR/public/* /static/docs/$CI_PROJECT_PATH_SLUG-$CI_BUILD_REF_SLUG
   environment:
-    name: review/docs-$CI_BUILD_REF_NAME
-    url: http://docs-$CI_BUILD_REF_SLUG.$REVIEW_DOMAIN
+    name: review/docs/$CI_PROJECT_PATH_SLUG-$CI_BUILD_REF_SLUG
+    url: http://docs-$CI_PROJECT_PATH_SLUG-$CI_BUILD_REF_SLUG.$REVIEW_DOMAIN
     on_stop: stop_docs_review
   only:
     - branches
@@ -92,14 +93,14 @@ review_docs:
 stop_docs_review:
   stage: review
   script:
-    - rm -rf /static/docs/$CI_BUILD_REF_SLUG/
+    - rm -rf /static/docs/$CI_PROJECT_PATH_SLUG-$CI_BUILD_REF_SLUG/
   variables:
     GIT_STRATEGY: none
   when: manual
   only:
     - branches
   environment:
-    name: review/docs-$CI_BUILD_REF_NAME
+    name: review/docs/$CI_PROJECT_PATH_SLUG-$CI_BUILD_REF_SLUG
     action: stop
   tags:
     - funkwhale-review
@@ -168,7 +169,7 @@ test_front:
     - yarn install
     - yarn run unit
   cache:
-    key: "$CI_PROJECT_ID__front_dependencies"
+    key: "funkwhale__front_dependencies"
     paths:
       - front/node_modules
       - front/yarn.lock
@@ -195,7 +196,7 @@ build_front:
     - yarn run build | tee /dev/stderr | (! grep -i 'ERROR in')
     - chmod -R 750 dist
   cache:
-    key: "$CI_PROJECT_ID__front_dependencies"
+    key: "funkwhale__front_dependencies"
     paths:
       - front/node_modules
       - front/yarn.lock

changes/changelog.d/arabic.i18n

+Arabic translation (!302)

front/src/locales.js

 /* eslint-disable */
 export default {
   "locales": [
+    {
+      "code": "ar",
+      "label": "العربية"
+    },
     {
       "code": "en_US",
       "label": "English (United-States)"

pyproject.toml

@@ -32,6 +32,11 @@
         name = "Documentation"
         showcontent = true
 
+    [[tool.towncrier.type]]
+        directory = "i18n"
+        name = "i18n"
+        showcontent = true
+
     [[tool.towncrier.type]]
         directory = "misc"
         name = "Other"