Binary file src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.mo has changed

--- a/src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.po	Fri Jan 25 11:42:01 2019 +0100
+++ b/src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.po	Fri Jan 25 11:48:01 2019 +0100
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2019-01-23 19:41+0100\n"
+"POT-Creation-Date: 2019-01-25 11:43+0100\n"
 "PO-Revision-Date: 2015-09-10 10:42+0200\n"
 "Last-Translator: Thierry Florac <tflorac@ulthar.net>\n"
 "Language-Team: French\n"
@@ -199,7 +199,7 @@
 #: src/pyams_content/features/menu/portlet/navigation/interfaces/double.py:31
 #: src/pyams_content/features/search/portlet/interfaces.py:25
 #: src/pyams_content/root/zmi/templates/advanced-search.pt:197
-#: src/pyams_content/shared/view/portlet/interfaces.py:53
+#: src/pyams_content/shared/view/portlet/interfaces.py:52
 #: src/pyams_content/shared/common/zmi/dashboard.py:123
 #: src/pyams_content/shared/common/zmi/reverse.py:73
 #: src/pyams_content/shared/common/zmi/templates/advanced-search.pt:200
@@ -875,19 +875,19 @@
 msgid "Other settings"
 msgstr "Autres paramètres"
 
-#: src/pyams_content/component/links/__init__.py:139
+#: src/pyams_content/component/links/__init__.py:140
 msgid "Internal link"
 msgstr "Lien interne"
 
-#: src/pyams_content/component/links/__init__.py:222
+#: src/pyams_content/component/links/__init__.py:223
 msgid "External link"
 msgstr "Lien externe"
 
-#: src/pyams_content/component/links/__init__.py:268
+#: src/pyams_content/component/links/__init__.py:269
 msgid "Mailto link"
 msgstr "Lien mailto"
 
-#: src/pyams_content/component/links/__init__.py:209
+#: src/pyams_content/component/links/__init__.py:210
 msgid "target is not published"
 msgstr "le contenu ciblé n'est pas publié"
 
@@ -922,13 +922,13 @@
 
 #: src/pyams_content/component/links/interfaces.py:57
 #: src/pyams_content/features/search/portlet/interfaces.py:38
-#: src/pyams_content/shared/view/portlet/interfaces.py:100
+#: src/pyams_content/shared/view/portlet/interfaces.py:99
 msgid "Force canonical URL?"
 msgstr "Imposer l'URL canonique"
 
 #: src/pyams_content/component/links/interfaces.py:58
 #: src/pyams_content/features/search/portlet/interfaces.py:39
-#: src/pyams_content/shared/view/portlet/interfaces.py:101
+#: src/pyams_content/shared/view/portlet/interfaces.py:100
 msgid ""
 "By default, internal links use a \"relative\" URL, which tries to display "
 "link target in the current context; by using a canonical URL, you can "
@@ -3245,7 +3245,7 @@
 "Types de contenus sélectionnés ; si cette sélection est vide, tous les "
 "contenus (typés ou non) seront pris en charge"
 
-#: src/pyams_content/features/search/portlet/__init__.py:93
+#: src/pyams_content/features/search/portlet/__init__.py:95
 msgid "Search results"
 msgstr "Résultats de la recherche"
 
@@ -4304,8 +4304,8 @@
 msgstr "Date de publication affichée"
 
 #: src/pyams_content/shared/view/interfaces.py:53
-msgid "Relevance (on user search)"
-msgstr "Pertinence (si recherche lancée par l'utilisateur)"
+msgid "Relevance (on user search; if not on visible publication date)"
+msgstr "Pertinence (si recherche lancée par l'utilisateur ; sinon sur la date de publication affichée)"
 
 #: src/pyams_content/shared/view/interfaces.py:76
 msgid "Select context path?"
@@ -4371,7 +4371,7 @@
 "récent"
 
 #: src/pyams_content/shared/view/interfaces.py:124
-#: src/pyams_content/shared/view/portlet/interfaces.py:88
+#: src/pyams_content/shared/view/portlet/interfaces.py:87
 msgid "Results count limit"
 msgstr "Limite de résultats"
 
@@ -4473,23 +4473,23 @@
 msgid "Other collections"
 msgstr "Autres collections"
 
