Merge pull request #13897 from jeabakker/upmerge-4.1.1

Upmerge 4.1.1 into 4.x
Elgg · Feb 2, 2022 · 146ed1e · 146ed1e
2 parents b276e0a + eeeeabe
commit 146ed1e
Show file tree

Hide file tree

Showing 55 changed files with 221 additions and 74 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+<a name="4.1.1"></a>
+### 4.1.1  (2022-02-01)
+
+#### Contributors
+
+* Jerôme Bakker (4)
+
+#### Bug Fixes
+
+* **cache:** improved cache path parsing ([fb18efb1](https://github.com/Elgg/Elgg/commit/fb18efb190273d4e595c4c0f94cf5378a12183c7))
+
+
 <a name="4.1.0"></a>
 ## 4.1.0  (2022-01-14)
 

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "elgg/elgg",
-    "version": "4.1.0",
+    "version": "4.1.1",
     "description": "Elgg is an award-winning social networking engine, delivering the building blocks that enable businesses, schools, universities and associations to create their own fully-featured social networks and applications.",
     "license": "GPL-2.0-only",
     "minimum-stability": "dev",

diff --git a/composer.lock b/composer.lock
diff --git a/docs/locale/fr/LC_MESSAGES/admin.mo b/docs/locale/fr/LC_MESSAGES/admin.mo
diff --git a/docs/locale/fr/LC_MESSAGES/admin.po b/docs/locale/fr/LC_MESSAGES/admin.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Elgg master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-24 13:21+0100\n"
+"POT-Creation-Date: 2022-01-13 14:50+0100\n"
 "PO-Revision-Date: 2021-06-09 13:31+0000\n"
 "Last-Translator: Florian DANIEL aka Facyla <i.daniel.florian@gmail.com>, 2021\n"
 "Language-Team: French (https://www.transifex.com/elgg/teams/11337/fr/)\n"

diff --git a/docs/locale/fr/LC_MESSAGES/appendix.mo b/docs/locale/fr/LC_MESSAGES/appendix.mo
diff --git a/docs/locale/fr/LC_MESSAGES/appendix.po b/docs/locale/fr/LC_MESSAGES/appendix.po
@@ -6,16 +6,16 @@
 # Translators:
 # Jerôme Bakker, 2021
 # Jeroen Dalsem, 2021
-# Florian DANIEL aka Facyla <i.daniel.florian@gmail.com>, 2021
+# Florian DANIEL aka Facyla <i.daniel.florian@gmail.com>, 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: Elgg master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-24 13:21+0100\n"
+"POT-Creation-Date: 2022-01-13 14:50+0100\n"
 "PO-Revision-Date: 2021-06-09 13:32+0000\n"
-"Last-Translator: Florian DANIEL aka Facyla <i.daniel.florian@gmail.com>, 2021\n"
+"Last-Translator: Florian DANIEL aka Facyla <i.daniel.florian@gmail.com>, 2022\n"
 "Language-Team: French (https://www.transifex.com/elgg/teams/11337/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -5067,7 +5067,7 @@ msgstr "De 2.0 à 2.1"
 #: ../../appendix/upgrade-notes/3.0-to-3.1.rst:94
 #: ../../appendix/upgrade-notes/3.2-to-3.3.rst:77
 #: ../../appendix/upgrade-notes/3.x-to-4.0.rst:892
-#: ../../appendix/upgrade-notes/4.0-to-4.1.rst:22
+#: ../../appendix/upgrade-notes/4.0-to-4.1.rst:29
 msgid "Deprecated APIs"
 msgstr "APIs dépréciées"
 
@@ -7761,8 +7761,8 @@ msgid ""
 "User capabilities service will no longer trigger permission check hooks "
 "when:"
 msgstr ""
-"Le service des fonctionnalités de l'utilisateur ne déclenche plus les hooks "
-"de vérification des autorisations lorsque :"
+"Le service des capacités de l'utilisateur ne déclenche plus les hooks de "
+"vérification des autorisations lorsque :"
 
 #: ../../appendix/upgrade-notes/2.x-to-3.0.rst:440
 msgid "permissions are checked for an admin user"
@@ -8053,7 +8053,7 @@ msgid ""
 msgstr ""
 "Voyez la documentation du :doc:`Service de recherche </guides/search>` et "
 "des :ref:`Hooks de recherche <guides/hooks-list#search>` pour des "
-"informations détaillées sur les nouvelles fonctionnalités de recherche."
+"informations détaillées sur les nouvelles capacités de recherche."
 
 #: ../../appendix/upgrade-notes/2.x-to-3.0.rst:536
 msgid "Form and field related changes"
@@ -12463,7 +12463,7 @@ msgstr ""
 #: ../../appendix/upgrade-notes/3.x-to-4.0.rst:535
 #: ../../appendix/upgrade-notes/3.x-to-4.0.rst:901
 #: ../../appendix/upgrade-notes/3.x-to-4.0.rst:937
-#: ../../appendix/upgrade-notes/4.0-to-4.1.rst:25
+#: ../../appendix/upgrade-notes/4.0-to-4.1.rst:32
 msgid "Lib functions"
 msgstr "Fonctions de la bibliothèque"
 
@@ -14797,7 +14797,7 @@ msgstr ""
 "``elgg_redirect_response()``"
 
 #: ../../appendix/upgrade-notes/3.x-to-4.0.rst:906
-#: ../../appendix/upgrade-notes/4.0-to-4.1.rst:31
+#: ../../appendix/upgrade-notes/4.0-to-4.1.rst:38
 msgid "Plugin hooks"
 msgstr "Hooks plugin"
 
@@ -15314,19 +15314,46 @@ msgid "The config variable ``registered_entities`` is no longer available."
 msgstr ""
 "La variable de configuration ``registered_entities`` n'est plus disponible."
 
-#: ../../appendix/upgrade-notes/4.0-to-4.1.rst:27
+#: ../../appendix/upgrade-notes/4.0-to-4.1.rst:20
+msgid ""
+"The current implemented capabilities are 'commentable', 'likable' and "
+"'searchable'."
+msgstr ""
+"Les capacités actuellement implémentées sont 'commentable', 'likable' et "
+"'searchable'."
+
+#: ../../appendix/upgrade-notes/4.0-to-4.1.rst:23
+msgid "Threaded Comments"
+msgstr "Commentaires imbriqués"
+
+#: ../../appendix/upgrade-notes/4.0-to-4.1.rst:25
+msgid ""
+"Support for threaded comments has been added. This feature needs to be "
+"enable in the site settings. To make this work changes have been made to "
+"comments related JavaScript and CSS. If you use specific styling or have "
+"custom features related to this feature you might need to give it some extra"
+" attention."
+msgstr ""
+"La prise en charge des commentaires imbriqués a été ajoutée. Cette "
+"fonctionnalité doit être activée dans les paramètres du site. Pour faire ce "
+"travail, des modifications ont été apportées aux commentaires liés à "
+"JavaScript et CSS. Si vous utilisez un style spécifique ou avez des "
+"fonctionnalités personnalisées liées à cette fonctionnalité, vous devrez "
+"peut-être leur accorder une attention supplémentaire."
+
+#: ../../appendix/upgrade-notes/4.0-to-4.1.rst:34
 msgid "``elgg_get_version()`` use ``elgg_get_release()``"
 msgstr "``elgg_get_version()`` utilisez ``elgg_get_release()``"
 
-#: ../../appendix/upgrade-notes/4.0-to-4.1.rst:28
+#: ../../appendix/upgrade-notes/4.0-to-4.1.rst:35
 msgid ""
 "``get_user_by_code()`` use ``elgg_get_user_by_persistent_token()`` where you"
 " only need to provide the token, not the hashed token"
 msgstr ""
 "``get_user_by_code()`` utilisez ``elgg_get_user_by_persistent_token()`` où "
 "vous devez uniquement fournir le jeton, pas le jeton haché"
 
-#: ../../appendix/upgrade-notes/4.0-to-4.1.rst:33
+#: ../../appendix/upgrade-notes/4.0-to-4.1.rst:40
 msgid ""
 "``'likes:is_likable', '<type>:<subtype>'`` use  "
 "``$entity->hasCapability('likable')``"

diff --git a/docs/locale/fr/LC_MESSAGES/contribute.mo b/docs/locale/fr/LC_MESSAGES/contribute.mo
diff --git a/docs/locale/fr/LC_MESSAGES/contribute.po b/docs/locale/fr/LC_MESSAGES/contribute.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Elgg master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-24 13:21+0100\n"
+"POT-Creation-Date: 2022-01-13 14:50+0100\n"
 "PO-Revision-Date: 2021-06-09 13:32+0000\n"
 "Last-Translator: Florian DANIEL aka Facyla <i.daniel.florian@gmail.com>, 2021\n"
 "Language-Team: French (https://www.transifex.com/elgg/teams/11337/fr/)\n"

diff --git a/docs/locale/fr/LC_MESSAGES/design.mo b/docs/locale/fr/LC_MESSAGES/design.mo
diff --git a/docs/locale/fr/LC_MESSAGES/design.po b/docs/locale/fr/LC_MESSAGES/design.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Elgg master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-24 13:21+0100\n"
+"POT-Creation-Date: 2022-01-13 14:50+0100\n"
 "PO-Revision-Date: 2021-06-09 13:32+0000\n"
 "Last-Translator: Florian DANIEL aka Facyla <i.daniel.florian@gmail.com>, 2021\n"
 "Language-Team: French (https://www.transifex.com/elgg/teams/11337/fr/)\n"

diff --git a/docs/locale/fr/LC_MESSAGES/guides.mo b/docs/locale/fr/LC_MESSAGES/guides.mo
diff --git a/docs/locale/fr/LC_MESSAGES/guides.po b/docs/locale/fr/LC_MESSAGES/guides.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Elgg master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-24 13:21+0100\n"
+"POT-Creation-Date: 2022-01-13 14:50+0100\n"
 "PO-Revision-Date: 2021-06-09 13:32+0000\n"
 "Last-Translator: Florian DANIEL aka Facyla <i.daniel.florian@gmail.com>, 2021\n"
 "Language-Team: French (https://www.transifex.com/elgg/teams/11337/fr/)\n"

diff --git a/docs/locale/fr/LC_MESSAGES/index.mo b/docs/locale/fr/LC_MESSAGES/index.mo
diff --git a/docs/locale/fr/LC_MESSAGES/index.po b/docs/locale/fr/LC_MESSAGES/index.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Elgg master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-24 13:21+0100\n"
+"POT-Creation-Date: 2022-01-13 14:50+0100\n"
 "PO-Revision-Date: 2021-06-09 13:31+0000\n"
 "Last-Translator: Florian DANIEL aka Facyla <i.daniel.florian@gmail.com>, 2021\n"
 "Language-Team: French (https://www.transifex.com/elgg/teams/11337/fr/)\n"

diff --git a/docs/locale/fr/LC_MESSAGES/intro.mo b/docs/locale/fr/LC_MESSAGES/intro.mo
diff --git a/docs/locale/fr/LC_MESSAGES/intro.po b/docs/locale/fr/LC_MESSAGES/intro.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Elgg master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-24 13:21+0100\n"
+"POT-Creation-Date: 2022-01-13 14:50+0100\n"
 "PO-Revision-Date: 2021-06-09 13:32+0000\n"
 "Last-Translator: Florian DANIEL aka Facyla <i.daniel.florian@gmail.com>, 2021\n"
 "Language-Team: French (https://www.transifex.com/elgg/teams/11337/fr/)\n"

diff --git a/docs/locale/fr/LC_MESSAGES/plugins.mo b/docs/locale/fr/LC_MESSAGES/plugins.mo