Mercurial Mercurial > pyams > pyams_portal / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated label
authorThierry Florac <thierry.florac@onf.fr>
Tue, 04 Sep 2018 13:54:54 +0200
changeset 175 f91042366ca4
parent 174 9878c95a3c6f
child 176 4ac5a1814dc0
Updated label
src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.mo file | annotate | diff | comparison | revisions
src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.po file | annotate | diff | comparison | revisions
src/pyams_portal/locales/pyams_portal.pot file | annotate | diff | comparison | revisions
src/pyams_portal/zmi/layout.py file | annotate | diff | comparison | revisions 
Binary file src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.mo has changed
--- a/src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.po	Tue Sep 04 11:57:11 2018 +0200
+++ b/src/pyams_portal/locales/fr/LC_MESSAGES/pyams_portal.po	Tue Sep 04 13:54:54 2018 +0200
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2018-09-03 16:44+0200\n"
+"POT-Creation-Date: 2018-09-04 12:03+0200\n"
 "PO-Revision-Date: 2015-05-12 12:10+0200\n"
 "Last-Translator: Thierry Florac <tflorac@ulthar.net>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -38,14 +38,14 @@
 "mode!!"
 msgstr ""
 "ATTENTION : dès que vous choisissez de conserver ou non les paramètres du "
-"modèle ou du parent en (dé)cochant la case ci-dessous, cette modification est enregistrée "
-"immédiatement sans attendre votre confirmation !!"
+"modèle ou du parent en (dé)cochant la case ci-dessous, cette modification "
+"est enregistrée immédiatement sans attendre votre confirmation !!"
 
 #: src/pyams_portal/zmi/portlet.py:115
 msgid "Main properties"
 msgstr "Propriétés"
 
-#: src/pyams_portal/zmi/portlet.py:168
+#: src/pyams_portal/zmi/portlet.py:173
 #: src/pyams_portal/zmi/templates/renderer-input.pt:4
 msgid "Edit renderer properties"
 msgstr "Propriétés de ce mode de rendu"
@@ -63,13 +63,13 @@
 msgid "Override parent settings"
 msgstr "Remplacer le paramétrage du parent"
 
-#: src/pyams_portal/zmi/portlet.py:148
+#: src/pyams_portal/zmi/portlet.py:153
 msgid ""
 "You changed renderer selection. Don't omit to update new renderer "
 "properties..."
 msgstr ""
-"Vous avez changé de mode de rendu. N'oubliez pas de vérifier les propriétés du "
-"nouveau mode de rendu sélectionné..."
+"Vous avez changé de mode de rendu. N'oubliez pas de vérifier les propriétés "
+"du nouveau mode de rendu sélectionné !"
 
 #: src/pyams_portal/zmi/page.py:66
 msgid "Presentation"
@@ -132,13 +132,13 @@
 msgid "Presentation template"
 msgstr "Présentation"
 
-#: src/pyams_portal/zmi/template.py:167 src/pyams_portal/zmi/layout.py:275
-#: src/pyams_portal/zmi/layout.py:644
+#: src/pyams_portal/zmi/template.py:167 src/pyams_portal/zmi/layout.py:278
+#: src/pyams_portal/zmi/layout.py:647
 msgid "Specified name is already used!"
 msgstr "Le nom indiqué est déjà utilisé !"
 
-#: src/pyams_portal/zmi/template.py:111 src/pyams_portal/zmi/layout.py:239
-#: src/pyams_portal/zmi/layout.py:320 src/pyams_portal/zmi/layout.py:404
+#: src/pyams_portal/zmi/template.py:111 src/pyams_portal/zmi/layout.py:242
+#: src/pyams_portal/zmi/layout.py:323 src/pyams_portal/zmi/layout.py:407
 #, python-format
 msgid "« {0} »  portal template"
 msgstr "Modèle de présentation « {0} »"
@@ -152,31 +152,31 @@
 msgid "Properties"
 msgstr "Propriétés"
 
-#: src/pyams_portal/zmi/layout.py:181
+#: src/pyams_portal/zmi/layout.py:184
 msgid "Add row..."
 msgstr "Ajouter une ligne"
 
-#: src/pyams_portal/zmi/layout.py:223
+#: src/pyams_portal/zmi/layout.py:226
 msgid "Add slot..."
 msgstr "Ajouter un panneau"
 
-#: src/pyams_portal/zmi/layout.py:241
+#: src/pyams_portal/zmi/layout.py:244
 msgid "Add slot"
 msgstr "Ajouter un panneau"
 