-#: src/pyams_content/shared/view/portlet/__init__.py:97
+#: src/pyams_content/shared/view/portlet/__init__.py:96
 msgid "View items"
 msgstr "Contenu d'une vue"
 
-#: src/pyams_content/shared/view/portlet/interfaces.py:36
+#: src/pyams_content/shared/view/portlet/interfaces.py:35
 msgid "Display context"
 msgstr "Contexte d'affichage"
 
-#: src/pyams_content/shared/view/portlet/interfaces.py:37
+#: src/pyams_content/shared/view/portlet/interfaces.py:36
 msgid "Content context"
 msgstr "Contexte du contenu"
 
+#: src/pyams_content/shared/view/portlet/interfaces.py:55
+msgid "Selected views"
+msgstr "Vue(s) sélectionnée(s)"
+
 #: src/pyams_content/shared/view/portlet/interfaces.py:56
-msgid "Selected views"
-msgstr "Vue(s) sélectionnée(s)"
-
-#: src/pyams_content/shared/view/portlet/interfaces.py:57
 msgid ""
 "Reference to the view(s) from which items are extracted; you can combine "
 "several views together and specify in which order they should be mixed"
@@ -4498,11 +4498,11 @@
 "plusieurs vues ensemble en indiquant la façon dont leurs résultats seront "
 "fusionnés"
 
-#: src/pyams_content/shared/view/portlet/interfaces.py:66
+#: src/pyams_content/shared/view/portlet/interfaces.py:65
 msgid "Views context"
 msgstr "Contexte des vues"
 
-#: src/pyams_content/shared/view/portlet/interfaces.py:67
+#: src/pyams_content/shared/view/portlet/interfaces.py:66
 msgid ""
 "When searching for items, a view receives a \"context\" which is the object "
 "from which settings can be extracted; this context can be the \"display\" "
@@ -4521,11 +4521,11 @@
 "contenu partagé, tandis que le contexte d'affichage est le conteneur (page "
 "d'accueil, site ou rubrique) au sein duquel le contenu est affiché."
 
-#: src/pyams_content/shared/view/portlet/interfaces.py:78
+#: src/pyams_content/shared/view/portlet/interfaces.py:77
 msgid "Views merge mode"
 msgstr "Mode de fusion des vues"
 
-#: src/pyams_content/shared/view/portlet/interfaces.py:79
+#: src/pyams_content/shared/view/portlet/interfaces.py:78
 msgid ""
 "If you select several views, you can select \"merge\" mode, which is the way "
 "used to merge items from several views"
@@ -4535,29 +4535,29 @@
 "sélectionnez qu'une seule vue, car l'ordre des résultats est alors basé "
 "uniquement sur les paramètres de la vue."
 
-#: src/pyams_content/shared/view/portlet/interfaces.py:89
+#: src/pyams_content/shared/view/portlet/interfaces.py:88
 msgid ""
 "Maximum number of results that the component may extract from merged views"
 msgstr ""
 "Nombre maximal de résultats que le composant doit extraire des vues "
 "fusionnées"
 
-#: src/pyams_content/shared/view/portlet/interfaces.py:92
+#: src/pyams_content/shared/view/portlet/interfaces.py:91
 msgid "Starting from..."
 msgstr "A partir de"
 
-#: src/pyams_content/shared/view/portlet/interfaces.py:93
+#: src/pyams_content/shared/view/portlet/interfaces.py:92
 msgid "You can skip several results if specifying an integer value here..."
 msgstr ""
 "Vous pouvez écarter un certain nombre de résultats, en indiquant ici la "
 "position du premier élément à prendre en compte"
 
-#: src/pyams_content/shared/view/portlet/interfaces.py:107
+#: src/pyams_content/shared/view/portlet/interfaces.py:106
 #: src/pyams_content/shared/view/portlet/zmi/templates/view-items-list-preview.pt:29
 msgid "Exclude from search results"
 msgstr "Exclure des résultats de recherche"
 
-#: src/pyams_content/shared/view/portlet/interfaces.py:108
+#: src/pyams_content/shared/view/portlet/interfaces.py:107
 msgid ""
 "If 'yes', and if this portlet is associated with a search engine in the same "
 "page template, items displayed by this portlet will be excluded from search "
