From 20268e2aa9e94b862bcf105236f80e9153f7995d Mon Sep 17 00:00:00 2001 From: jbpenrath Date: Mon, 4 Apr 2022 15:53:52 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=96(funmooc)=20bump=20to=20version=201?= =?UTF-8?q?.15.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changed - Upgrade richie to 2.14.0 --- .circleci/config.yml | 309 +----------------- sites/funmooc/CHANGELOG.md | 9 +- sites/funmooc/src/backend/funmooc/__init__.py | 2 +- .../backend/locale/fr/LC_MESSAGES/django.po | 59 ++-- sites/funmooc/src/frontend/package.json | 2 +- 5 files changed, 55 insertions(+), 326 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 69e9faae..80d330c9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -341,320 +341,45 @@ version: 2.1 workflows: ademe: jobs: - - check-changelog: - filters: - branches: - ignore: /.*/ - name: check-changelog-ademe - site: ademe - - lint-changelog: - filters: - branches: - ignore: master - tags: - only: /ademe-.*/ - name: lint-changelog--ademe - site: ademe - - build-front-production: - filters: - tags: - only: /ademe-.*/ - name: build-front-production-ademe - site: ademe - - lint-front: - filters: - tags: - only: /ademe-.*/ - name: lint-front-ademe - requires: - - build-front-production-ademe - site: ademe - - build-back: - filters: - tags: - only: /ademe-.*/ - name: build-back-ademe - site: ademe - - lint-back: + - no-change: filters: tags: - only: /ademe-.*/ - name: lint-back-ademe - requires: - - build-back-ademe - site: ademe - - test-back: - filters: - tags: - only: /ademe-.*/ - name: test-back-ademe - requires: - - build-back-ademe - site: ademe - - hub: - filters: - tags: - only: /^ademe-.*/ - image_name: ademe - name: hub-ademe - requires: - - lint-front-ademe - - lint-back-ademe - site: ademe + only: /.*/ + name: no-change-ademe cnfpt: jobs: - - check-changelog: - filters: - branches: - ignore: /.*/ - name: check-changelog-cnfpt - site: cnfpt - - lint-changelog: + - no-change: filters: - branches: - ignore: master tags: - only: /cnfpt-.*/ - name: lint-changelog--cnfpt - site: cnfpt - - build-front-production: - filters: - tags: - only: /cnfpt-.*/ - name: build-front-production-cnfpt - site: cnfpt - - lint-front: - filters: - tags: - only: /cnfpt-.*/ - name: lint-front-cnfpt - requires: - - build-front-production-cnfpt - site: cnfpt - - build-back: - filters: - tags: - only: /cnfpt-.*/ - name: build-back-cnfpt - site: cnfpt - - lint-back: - filters: - tags: - only: /cnfpt-.*/ - name: lint-back-cnfpt - requires: - - build-back-cnfpt - site: cnfpt - - test-back: - filters: - tags: - only: /cnfpt-.*/ - name: test-back-cnfpt - requires: - - build-back-cnfpt - site: cnfpt - - hub: - filters: - tags: - only: /^cnfpt-.*/ - image_name: cnfpt - name: hub-cnfpt - requires: - - lint-front-cnfpt - - lint-back-cnfpt - site: cnfpt + only: /.*/ + name: no-change-cnfpt demo: jobs: - - check-changelog: - filters: - branches: - ignore: /.*/ - name: check-changelog-demo - site: demo - - lint-changelog: - filters: - branches: - ignore: master - tags: - only: /demo-.*/ - name: lint-changelog--demo - site: demo - - build-front-production: - filters: - tags: - only: /demo-.*/ - name: build-front-production-demo - site: demo - - lint-front: - filters: - tags: - only: /demo-.*/ - name: lint-front-demo - requires: - - build-front-production-demo - site: demo - - build-back: - filters: - tags: - only: /demo-.*/ - name: build-back-demo - site: demo - - lint-back: - filters: - tags: - only: /demo-.*/ - name: lint-back-demo - requires: - - build-back-demo - site: demo - - test-back: + - no-change: filters: tags: - only: /demo-.*/ - name: test-back-demo - requires: - - build-back-demo - site: demo - - hub: - filters: - tags: - only: /^demo-.*/ - image_name: richie-demo - name: hub-demo - requires: - - lint-front-demo - - lint-back-demo - site: demo + only: /.*/ + name: no-change-demo funcampus: jobs: - - check-changelog: - filters: - branches: - ignore: /.*/ - name: check-changelog-funcampus - site: funcampus - - lint-changelog: - filters: - branches: - ignore: master - tags: - only: /funcampus-.*/ - name: lint-changelog--funcampus - site: funcampus - - build-front-production: - filters: - tags: - only: /funcampus-.*/ - name: build-front-production-funcampus - site: funcampus - - lint-front: - filters: - tags: - only: /funcampus-.*/ - name: lint-front-funcampus - requires: - - build-front-production-funcampus - site: funcampus - - build-back: - filters: - tags: - only: /funcampus-.*/ - name: build-back-funcampus - site: funcampus - - lint-back: - filters: - tags: - only: /funcampus-.*/ - name: lint-back-funcampus - requires: - - build-back-funcampus - site: funcampus - - test-back: + - no-change: filters: tags: - only: /funcampus-.*/ - name: test-back-funcampus - requires: - - build-back-funcampus - site: funcampus - - hub: - filters: - tags: - only: /^funcampus-.*/ - image_name: funcampus - name: hub-funcampus - requires: - - lint-front-funcampus - - lint-back-funcampus - site: funcampus + only: /.*/ + name: no-change-funcampus funcorporate: jobs: - - check-changelog: - filters: - branches: - ignore: /.*/ - name: check-changelog-funcorporate - site: funcorporate - - lint-changelog: - filters: - branches: - ignore: master - tags: - only: /funcorporate-.*/ - name: lint-changelog--funcorporate - site: funcorporate - - build-front-production: - filters: - tags: - only: /funcorporate-.*/ - name: build-front-production-funcorporate - site: funcorporate - - lint-front: + - no-change: filters: tags: - only: /funcorporate-.*/ - name: lint-front-funcorporate - requires: - - build-front-production-funcorporate - site: funcorporate - - build-back: - filters: - tags: - only: /funcorporate-.*/ - name: build-back-funcorporate - site: funcorporate - - lint-back: - filters: - tags: - only: /funcorporate-.*/ - name: lint-back-funcorporate - requires: - - build-back-funcorporate - site: funcorporate - - test-back: - filters: - tags: - only: /funcorporate-.*/ - name: test-back-funcorporate - requires: - - build-back-funcorporate - site: funcorporate - - hub: - filters: - tags: - only: /^funcorporate-.*/ - image_name: funcorporate - name: hub-funcorporate - requires: - - lint-front-funcorporate - - lint-back-funcorporate - site: funcorporate + only: /.*/ + name: no-change-funcorporate funmooc: jobs: - check-changelog: filters: branches: - ignore: /.*/ + ignore: master name: check-changelog-funmooc site: funmooc - lint-changelog: @@ -718,7 +443,7 @@ workflows: tags: only: /.*/ - check-configuration: - ci_update_options: --ignore-changelog + ci_update_options: "" filters: branches: ignore: master diff --git a/sites/funmooc/CHANGELOG.md b/sites/funmooc/CHANGELOG.md index 95cf3862..ff845673 100644 --- a/sites/funmooc/CHANGELOG.md +++ b/sites/funmooc/CHANGELOG.md @@ -8,6 +8,12 @@ Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] +## [1.15.0] - 2022-04-04 + +### Changed + +- Upgrade richie to 2.14.0 + ## [1.14.0] - 2022-03-07 ### Added @@ -511,7 +517,8 @@ Versioning](https://semver.org/spec/v2.0.0.html). - Static and media files are stored in AWS S3 buckets and distributed _via_ Amazon CloudFront -[unreleased]: https://github.com/openfun/richie-site-factory/compare/funmooc-1.14.0...HEAD +[unreleased]: https://github.com/openfun/richie-site-factory/compare/funmooc-1.15.0...HEAD +[1.15.0]: https://github.com/openfun/richie-site-factory/compare/funmooc-1.14.0...funmooc-1.15.0 [1.14.0]: https://github.com/openfun/richie-site-factory/compare/funmooc-1.13.0...funmooc-1.14.0 [1.13.0]: https://github.com/openfun/richie-site-factory/compare/funmooc-1.12.0...funmooc-1.13.0 [1.12.0]: https://github.com/openfun/richie-site-factory/compare/funmooc-1.11.0...funmooc-1.12.0 diff --git a/sites/funmooc/src/backend/funmooc/__init__.py b/sites/funmooc/src/backend/funmooc/__init__.py index b9f68edb..6b0872cb 100644 --- a/sites/funmooc/src/backend/funmooc/__init__.py +++ b/sites/funmooc/src/backend/funmooc/__init__.py @@ -1 +1 @@ -__version__ = "1.14.0" +__version__ = "1.15.0" diff --git a/sites/funmooc/src/backend/locale/fr/LC_MESSAGES/django.po b/sites/funmooc/src/backend/locale/fr/LC_MESSAGES/django.po index ac685405..b1f19f38 100644 --- a/sites/funmooc/src/backend/locale/fr/LC_MESSAGES/django.po +++ b/sites/funmooc/src/backend/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-01-04 17:51+0100\n" +"POT-Creation-Date: 2022-04-04 15:58+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,87 +21,74 @@ msgstr "" msgid "Unsorted uploads are not allowed." msgstr "Les téléchargements non classés sont interdits" -#: funmooc/settings.py:222 +#: funmooc/settings.py:223 msgid "Dashboard" msgstr "Tableau de bord" -#: funmooc/settings.py:223 +#: funmooc/settings.py:224 msgid "{base_url:s}/dashboard" msgstr "" -#: funmooc/settings.py:226 +#: funmooc/settings.py:227 msgid "Profile" msgstr "Profil" -#: funmooc/settings.py:227 +#: funmooc/settings.py:228 msgid "{base_url:s}/u/(username)" msgstr "" -#: funmooc/settings.py:230 +#: funmooc/settings.py:231 msgid "Account" msgstr "Compte" -#: funmooc/settings.py:231 +#: funmooc/settings.py:232 msgid "{base_url:s}/account/settings" msgstr "" -#: funmooc/settings.py:316 +#: funmooc/settings.py:317 msgid "Teaser" msgstr "Accroche" -#: funmooc/settings.py:397 funmooc/settings.py:401 +#: funmooc/settings.py:401 funmooc/settings.py:405 msgid "New courses" msgstr "Nouveaux cours" -#: funmooc/settings.py:412 +#: funmooc/settings.py:416 msgid "Availability" msgstr "Disponibilité" -#: funmooc/settings.py:422 +#: funmooc/settings.py:426 msgid "Languages" msgstr "Langues" -#: funmooc/settings.py:437 +#: funmooc/settings.py:441 msgid "Types" msgstr "" -#: funmooc/settings.py:450 +#: funmooc/settings.py:454 msgid "Subjects" msgstr "Thématiques" -#: funmooc/settings.py:463 +#: funmooc/settings.py:467 msgid "Collections" msgstr "Collections" -#: funmooc/settings.py:476 +#: funmooc/settings.py:480 msgid "Organizations" msgstr "Établissements" -#: funmooc/settings.py:489 +#: funmooc/settings.py:493 msgid "Contributors" msgstr "Contributeurs" -#: funmooc/settings.py:509 funmooc/settings.py:524 +#: funmooc/settings.py:513 funmooc/settings.py:528 msgid "English" msgstr "Anglais" -#: funmooc/settings.py:509 funmooc/settings.py:532 +#: funmooc/settings.py:513 funmooc/settings.py:536 msgid "French" msgstr "Français" -#: templates/courses/cms/course_detail.html:17 -msgctxt "course_detail__title" -msgid "Other course runs" -msgstr "Autres sessions" - -#: templates/courses/cms/course_detail.html:26 -msgid "No other open course runs" -msgstr "Aucune autre session ouverte" - -#: templates/courses/cms/course_detail.html:30 -msgid "No open course runs" -msgstr "Aucune session ouverte" - #: templates/richie/base.html:18 msgid "Help" msgstr "Aide" @@ -165,3 +152,13 @@ msgstr "Twitter" #: templates/social-networks/footer-badges.html:30 msgid "Linkedin" msgstr "Linkedin" + +msgctxt "course_detail__title" +msgid "Other course runs" +msgstr "Autres sessions" + +msgid "No other open course runs" +msgstr "Aucune autre session ouverte" + +msgid "No open course runs" +msgstr "Aucune session ouverte" diff --git a/sites/funmooc/src/frontend/package.json b/sites/funmooc/src/frontend/package.json index 891892af..f27f3702 100644 --- a/sites/funmooc/src/frontend/package.json +++ b/sites/funmooc/src/frontend/package.json @@ -1,6 +1,6 @@ { "name": "funmooc", - "version": "1.14.0", + "version": "1.15.0", "description": "Richie-powered CMS for fun-mooc.fr", "scripts": { "build-sass-production": "sass scss/_main.scss ../backend/base/static/richie/css/main.css --style=compressed --load-path=node_modules",