-#: src/pyams_portal/zmi/layout.py:388
+#: src/pyams_portal/zmi/layout.py:391
 msgid "Add portlet..."
 msgstr "Ajouter un composant"
 
-#: src/pyams_portal/zmi/layout.py:406
+#: src/pyams_portal/zmi/layout.py:409
 msgid "Add portlet"
 msgstr "Ajouter un composant"
 
-#: src/pyams_portal/zmi/layout.py:583
+#: src/pyams_portal/zmi/layout.py:586
 msgid "Duplicate template..."
 msgstr "Dupliquer le modèle"
 
-#: src/pyams_portal/zmi/layout.py:603
+#: src/pyams_portal/zmi/layout.py:606
 msgid "Duplicate template"
 msgstr "Dupliquer le modèle"
 
@@ -184,19 +184,19 @@
 msgid "Template management"
 msgstr "Ce modèle"
 
-#: src/pyams_portal/zmi/layout.py:107
+#: src/pyams_portal/zmi/layout.py:110
 msgid "Template configuration"
 msgstr "Configuration d'un modèle"
 
-#: src/pyams_portal/zmi/layout.py:593
+#: src/pyams_portal/zmi/layout.py:596
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/pyams_portal/zmi/layout.py:594
+#: src/pyams_portal/zmi/layout.py:597
 msgid "Duplicate this template"
 msgstr "Dupliquer ce modèle"
 
-#: src/pyams_portal/zmi/layout.py:614
+#: src/pyams_portal/zmi/layout.py:617
 msgid "New template name"
 msgstr "Nom du nouveau modèle"
 
@@ -204,11 +204,15 @@
 msgid "Local template configuration"
 msgstr "Configuration d'un modèle local"
 
-#: src/pyams_portal/zmi/layout.py:150
+#: src/pyams_portal/zmi/layout.py:153
 msgid "{{ missing portlet }}"
 msgstr "{{ composant indisponible }}"
 
-#: src/pyams_portal/zmi/layout.py:141
+#: src/pyams_portal/zmi/layout.py:105
+msgid "Inherited local template configuration"
+msgstr "Configuration d'un modèle local hérité"
+
+#: src/pyams_portal/zmi/layout.py:144
 #, python-format
 msgid ""
 "Add component: {0}<br />Drag and drop button to page template to position "
@@ -217,12 +221,12 @@
 "Ajouter un composant : <strong>{0}</strong><br />Faire un glisser/déposer du "
 "bouton dans le modèle de présentation pour positionner le nouveau composant."
 
-#: src/pyams_portal/zmi/layout.py:325
+#: src/pyams_portal/zmi/layout.py:328
 #, python-format
 msgid "Edit « {0} » slot properties"
 msgstr "Propriétés du panneau « {0} »"
 
-#: src/pyams_portal/zmi/layout.py:105
+#: src/pyams_portal/zmi/layout.py:108
 #, python-format
 msgid "Shared template configuration ({0})"
 msgstr "Configuration d'un modèle partagé ({0})"
--- a/src/pyams_portal/locales/pyams_portal.pot	Tue Sep 04 11:57:11 2018 +0200
+++ b/src/pyams_portal/locales/pyams_portal.pot	Tue Sep 04 13:54:54 2018 +0200
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE 1.0\n"
-"POT-Creation-Date: 2018-09-03 16:44+0200\n"
+"POT-Creation-Date: 2018-09-04 12:03+0200\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"
@@ -42,7 +42,7 @@
 msgid "Main properties"
 msgstr ""
 
-#: ./src/pyams_portal/zmi/portlet.py:168
+#: ./src/pyams_portal/zmi/portlet.py:173
 #: ./src/pyams_portal/zmi/templates/renderer-input.pt:4
 msgid "Edit renderer properties"
 msgstr ""
@@ -60,7 +60,7 @@
 msgid "Override parent settings"
 msgstr ""
 
-#: ./src/pyams_portal/zmi/portlet.py:148
+#: ./src/pyams_portal/zmi/portlet.py:153
 msgid ""
 "You changed renderer selection. Don't omit to update new renderer "
 "properties..."
@@ -114,13 +114,13 @@
 msgid "Presentation template"
 msgstr ""
 