@@ -6789,6 +6789,9 @@
 msgid "Published version {0}"
 msgstr "Version {0} publiée"
 
+#~ msgid "Relevance (on user search)"
+#~ msgstr "Pertinence (si recherche lancée par l'utilisateur)"
+
 #~ msgid "First version publication date"
 #~ msgstr "Date de publication de la première version"
 

--- a/src/pyams_content/locales/pyams_content.pot	Fri Jan 25 11:42:01 2019 +0100
+++ b/src/pyams_content/locales/pyams_content.pot	Fri Jan 25 11:48:01 2019 +0100
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2019-01-23 19:41+0100\n"
+"POT-Creation-Date: 2019-01-25 11:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -196,7 +196,7 @@
 #: ./src/pyams_content/features/menu/portlet/navigation/interfaces/double.py:31
 #: ./src/pyams_content/features/search/portlet/interfaces.py:25
 #: ./src/pyams_content/root/zmi/templates/advanced-search.pt:197
-#: ./src/pyams_content/shared/view/portlet/interfaces.py:53
+#: ./src/pyams_content/shared/view/portlet/interfaces.py:52
 #: ./src/pyams_content/shared/common/zmi/dashboard.py:123
 #: ./src/pyams_content/shared/common/zmi/reverse.py:73
 #: ./src/pyams_content/shared/common/zmi/templates/advanced-search.pt:200
@@ -833,19 +833,19 @@
 msgid "Other settings"
 msgstr ""
 
-#: ./src/pyams_content/component/links/__init__.py:139
+#: ./src/pyams_content/component/links/__init__.py:140
 msgid "Internal link"
 msgstr ""
 
-#: ./src/pyams_content/component/links/__init__.py:222
+#: ./src/pyams_content/component/links/__init__.py:223
 msgid "External link"
 msgstr ""
 
-#: ./src/pyams_content/component/links/__init__.py:268
+#: ./src/pyams_content/component/links/__init__.py:269
 msgid "Mailto link"
 msgstr ""
 
-#: ./src/pyams_content/component/links/__init__.py:209
+#: ./src/pyams_content/component/links/__init__.py:210
 msgid "target is not published"
 msgstr ""
 
@@ -876,13 +876,13 @@
 
 #: ./src/pyams_content/component/links/interfaces.py:57
 #: ./src/pyams_content/features/search/portlet/interfaces.py:38
-#: ./src/pyams_content/shared/view/portlet/interfaces.py:100
+#: ./src/pyams_content/shared/view/portlet/interfaces.py:99
 msgid "Force canonical URL?"
 msgstr ""
 
 #: ./src/pyams_content/component/links/interfaces.py:58
 #: ./src/pyams_content/features/search/portlet/interfaces.py:39
-#: ./src/pyams_content/shared/view/portlet/interfaces.py:101
+#: ./src/pyams_content/shared/view/portlet/interfaces.py:100
 msgid ""
 "By default, internal links use a \"relative\" URL, which tries to display "
 "link target in the current context; by using a canonical URL, you can display"
@@ -2983,7 +2983,7 @@
 msgid "Searched data types; leave empty for all"
 msgstr ""
 
-#: ./src/pyams_content/features/search/portlet/__init__.py:93
+#: ./src/pyams_content/features/search/portlet/__init__.py:95
 msgid "Search results"
 msgstr ""
 
@@ -4011,7 +4011,7 @@
 msgstr ""
 
 #: ./src/pyams_content/shared/view/interfaces.py:53
-msgid "Relevance (on user search)"
+msgid "Relevance (on user search; if not on visible publication date)"
 msgstr ""
 
 #: ./src/pyams_content/shared/view/interfaces.py:76
@@ -4064,7 +4064,7 @@
 msgstr ""
 
 #: ./src/pyams_content/shared/view/interfaces.py:124
-#: ./src/pyams_content/shared/view/portlet/interfaces.py:88
+#: ./src/pyams_content/shared/view/portlet/interfaces.py:87
 msgid "Results count limit"
 msgstr ""
 
@@ -4152,33 +4152,33 @@
 msgid "Other collections"
 msgstr ""
 
-#: ./src/pyams_content/shared/view/portlet/__init__.py:97
+#: ./src/pyams_content/shared/view/portlet/__init__.py:96
 msgid "View items"
 msgstr ""
 