-#: ./src/pyams_portal/zmi/template.py:167 ./src/pyams_portal/zmi/layout.py:275
-#: ./src/pyams_portal/zmi/layout.py:644
+#: ./src/pyams_portal/zmi/template.py:167 ./src/pyams_portal/zmi/layout.py:278
+#: ./src/pyams_portal/zmi/layout.py:647
 msgid "Specified name is already used!"
 msgstr ""
 
-#: ./src/pyams_portal/zmi/template.py:111 ./src/pyams_portal/zmi/layout.py:239
-#: ./src/pyams_portal/zmi/layout.py:320 ./src/pyams_portal/zmi/layout.py:404
+#: ./src/pyams_portal/zmi/template.py:111 ./src/pyams_portal/zmi/layout.py:242
+#: ./src/pyams_portal/zmi/layout.py:323 ./src/pyams_portal/zmi/layout.py:407
 #, python-format
 msgid "« {0} »  portal template"
 msgstr ""
@@ -134,31 +134,31 @@
 msgid "Properties"
 msgstr ""
 
-#: ./src/pyams_portal/zmi/layout.py:181
+#: ./src/pyams_portal/zmi/layout.py:184
 msgid "Add row..."
 msgstr ""
 
-#: ./src/pyams_portal/zmi/layout.py:223
+#: ./src/pyams_portal/zmi/layout.py:226
 msgid "Add slot..."
 msgstr ""
 
-#: ./src/pyams_portal/zmi/layout.py:241
+#: ./src/pyams_portal/zmi/layout.py:244
 msgid "Add slot"
 msgstr ""
 
-#: ./src/pyams_portal/zmi/layout.py:388
+#: ./src/pyams_portal/zmi/layout.py:391
 msgid "Add portlet..."
 msgstr ""
 
-#: ./src/pyams_portal/zmi/layout.py:406
+#: ./src/pyams_portal/zmi/layout.py:409
 msgid "Add portlet"
 msgstr ""
 
-#: ./src/pyams_portal/zmi/layout.py:583
+#: ./src/pyams_portal/zmi/layout.py:586
 msgid "Duplicate template..."
 msgstr ""
 
-#: ./src/pyams_portal/zmi/layout.py:603
+#: ./src/pyams_portal/zmi/layout.py:606
 msgid "Duplicate template"
 msgstr ""
 
@@ -166,19 +166,19 @@
 msgid "Template management"
 msgstr ""
 
-#: ./src/pyams_portal/zmi/layout.py:107
+#: ./src/pyams_portal/zmi/layout.py:110
 msgid "Template configuration"
 msgstr ""
 
-#: ./src/pyams_portal/zmi/layout.py:593
+#: ./src/pyams_portal/zmi/layout.py:596
 msgid "Cancel"
 msgstr ""
 
-#: ./src/pyams_portal/zmi/layout.py:594
+#: ./src/pyams_portal/zmi/layout.py:597
 msgid "Duplicate this template"
 msgstr ""
 
-#: ./src/pyams_portal/zmi/layout.py:614
+#: ./src/pyams_portal/zmi/layout.py:617
 msgid "New template name"
 msgstr ""
 
@@ -186,23 +186,27 @@
 msgid "Local template configuration"
 msgstr ""
 
-#: ./src/pyams_portal/zmi/layout.py:150
+#: ./src/pyams_portal/zmi/layout.py:153
 msgid "{{ missing portlet }}"
 msgstr ""
 
-#: ./src/pyams_portal/zmi/layout.py:141
+#: ./src/pyams_portal/zmi/layout.py:105
+msgid "Inherited local template configuration"
+msgstr ""
+
+#: ./src/pyams_portal/zmi/layout.py:144
 #, python-format
 msgid ""
 "Add component: {0}<br />Drag and drop button to page template to position new"
 " row"
 msgstr ""
 
-#: ./src/pyams_portal/zmi/layout.py:325
+#: ./src/pyams_portal/zmi/layout.py:328
 #, python-format
 msgid "Edit « {0} » slot properties"
 msgstr ""
 
-#: ./src/pyams_portal/zmi/layout.py:105
+#: ./src/pyams_portal/zmi/layout.py:108
 #, python-format
 msgid "Shared template configuration ({0})"
 msgstr ""
--- a/src/pyams_portal/zmi/layout.py	Tue Sep 04 11:57:11 2018 +0200
+++ b/src/pyams_portal/zmi/layout.py	Tue Sep 04 13:54:54 2018 +0200
@@ -9,8 +9,6 @@
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
 #
-from pyams_utils.unicode import translate_string
-from pyams_utils.url import absolute_url
 
 __docformat__ = 'restructuredtext'
 
@@ -18,46 +16,47 @@
 # import standard library
 import json
 
-# import interfaces
-from pyams_pagelet.interfaces import IPagelet, PageletCreatedEvent
-from pyams_portal.interfaces import IPortalTemplate, IPortalTemplateConfiguration, ISlot, \
-    IPortletAddingInfo, IPortlet, ISlotConfiguration, IPortletPreviewer, IPortalTemplateContainer, \
-    IPortalTemplateContainerConfiguration, IPortalPortletsConfiguration, IPortalContext, IPortalPage, \
-    MANAGE_TEMPLATE_PERMISSION
-from pyams_skin.interfaces import IInnerPage, IPageHeader
-from pyams_skin.interfaces.viewlet import IToolbarAddingMenu, IMenuHeader, IContextActions
-from pyams_skin.layer import IPyAMSLayer
-from pyams_zmi.interfaces.menu import IPropertiesMenu, IContentManagementMenu
-from pyams_zmi.layer import IAdminLayer
+from pyramid.decorator import reify
+from pyramid.events import subscriber
+from pyramid.exceptions import NotFound
+from pyramid.view import view_config
 from transaction.interfaces import ITransactionManager
+from z3c.form import field, button
 from z3c.form.interfaces import IDataExtractedEvent, HIDDEN_MODE
+from zope.copy import copy
+from zope.interface import implementer, Invalid, Interface
 
 # import packages
 from pyams_cache.beaker import get_cache
 from pyams_form.form import AJAXAddForm, AJAXEditForm, ajax_config
 from pyams_form.schema import CloseButton
+# import interfaces
+from pyams_pagelet.interfaces import IPagelet, PageletCreatedEvent
 from pyams_pagelet.pagelet import pagelet_config
+from pyams_portal import _
+from pyams_portal.interfaces import IPortalTemplate, IPortalTemplateConfiguration, ISlot, \
+    IPortletAddingInfo, IPortlet, ISlotConfiguration, IPortletPreviewer, IPortalTemplateContainer, \
+    IPortalTemplateContainerConfiguration, IPortalPortletsConfiguration, IPortalContext, IPortalPage, \
+    MANAGE_TEMPLATE_PERMISSION, LOCAL_TEMPLATE_NAME
 from pyams_portal.portlet import PORTLETS_CACHE_REGION, PORTLETS_CACHE_NAME
 from pyams_portal.zmi.template import PortalTemplateHeaderAdapter
+from pyams_skin.interfaces import IInnerPage, IPageHeader
+from pyams_skin.interfaces.viewlet import IToolbarAddingMenu, IMenuHeader, IContextActions
+from pyams_skin.layer import IPyAMSLayer
 from pyams_skin.viewlet.menu import MenuItem
 from pyams_skin.viewlet.toolbar import JsToolbarMenuItem, ToolbarMenuDivider, ToolbarMenuItem
 from pyams_template.template import template_config
 from pyams_utils.adapter import adapter_config
 from pyams_utils.registry import query_utility, get_utility
 from pyams_utils.traversing import get_parent
+from pyams_utils.unicode import translate_string
+from pyams_utils.url import absolute_url
 from pyams_viewlet.manager import viewletmanager_config
 from pyams_viewlet.viewlet import viewlet_config
 from pyams_zmi.form import AdminDialogAddForm, AdminDialogEditForm
+from pyams_zmi.interfaces.menu import IPropertiesMenu, IContentManagementMenu
+from pyams_zmi.layer import IAdminLayer
 from pyams_zmi.view import AdminView
-from pyramid.decorator import reify
-from pyramid.events import subscriber
-from pyramid.exceptions import NotFound
-from pyramid.view import view_config
-from z3c.form import field, button
-from zope.copy import copy
-from zope.interface import implementer, Invalid, Interface
-
-from pyams_portal import _
 
 
 @adapter_config(context=(IPortalTemplate, IContentManagementMenu), provides=IMenuHeader)
@@ -101,8 +100,11 @@
             if page.use_local_template:
                 return _("Local template configuration")
             else:
-                translate = self.request.localizer.translate
-                return translate(_("Shared template configuration ({0})")).format(page.template.name)
+                if page.template.name == LOCAL_TEMPLATE_NAME:
+                    return _("Inherited local template configuration")
+                else:
+                    translate = self.request.localizer.translate
+                    return translate(_("Shared template configuration ({0})")).format(page.template.name)
         else:
             return _("Template configuration")
pyams/pyams_portal