+#: ./src/pyams_content/shared/view/portlet/interfaces.py:35
+msgid "Display context"
+msgstr ""
+
 #: ./src/pyams_content/shared/view/portlet/interfaces.py:36
-msgid "Display context"
-msgstr ""
-
-#: ./src/pyams_content/shared/view/portlet/interfaces.py:37
 msgid "Content context"
 msgstr ""
 
+#: ./src/pyams_content/shared/view/portlet/interfaces.py:55
+msgid "Selected views"
+msgstr ""
+
 #: ./src/pyams_content/shared/view/portlet/interfaces.py:56
-msgid "Selected views"
-msgstr ""
-
-#: ./src/pyams_content/shared/view/portlet/interfaces.py:57
 msgid ""
 "Reference to the view(s) from which items are extracted; you can combine "
 "several views together and specify in which order they should be mixed"
 msgstr ""
 
-#: ./src/pyams_content/shared/view/portlet/interfaces.py:66
+#: ./src/pyams_content/shared/view/portlet/interfaces.py:65
 msgid "Views context"
 msgstr ""
 
-#: ./src/pyams_content/shared/view/portlet/interfaces.py:67
+#: ./src/pyams_content/shared/view/portlet/interfaces.py:66
 msgid ""
 "When searching for items, a view receives a \"context\" which is the object "
 "from which settings can be extracted; this context can be the \"display\" "
@@ -4189,35 +4189,35 @@
 " site manager or site folder) into which content is displayed"
 msgstr ""
 
-#: ./src/pyams_content/shared/view/portlet/interfaces.py:78
+#: ./src/pyams_content/shared/view/portlet/interfaces.py:77
 msgid "Views merge mode"
 msgstr ""
 
-#: ./src/pyams_content/shared/view/portlet/interfaces.py:79
+#: ./src/pyams_content/shared/view/portlet/interfaces.py:78
 msgid ""
 "If you select several views, you can select \"merge\" mode, which is the way "
 "used to merge items from several views"
 msgstr ""
 
-#: ./src/pyams_content/shared/view/portlet/interfaces.py:89
+#: ./src/pyams_content/shared/view/portlet/interfaces.py:88
 msgid ""
 "Maximum number of results that the component may extract from merged views"
 msgstr ""
 
+#: ./src/pyams_content/shared/view/portlet/interfaces.py:91
+msgid "Starting from..."
+msgstr ""
+
 #: ./src/pyams_content/shared/view/portlet/interfaces.py:92
-msgid "Starting from..."
-msgstr ""
-
-#: ./src/pyams_content/shared/view/portlet/interfaces.py:93
 msgid "You can skip several results if specifying an integer value here..."
 msgstr ""
 
+#: ./src/pyams_content/shared/view/portlet/interfaces.py:106
+#: ./src/pyams_content/shared/view/portlet/zmi/templates/view-items-list-preview.pt:29
+msgid "Exclude from search results"
+msgstr ""
+
 #: ./src/pyams_content/shared/view/portlet/interfaces.py:107
-#: ./src/pyams_content/shared/view/portlet/zmi/templates/view-items-list-preview.pt:29
-msgid "Exclude from search results"
-msgstr ""
-
-#: ./src/pyams_content/shared/view/portlet/interfaces.py:108
 msgid ""
 "If 'yes', and if this portlet is associated with a search engine in the same "
 "page template, items displayed by this portlet will be excluded from search "

--- a/src/pyams_content/shared/view/interfaces.py	Fri Jan 25 11:42:01 2019 +0100
+++ b/src/pyams_content/shared/view/interfaces.py	Fri Jan 25 11:48:01 2019 +0100
@@ -50,7 +50,7 @@
 
 
 USER_VIEW_ORDERS = (
-    {'id': RELEVANCE_ORDER, 'title': _("Relevance (on user search)")},
+    {'id': RELEVANCE_ORDER, 'title': _("Relevance (on user search; if not on visible publication date)")},
     {'id': CREATION_DATE_ORDER, 'title': _("Published version creation date")},
     {'id': UPDATE_DATE_ORDER, 'title': _("Published version last update date")},
     {'id': PUBLICATION_DATE_ORDER, 'title': _("Current version publication date")},