# HG changeset patch # User Thierry Florac # Date 1537278016 -7200 # Node ID 9395a088cd463985da6a508fc5f52d93b74ef135 # Parent 12ad545bc649d4d7bf057e52fd74a5876c575a67 Updated logos shared tool diff -r 12ad545bc649 -r 9395a088cd46 src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.mo Binary file src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.mo has changed diff -r 12ad545bc649 -r 9395a088cd46 src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.po --- a/src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.po Mon Sep 17 17:37:46 2018 +0200 +++ b/src/pyams_content/locales/fr/LC_MESSAGES/pyams_content.po Tue Sep 18 15:40:16 2018 +0200 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2018-09-13 17:03+0200\n" +"POT-Creation-Date: 2018-09-18 15:23+0200\n" "PO-Revision-Date: 2015-09-10 10:42+0200\n" "Last-Translator: Thierry Florac \n" "Language-Team: French\n" @@ -80,7 +80,7 @@ msgid "Guest user (role)" msgstr "Invité (rôle)" -#: src/pyams_content/component/gallery/__init__.py:154 +#: src/pyams_content/component/gallery/__init__.py:153 msgid "Gallery" msgstr "Galerie de médias" @@ -286,6 +286,7 @@ #: src/pyams_content/shared/view/portlet/interfaces.py:56 #: src/pyams_content/shared/imagemap/zmi/container.py:123 #: src/pyams_content/shared/site/zmi/folder.py:71 +#: src/pyams_content/shared/logo/interfaces/__init__.py:48 #: src/pyams_content/root/zmi/templates/advanced-search.pt:197 #: src/pyams_content/interfaces/__init__.py:101 #: src/pyams_content/reference/pictograms/zmi/__init__.py:150 @@ -449,7 +450,7 @@ "Cliquez sur le bouton 'Parcourir...' pour sélectionner un nouveau contenu" #: src/pyams_content/component/extfile/interfaces/__init__.py:73 -#: src/pyams_content/shared/logo/interfaces/__init__.py:48 +#: src/pyams_content/shared/logo/interfaces/__init__.py:61 msgid "Image data" msgstr "Fichier" @@ -1010,11 +1011,11 @@ msgid "Edit header paragraph properties" msgstr "Propriétés du chapô" -#: src/pyams_content/component/paragraph/portlet/__init__.py:84 +#: src/pyams_content/component/paragraph/portlet/__init__.py:82 msgid "Content paragraphs" msgstr "Blocs de contenu" -#: src/pyams_content/component/paragraph/portlet/__init__.py:137 +#: src/pyams_content/component/paragraph/portlet/__init__.py:135 msgid "Paragraphs navigation anchors" msgstr "Navigation au sein des blocs" @@ -1099,7 +1100,8 @@ #: src/pyams_content/component/paragraph/portlet/interfaces/__init__.py:53 msgid "If 'no', content's title will not be repeated into navigation portlet" msgstr "" -"Si 'non', le titre du gabarit ne sera pas répété dans le composant de navigation" +"Si 'non', le titre du gabarit ne sera pas répété dans le composant de " +"navigation" #: src/pyams_content/component/paragraph/portlet/interfaces/__init__.py:58 msgid "" @@ -1107,23 +1109,25 @@ "all paragraphs will be selectable by following filters; otherwise, this " "selection will have priority" msgstr "" -"Liste des blocs sélectionnés pour la navigation ; si la sélection est vide, tous les blocs de " -"contenu pourront être sélectionnés via les filtres ci-dessous ; dans le cas " -"contraire, cette sélection devient prioritaire et les autres filtres ne sont " -"pas appliqués" +"Liste des blocs sélectionnés pour la navigation ; si la sélection est vide, " +"tous les blocs de contenu pourront être sélectionnés via les filtres ci-" +"dessous ; dans le cas contraire, cette sélection devient prioritaire et les " +"autres filtres ne sont pas appliqués" #: src/pyams_content/component/paragraph/portlet/interfaces/__init__.py:65 msgid "" "Select list of paragraph types you want to use for navigation; an empty " "selection means that all paragraphs types will be selected" msgstr "" -"Liste des types de blocs que vous souhaitez sélectionner pour la navigation ; si la sélection " -"est vide, tous les types de blocs seront pris en compte" +"Liste des types de blocs que vous souhaitez sélectionner pour la " +"navigation ; si la sélection est vide, tous les types de blocs seront pris " +"en compte" #: src/pyams_content/component/paragraph/portlet/interfaces/__init__.py:71 msgid "If 'no', all paragraphs will be used as navigation anchors" msgstr "" -"Si 'non', tous les blocs seront utilisés comme liens de navigation même si ce ne sont pas des ancres" +"Si 'non', tous les blocs seront utilisés comme liens de navigation même si " +"ce ne sont pas des ancres" #: src/pyams_content/component/paragraph/interfaces/milestone.py:39 msgid "Is this milestone visible in front-office?" @@ -1176,7 +1180,7 @@ #: src/pyams_content/component/paragraph/interfaces/html.py:46 #: src/pyams_content/component/paragraph/interfaces/html.py:67 #: src/pyams_content/shared/imagemap/interfaces/__init__.py:101 -#: src/pyams_content/shared/logo/interfaces/__init__.py:82 +#: src/pyams_content/shared/logo/interfaces/__init__.py:91 msgid "Presentation template used for this paragraph" msgstr "Mode de rendu utilisé par ce bloc de contenu" @@ -1206,8 +1210,8 @@ msgstr "Liste des types de blocs de contenu autorisés pour ce gabarit." #: src/pyams_content/component/paragraph/interfaces/__init__.py:97 -#: src/pyams_content/shared/common/zmi/types.py:172 -#: src/pyams_content/shared/common/zmi/types.py:412 +#: src/pyams_content/shared/common/zmi/types.py:173 +#: src/pyams_content/shared/common/zmi/types.py:413 msgid "Default paragraphs" msgstr "Types de blocs par défaut" @@ -1447,7 +1451,7 @@ #: src/pyams_content/component/paragraph/interfaces/header.py:33 #: src/pyams_content/component/paragraph/interfaces/header.py:40 -#: src/pyams_content/shared/common/interfaces/__init__.py:153 +#: src/pyams_content/shared/common/interfaces/__init__.py:156 msgid "Header" msgstr "Chapô" @@ -1552,25 +1556,27 @@ #: src/pyams_content/component/theme/interfaces/__init__.py:41 msgid "Enable search by tag?" -msgstr "" +msgstr "Activer la recherche par tag ?" #: src/pyams_content/component/theme/interfaces/__init__.py:42 msgid "" "If 'yes', displayed tags will lead to a search engine displaying contents " "matching given tag" msgstr "" +"Si 'oui', un clic sur un tag permet d'accéder à une page de résultat de recherche " +"portant sur le tag sélectionné" #: src/pyams_content/component/theme/interfaces/__init__.py:47 msgid "Tags search target" -msgstr "" +msgstr "Cible de la recherche" #: src/pyams_content/component/theme/interfaces/__init__.py:48 msgid "Site or folder where tags search is displayed" -msgstr "" +msgstr "Site ou rubrique où la recherche par tags s'effectue" #: src/pyams_content/component/theme/interfaces/__init__.py:54 msgid "You must specify search target when activating search by tags!" -msgstr "" +msgstr "Vous devez indiquer la cible de la recherche lorsque vous activez la recherche par tags !" #: src/pyams_content/component/association/container.py:91 #: src/pyams_content/component/association/zmi/__init__.py:303 @@ -2034,19 +2040,19 @@ msgid "Name of external platform providing selected video" msgstr "Nom de la plate-forme externe fournissant la vidéo à afficher" -#: src/pyams_content/shared/common/__init__.py:242 -#: src/pyams_content/shared/common/zmi/properties.py:69 +#: src/pyams_content/shared/common/__init__.py:245 +#: src/pyams_content/shared/common/zmi/properties.py:70 #: src/pyams_content/shared/common/zmi/manager.py:96 msgid "Properties" msgstr "Propriétés" -#: src/pyams_content/shared/common/__init__.py:152 -#: src/pyams_content/shared/common/__init__.py:160 +#: src/pyams_content/shared/common/__init__.py:155 +#: src/pyams_content/shared/common/__init__.py:163 #, python-format msgid "{date} by {principal}" msgstr "{date} par {principal}" -#: src/pyams_content/shared/common/__init__.py:265 +#: src/pyams_content/shared/common/__init__.py:268 #, python-format msgid "title length should be between 40 and 66 characters ({length} actually)" msgstr "" @@ -2100,84 +2106,84 @@ msgid "Modified before..." msgstr "et le" -#: src/pyams_content/shared/common/zmi/properties.py:59 +#: src/pyams_content/shared/common/zmi/properties.py:60 msgid "Composition" msgstr "Composition" -#: src/pyams_content/shared/common/zmi/properties.py:82 +#: src/pyams_content/shared/common/zmi/properties.py:83 msgid "Content properties" msgstr "Propriétés élémentaires" -#: src/pyams_content/shared/common/zmi/types.py:70 +#: src/pyams_content/shared/common/zmi/types.py:71 msgid "Data types" msgstr "Types de contenus" -#: src/pyams_content/shared/common/zmi/types.py:148 +#: src/pyams_content/shared/common/zmi/types.py:149 msgid "Data type label" msgstr "Libellé du type" -#: src/pyams_content/shared/common/zmi/types.py:188 -#: src/pyams_content/shared/common/zmi/types.py:428 +#: src/pyams_content/shared/common/zmi/types.py:189 +#: src/pyams_content/shared/common/zmi/types.py:429 msgid "Default associations" msgstr "Liens et pièces jointes par défaut" -#: src/pyams_content/shared/common/zmi/types.py:204 +#: src/pyams_content/shared/common/zmi/types.py:205 msgid "Default themes" msgstr "Thèmes par défaut" -#: src/pyams_content/shared/common/zmi/types.py:232 +#: src/pyams_content/shared/common/zmi/types.py:233 msgid "Content data types" msgstr "Types de contenus" -#: src/pyams_content/shared/common/zmi/types.py:255 +#: src/pyams_content/shared/common/zmi/types.py:256 msgid "Add data type" msgstr "Ajouter un type" -#: src/pyams_content/shared/common/zmi/types.py:267 +#: src/pyams_content/shared/common/zmi/types.py:268 msgid "Add new data type" msgstr "Ajout d'un type de contenu" -#: src/pyams_content/shared/common/zmi/types.py:310 +#: src/pyams_content/shared/common/zmi/types.py:311 msgid "Data type properties" msgstr "Propriétés du type de contenu" -#: src/pyams_content/shared/common/zmi/types.py:391 +#: src/pyams_content/shared/common/zmi/types.py:392 msgid "Subtype label" msgstr "Libellé du sous-type" -#: src/pyams_content/shared/common/zmi/types.py:472 +#: src/pyams_content/shared/common/zmi/types.py:473 msgid "Add subtype" msgstr "Ajouter un sous-type" -#: src/pyams_content/shared/common/zmi/types.py:484 +#: src/pyams_content/shared/common/zmi/types.py:485 msgid "Add new subtype" msgstr "Ajout d'un sous-type de contenu" -#: src/pyams_content/shared/common/zmi/types.py:531 +#: src/pyams_content/shared/common/zmi/types.py:532 msgid "Data subtype properties" msgstr "Propriétés du fichier standard" -#: src/pyams_content/shared/common/zmi/types.py:573 +#: src/pyams_content/shared/common/zmi/types.py:574 msgid "Select content type..." msgstr "Sélectionnez un type de contenu..." -#: src/pyams_content/shared/common/zmi/types.py:115 +#: src/pyams_content/shared/common/zmi/types.py:116 msgid "No currently defined data type." msgstr "Aucun type de contenu n'est actuellement défini." -#: src/pyams_content/shared/common/zmi/types.py:300 +#: src/pyams_content/shared/common/zmi/types.py:301 msgid "Specified type name is already used!" msgstr "Le nom indiqué pour ce type de contenu est déjà utilisé !" -#: src/pyams_content/shared/common/zmi/types.py:507 +#: src/pyams_content/shared/common/zmi/types.py:508 msgid "Subtype was correctly added." msgstr "Le sous-type a été ajouté." -#: src/pyams_content/shared/common/zmi/types.py:521 +#: src/pyams_content/shared/common/zmi/types.py:522 msgid "Specified subtype name is already used!" msgstr "Le nom indiqué pour ce sous-type de contenu est déjà utilisé !" -#: src/pyams_content/shared/common/zmi/types.py:160 +#: src/pyams_content/shared/common/zmi/types.py:161 msgid "Click to see subtypes" msgstr "Montrer ou caher les sous-types" @@ -3281,22 +3287,22 @@ msgid "Type of content data" msgstr "Type du contenu associé à ce gabarit" -#: src/pyams_content/shared/common/interfaces/__init__.py:45 +#: src/pyams_content/shared/common/interfaces/__init__.py:46 #: src/pyams_content/root/interfaces/__init__.py:43 msgid "Webmasters" msgstr "Webmestres" -#: src/pyams_content/shared/common/interfaces/__init__.py:46 +#: src/pyams_content/shared/common/interfaces/__init__.py:47 msgid "Webmasters can handle all contents, including published ones" msgstr "" "Les webmestres peuvent modifier et gérer tous les contenus, y compris ceux " "qui sont publiés et hormis ceux qui sont archivés" -#: src/pyams_content/shared/common/interfaces/__init__.py:50 +#: src/pyams_content/shared/common/interfaces/__init__.py:51 msgid "Pilots" msgstr "Pilotes" -#: src/pyams_content/shared/common/interfaces/__init__.py:51 +#: src/pyams_content/shared/common/interfaces/__init__.py:52 msgid "" "Pilots can handle tool configuration, manage access rules, grant users roles " "and manage managers restrictions" @@ -3305,13 +3311,13 @@ "et les contributeurs, et limitent si nécessaire l'intervention des " "responsables à certains contenus" -#: src/pyams_content/shared/common/interfaces/__init__.py:56 -#: src/pyams_content/shared/common/interfaces/__init__.py:196 +#: src/pyams_content/shared/common/interfaces/__init__.py:57 +#: src/pyams_content/shared/common/interfaces/__init__.py:201 msgid "Managers" msgstr "Responsables" -#: src/pyams_content/shared/common/interfaces/__init__.py:57 -#: src/pyams_content/shared/common/interfaces/__init__.py:197 +#: src/pyams_content/shared/common/interfaces/__init__.py:58 +#: src/pyams_content/shared/common/interfaces/__init__.py:202 msgid "" "Managers can handle main operations in tool's workflow, like publish or " "retire contents" @@ -3320,38 +3326,38 @@ "(comme la publication ou le retrait des contenus), dans la limite des " "restrictions qui leur sont imposées" -#: src/pyams_content/shared/common/interfaces/__init__.py:62 -#: src/pyams_content/shared/common/interfaces/__init__.py:202 +#: src/pyams_content/shared/common/interfaces/__init__.py:63 +#: src/pyams_content/shared/common/interfaces/__init__.py:207 msgid "Contributors" msgstr "Contributeurs" -#: src/pyams_content/shared/common/interfaces/__init__.py:63 +#: src/pyams_content/shared/common/interfaces/__init__.py:64 msgid "Contributors are users which are allowed to create new contents" msgstr "Les contributeurs sont autorisés à créer de nouveaux contenus" -#: src/pyams_content/shared/common/interfaces/__init__.py:67 -#: src/pyams_content/shared/common/interfaces/__init__.py:208 -msgid "Designers" -msgstr "Designers" - #: src/pyams_content/shared/common/interfaces/__init__.py:68 -#: src/pyams_content/shared/common/interfaces/__init__.py:209 +#: src/pyams_content/shared/common/interfaces/__init__.py:213 +msgid "Designers" +msgstr "Designers" + +#: src/pyams_content/shared/common/interfaces/__init__.py:69 +#: src/pyams_content/shared/common/interfaces/__init__.py:214 msgid "Designers are users which are allowed to manage presentation templates" msgstr "Les designers sont autorisés à configurer les modèles de présentation" -#: src/pyams_content/shared/common/interfaces/__init__.py:94 -msgid "Workflow name" -msgstr "Nom du workflow" - #: src/pyams_content/shared/common/interfaces/__init__.py:95 +msgid "Workflow name" +msgstr "Nom du workflow" + +#: src/pyams_content/shared/common/interfaces/__init__.py:96 msgid "Name of workflow utility used to manage tool contents" msgstr "Nom du workflow qui gère le cycle de vie des contenus de cet outil" -#: src/pyams_content/shared/common/interfaces/__init__.py:123 +#: src/pyams_content/shared/common/interfaces/__init__.py:124 msgid "Content URL" msgstr "URL du contenu" -#: src/pyams_content/shared/common/interfaces/__init__.py:124 +#: src/pyams_content/shared/common/interfaces/__init__.py:125 msgid "" "URL used to access this content; this is important for SEO and should " "include most important words describing content; spaces and underscores will " @@ -3365,11 +3371,11 @@ "d'union, les lettres accentuées par leur équivalent sans accent, et les mots " "de moins de trois lettres sont supprimés." -#: src/pyams_content/shared/common/interfaces/__init__.py:129 +#: src/pyams_content/shared/common/interfaces/__init__.py:132 msgid "Version creator" msgstr "À l'origine de cette version" -#: src/pyams_content/shared/common/interfaces/__init__.py:130 +#: src/pyams_content/shared/common/interfaces/__init__.py:133 msgid "" "Name of content's version creator. The creator of the first version is also " "it's owner." @@ -3377,47 +3383,47 @@ "Nom du créateur de cette version. Le créateur de la première version d'un " "contenu est aussi son propriétaire." -#: src/pyams_content/shared/common/interfaces/__init__.py:134 +#: src/pyams_content/shared/common/interfaces/__init__.py:137 msgid "First owner" msgstr "Premier propriétaire" -#: src/pyams_content/shared/common/interfaces/__init__.py:135 +#: src/pyams_content/shared/common/interfaces/__init__.py:138 msgid "Name of content's first version owner" msgstr "Nom de l'utilisateur ayant créé la première version" -#: src/pyams_content/shared/common/interfaces/__init__.py:139 +#: src/pyams_content/shared/common/interfaces/__init__.py:142 msgid "Version creation" msgstr "Date de création" -#: src/pyams_content/shared/common/interfaces/__init__.py:142 +#: src/pyams_content/shared/common/interfaces/__init__.py:145 msgid "Version modifiers" msgstr "Intervenants" -#: src/pyams_content/shared/common/interfaces/__init__.py:143 -msgid "List of principals who modified this content" -msgstr "Liste des utilisateurs qui sont intervenus sur cette version" - #: src/pyams_content/shared/common/interfaces/__init__.py:146 +msgid "List of principals who modified this content" +msgstr "Liste des utilisateurs qui sont intervenus sur cette version" + +#: src/pyams_content/shared/common/interfaces/__init__.py:149 msgid "Last modifier" msgstr "Dernier intervenant" -#: src/pyams_content/shared/common/interfaces/__init__.py:147 +#: src/pyams_content/shared/common/interfaces/__init__.py:150 msgid "Last principal who modified this content" msgstr "Dernier utilisateur étant intervenu sur ce contenu" -#: src/pyams_content/shared/common/interfaces/__init__.py:150 +#: src/pyams_content/shared/common/interfaces/__init__.py:153 msgid "Last update" msgstr "Dernière modification" -#: src/pyams_content/shared/common/interfaces/__init__.py:154 +#: src/pyams_content/shared/common/interfaces/__init__.py:157 msgid "Content's header is generally displayed in page header" msgstr "Le chapô du contenu est généralement affiché en tête de page" -#: src/pyams_content/shared/common/interfaces/__init__.py:159 +#: src/pyams_content/shared/common/interfaces/__init__.py:162 msgid "Meta-description" msgstr "Méta-description" -#: src/pyams_content/shared/common/interfaces/__init__.py:160 +#: src/pyams_content/shared/common/interfaces/__init__.py:163 msgid "" "The content's description is 'hidden' into HTML's page headers; but it can " "be seen, for example, in some search engines results as content's " @@ -3428,21 +3434,21 @@ "moteurs de recherche ; si la description n'est pas renseignée, le chapô " "(s'il existe pour ce contenu) sera utilisé." -#: src/pyams_content/shared/common/interfaces/__init__.py:165 +#: src/pyams_content/shared/common/interfaces/__init__.py:170 msgid "Keywords" msgstr "Mots-clés" -#: src/pyams_content/shared/common/interfaces/__init__.py:166 +#: src/pyams_content/shared/common/interfaces/__init__.py:171 msgid "They will be included into HTML pages metadata" msgstr "Ces mots-clés seront intégrés dans les métadonnées des pages HTML" -#: src/pyams_content/shared/common/interfaces/__init__.py:169 +#: src/pyams_content/shared/common/interfaces/__init__.py:174 #: src/pyams_content/shared/site/zmi/folder.py:79 #: src/pyams_content/shared/site/interfaces/__init__.py:76 msgid "Notepad" msgstr "Bloc-notes" -#: src/pyams_content/shared/common/interfaces/__init__.py:170 +#: src/pyams_content/shared/common/interfaces/__init__.py:175 #: src/pyams_content/shared/site/zmi/folder.py:80 #: src/pyams_content/shared/site/interfaces/__init__.py:77 msgid "Internal information to be known about this content" @@ -3450,11 +3456,11 @@ "Pour prendre note d'informations internes utiles ou importantes à propos de " "ce contenu ; ces notes ne seront pas publiées sur internet." -#: src/pyams_content/shared/common/interfaces/__init__.py:189 +#: src/pyams_content/shared/common/interfaces/__init__.py:194 msgid "Content owner" msgstr "Propriétaire" -#: src/pyams_content/shared/common/interfaces/__init__.py:190 +#: src/pyams_content/shared/common/interfaces/__init__.py:195 msgid "" "The owner is the creator of content's first version, except if it was " "transferred afterwards to another owner" @@ -3463,7 +3469,7 @@ "lorsque cette propriété a été transférée à un autre utilisateur après coup. " "Les contenus archivés ne sont plus transférables." -#: src/pyams_content/shared/common/interfaces/__init__.py:203 +#: src/pyams_content/shared/common/interfaces/__init__.py:208 msgid "" "Contributors are users which are allowed to update this content in addition " "to it's owner" @@ -3471,11 +3477,11 @@ "Les contributeurs sont autorisés, en plus du propriétaire, à modifier ce " "contenu" -#: src/pyams_content/shared/common/interfaces/__init__.py:213 +#: src/pyams_content/shared/common/interfaces/__init__.py:218 msgid "Readers" msgstr "Relecteurs" -#: src/pyams_content/shared/common/interfaces/__init__.py:214 +#: src/pyams_content/shared/common/interfaces/__init__.py:219 msgid "" "Readers are users which are asked to verify and comment contents before they " "are published" @@ -3483,27 +3489,27 @@ "Les relecteurs sont des utilisateurs qui sont sollicités pour vérifier et " "commenter un contenu avant sa publication" -#: src/pyams_content/shared/common/interfaces/__init__.py:219 +#: src/pyams_content/shared/common/interfaces/__init__.py:224 msgid "Guests" msgstr "Invités" -#: src/pyams_content/shared/common/interfaces/__init__.py:220 +#: src/pyams_content/shared/common/interfaces/__init__.py:225 msgid "" "Guests are users which are allowed to view contents with restricted access" msgstr "" "Les invités sont autorisés à consulter des contenus dont l'accès a été " "restreint" -#: src/pyams_content/shared/common/interfaces/__init__.py:243 +#: src/pyams_content/shared/common/interfaces/__init__.py:248 msgid "Principal ID" msgstr "ID utilisateur" -#: src/pyams_content/shared/common/interfaces/__init__.py:282 -#: src/pyams_content/shared/common/interfaces/__init__.py:307 +#: src/pyams_content/shared/common/interfaces/__init__.py:287 +#: src/pyams_content/shared/common/interfaces/__init__.py:312 msgid "Publication checks" msgstr "Activer le tunnel de publication" -#: src/pyams_content/shared/common/interfaces/__init__.py:283 +#: src/pyams_content/shared/common/interfaces/__init__.py:288 msgid "" "If 'yes', this contributor will have to confirm that contents have been " "previewed and checked before asking for publication" @@ -3511,7 +3517,7 @@ "Si 'oui', ce contributeur devra confirmer qu'il a bien prévisualisé et " "audité chaque contenu avant de pouvoir effectuer une demande de publication" -#: src/pyams_content/shared/common/interfaces/__init__.py:308 +#: src/pyams_content/shared/common/interfaces/__init__.py:313 msgid "" "If 'yes', this manager will have to confirm that contents have been " "previewed and checked before publishing a content" @@ -3519,11 +3525,11 @@ "Si 'oui', ce responsable devra confirmer qu'il a bien prévisualisé et audité " "chaque contenu avant de pouvoir effectuer une publication" -#: src/pyams_content/shared/common/interfaces/__init__.py:313 +#: src/pyams_content/shared/common/interfaces/__init__.py:318 msgid "Restricted contents" msgstr "Accès restreints" -#: src/pyams_content/shared/common/interfaces/__init__.py:314 +#: src/pyams_content/shared/common/interfaces/__init__.py:319 msgid "" "If 'yes', this manager will get restricted access to manage contents based " "on selected settings" @@ -3531,11 +3537,11 @@ "Si 'oui', ce responsable n'aura qu'un accès restreint à certains contenus en " "fonction de paramètres spécifiques" -#: src/pyams_content/shared/common/interfaces/__init__.py:319 +#: src/pyams_content/shared/common/interfaces/__init__.py:324 msgid "Selected owners" msgstr "Propriétaires" -#: src/pyams_content/shared/common/interfaces/__init__.py:320 +#: src/pyams_content/shared/common/interfaces/__init__.py:325 msgid "Manager will have access to contents owned by these principals" msgstr "" "Le responsable n'aura accès qu'aux contenus dont ces utilisateurs sont " @@ -4516,11 +4522,11 @@ msgid "logo '{0}' is not published" msgstr "le logo '{0}' n'est pas publié" -#: src/pyams_content/shared/logo/__init__.py:69 +#: src/pyams_content/shared/logo/__init__.py:74 msgid "no image defined" msgstr "aucune image définie" -#: src/pyams_content/shared/logo/__init__.py:72 +#: src/pyams_content/shared/logo/__init__.py:77 msgid "no URL defined" msgstr "aucune URL définie" @@ -4532,9 +4538,9 @@ msgid "Add new logos paragraph" msgstr "Ajout d'une sélection de logos" -#: src/pyams_content/shared/logo/zmi/properties.py:40 +#: src/pyams_content/shared/logo/zmi/properties.py:52 msgid "Main logo settings" -msgstr "Propriétés du logo" +msgstr "Autres propriétés" #: src/pyams_content/shared/logo/zmi/__init__.py:45 msgid "This logo" @@ -4550,37 +4556,49 @@ msgid "Logo « {title} »" msgstr "Logo « {title} »" -#: src/pyams_content/shared/logo/interfaces/__init__.py:33 +#: src/pyams_content/shared/logo/interfaces/__init__.py:34 msgid "Logo" msgstr "Logo" -#: src/pyams_content/shared/logo/interfaces/__init__.py:70 +#: src/pyams_content/shared/logo/interfaces/__init__.py:79 msgid "Logos" msgstr "Logos" -#: src/pyams_content/shared/logo/interfaces/__init__.py:47 +#: src/pyams_content/shared/logo/interfaces/__init__.py:49 +msgid "Full name of logo organization" +msgstr "Nom complet de l'organisme associé au logo" + +#: src/pyams_content/shared/logo/interfaces/__init__.py:52 +msgid "Acronym" +msgstr "Acronyme" + +#: src/pyams_content/shared/logo/interfaces/__init__.py:53 +msgid "Matching logo acronym, without spaces or separators" +msgstr "Acronyme de l'organisme, sans espace ni séparateur entre les lettres" + +#: src/pyams_content/shared/logo/interfaces/__init__.py:60 msgid "Image (colored)" msgstr "Image (version couleur)" -#: src/pyams_content/shared/logo/interfaces/__init__.py:51 +#: src/pyams_content/shared/logo/interfaces/__init__.py:64 msgid "Image (monochrome)" msgstr "Image (version noir et blanc)" -#: src/pyams_content/shared/logo/interfaces/__init__.py:52 +#: src/pyams_content/shared/logo/interfaces/__init__.py:65 msgid "An alternate image which can be used by some presentation templates" msgstr "" "Image de substitution monochrome pouvant être utilisée par certains modes de " "rendu" -#: src/pyams_content/shared/logo/interfaces/__init__.py:77 +#: src/pyams_content/shared/logo/interfaces/__init__.py:86 msgid "Logos references" msgstr "Logos sélectionnés" -#: src/pyams_content/shared/logo/interfaces/__init__.py:78 +#: src/pyams_content/shared/logo/interfaces/__init__.py:87 msgid "List of internal logos references" msgstr "Liste de références internes vers les logos à afficher" -#: src/pyams_content/shared/logo/interfaces/__init__.py:81 +#: src/pyams_content/shared/logo/interfaces/__init__.py:90 msgid "Logos template" msgstr "Mode de rendu" diff -r 12ad545bc649 -r 9395a088cd46 src/pyams_content/locales/pyams_content.pot --- a/src/pyams_content/locales/pyams_content.pot Mon Sep 17 17:37:46 2018 +0200 +++ b/src/pyams_content/locales/pyams_content.pot Tue Sep 18 15:40:16 2018 +0200 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE 1.0\n" -"POT-Creation-Date: 2018-09-13 17:03+0200\n" +"POT-Creation-Date: 2018-09-18 15:23+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" @@ -81,7 +81,7 @@ msgid "Guest user (role)" msgstr "" -#: ./src/pyams_content/component/gallery/__init__.py:154 +#: ./src/pyams_content/component/gallery/__init__.py:153 msgid "Gallery" msgstr "" @@ -276,6 +276,7 @@ #: ./src/pyams_content/shared/view/portlet/interfaces.py:56 #: ./src/pyams_content/shared/imagemap/zmi/container.py:123 #: ./src/pyams_content/shared/site/zmi/folder.py:71 +#: ./src/pyams_content/shared/logo/interfaces/__init__.py:48 #: ./src/pyams_content/root/zmi/templates/advanced-search.pt:197 #: ./src/pyams_content/interfaces/__init__.py:101 #: ./src/pyams_content/reference/pictograms/zmi/__init__.py:150 @@ -432,7 +433,7 @@ msgstr "" #: ./src/pyams_content/component/extfile/interfaces/__init__.py:73 -#: ./src/pyams_content/shared/logo/interfaces/__init__.py:48 +#: ./src/pyams_content/shared/logo/interfaces/__init__.py:61 msgid "Image data" msgstr "" @@ -964,11 +965,11 @@ msgid "Edit header paragraph properties" msgstr "" -#: ./src/pyams_content/component/paragraph/portlet/__init__.py:84 +#: ./src/pyams_content/component/paragraph/portlet/__init__.py:82 msgid "Content paragraphs" msgstr "" -#: ./src/pyams_content/component/paragraph/portlet/__init__.py:137 +#: ./src/pyams_content/component/paragraph/portlet/__init__.py:135 msgid "Paragraphs navigation anchors" msgstr "" @@ -1110,7 +1111,7 @@ #: ./src/pyams_content/component/paragraph/interfaces/html.py:46 #: ./src/pyams_content/component/paragraph/interfaces/html.py:67 #: ./src/pyams_content/shared/imagemap/interfaces/__init__.py:101 -#: ./src/pyams_content/shared/logo/interfaces/__init__.py:82 +#: ./src/pyams_content/shared/logo/interfaces/__init__.py:91 msgid "Presentation template used for this paragraph" msgstr "" @@ -1139,8 +1140,8 @@ msgstr "" #: ./src/pyams_content/component/paragraph/interfaces/__init__.py:97 -#: ./src/pyams_content/shared/common/zmi/types.py:172 -#: ./src/pyams_content/shared/common/zmi/types.py:412 +#: ./src/pyams_content/shared/common/zmi/types.py:173 +#: ./src/pyams_content/shared/common/zmi/types.py:413 msgid "Default paragraphs" msgstr "" @@ -1373,7 +1374,7 @@ #: ./src/pyams_content/component/paragraph/interfaces/header.py:33 #: ./src/pyams_content/component/paragraph/interfaces/header.py:40 -#: ./src/pyams_content/shared/common/interfaces/__init__.py:153 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:156 msgid "Header" msgstr "" @@ -1928,19 +1929,19 @@ msgid "Name of external platform providing selected video" msgstr "" -#: ./src/pyams_content/shared/common/__init__.py:242 -#: ./src/pyams_content/shared/common/zmi/properties.py:69 +#: ./src/pyams_content/shared/common/__init__.py:245 +#: ./src/pyams_content/shared/common/zmi/properties.py:70 #: ./src/pyams_content/shared/common/zmi/manager.py:96 msgid "Properties" msgstr "" -#: ./src/pyams_content/shared/common/__init__.py:152 -#: ./src/pyams_content/shared/common/__init__.py:160 +#: ./src/pyams_content/shared/common/__init__.py:155 +#: ./src/pyams_content/shared/common/__init__.py:163 #, python-format msgid "{date} by {principal}" msgstr "" -#: ./src/pyams_content/shared/common/__init__.py:265 +#: ./src/pyams_content/shared/common/__init__.py:268 #, python-format msgid "title length should be between 40 and 66 characters ({length} actually)" msgstr "" @@ -1993,84 +1994,84 @@ msgid "Modified before..." msgstr "" -#: ./src/pyams_content/shared/common/zmi/properties.py:59 +#: ./src/pyams_content/shared/common/zmi/properties.py:60 msgid "Composition" msgstr "" -#: ./src/pyams_content/shared/common/zmi/properties.py:82 +#: ./src/pyams_content/shared/common/zmi/properties.py:83 msgid "Content properties" msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:70 +#: ./src/pyams_content/shared/common/zmi/types.py:71 msgid "Data types" msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:148 +#: ./src/pyams_content/shared/common/zmi/types.py:149 msgid "Data type label" msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:188 -#: ./src/pyams_content/shared/common/zmi/types.py:428 +#: ./src/pyams_content/shared/common/zmi/types.py:189 +#: ./src/pyams_content/shared/common/zmi/types.py:429 msgid "Default associations" msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:204 +#: ./src/pyams_content/shared/common/zmi/types.py:205 msgid "Default themes" msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:232 +#: ./src/pyams_content/shared/common/zmi/types.py:233 msgid "Content data types" msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:255 +#: ./src/pyams_content/shared/common/zmi/types.py:256 msgid "Add data type" msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:267 +#: ./src/pyams_content/shared/common/zmi/types.py:268 msgid "Add new data type" msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:310 +#: ./src/pyams_content/shared/common/zmi/types.py:311 msgid "Data type properties" msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:391 +#: ./src/pyams_content/shared/common/zmi/types.py:392 msgid "Subtype label" msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:472 +#: ./src/pyams_content/shared/common/zmi/types.py:473 msgid "Add subtype" msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:484 +#: ./src/pyams_content/shared/common/zmi/types.py:485 msgid "Add new subtype" msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:531 +#: ./src/pyams_content/shared/common/zmi/types.py:532 msgid "Data subtype properties" msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:573 +#: ./src/pyams_content/shared/common/zmi/types.py:574 msgid "Select content type..." msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:115 +#: ./src/pyams_content/shared/common/zmi/types.py:116 msgid "No currently defined data type." msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:300 +#: ./src/pyams_content/shared/common/zmi/types.py:301 msgid "Specified type name is already used!" msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:507 +#: ./src/pyams_content/shared/common/zmi/types.py:508 msgid "Subtype was correctly added." msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:521 +#: ./src/pyams_content/shared/common/zmi/types.py:522 msgid "Specified subtype name is already used!" msgstr "" -#: ./src/pyams_content/shared/common/zmi/types.py:160 +#: ./src/pyams_content/shared/common/zmi/types.py:161 msgid "Click to see subtypes" msgstr "" @@ -3094,223 +3095,223 @@ msgid "Type of content data" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:45 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:46 #: ./src/pyams_content/root/interfaces/__init__.py:43 msgid "Webmasters" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:46 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:47 msgid "Webmasters can handle all contents, including published ones" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:50 -msgid "Pilots" -msgstr "" - #: ./src/pyams_content/shared/common/interfaces/__init__.py:51 +msgid "Pilots" +msgstr "" + +#: ./src/pyams_content/shared/common/interfaces/__init__.py:52 msgid "" "Pilots can handle tool configuration, manage access rules, grant users roles " "and manage managers restrictions" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:56 -#: ./src/pyams_content/shared/common/interfaces/__init__.py:196 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:57 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:201 msgid "Managers" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:57 -#: ./src/pyams_content/shared/common/interfaces/__init__.py:197 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:58 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:202 msgid "" "Managers can handle main operations in tool's workflow, like publish or " "retire contents" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:62 -#: ./src/pyams_content/shared/common/interfaces/__init__.py:202 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:63 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:207 msgid "Contributors" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:63 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:64 msgid "Contributors are users which are allowed to create new contents" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:67 -#: ./src/pyams_content/shared/common/interfaces/__init__.py:208 -msgid "Designers" -msgstr "" - #: ./src/pyams_content/shared/common/interfaces/__init__.py:68 -#: ./src/pyams_content/shared/common/interfaces/__init__.py:209 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:213 +msgid "Designers" +msgstr "" + +#: ./src/pyams_content/shared/common/interfaces/__init__.py:69 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:214 msgid "Designers are users which are allowed to manage presentation templates" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:94 -msgid "Workflow name" -msgstr "" - #: ./src/pyams_content/shared/common/interfaces/__init__.py:95 +msgid "Workflow name" +msgstr "" + +#: ./src/pyams_content/shared/common/interfaces/__init__.py:96 msgid "Name of workflow utility used to manage tool contents" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:123 -msgid "Content URL" -msgstr "" - #: ./src/pyams_content/shared/common/interfaces/__init__.py:124 +msgid "Content URL" +msgstr "" + +#: ./src/pyams_content/shared/common/interfaces/__init__.py:125 msgid "" "URL used to access this content; this is important for SEO and should include" " most important words describing content; spaces and underscores will be " "automatically replaced by hyphens" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:129 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:132 msgid "Version creator" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:130 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:133 msgid "" "Name of content's version creator. The creator of the first version is also " "it's owner." msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:134 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:137 msgid "First owner" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:135 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:138 msgid "Name of content's first version owner" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:139 -msgid "Version creation" -msgstr "" - #: ./src/pyams_content/shared/common/interfaces/__init__.py:142 +msgid "Version creation" +msgstr "" + +#: ./src/pyams_content/shared/common/interfaces/__init__.py:145 msgid "Version modifiers" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:143 -msgid "List of principals who modified this content" -msgstr "" - #: ./src/pyams_content/shared/common/interfaces/__init__.py:146 +msgid "List of principals who modified this content" +msgstr "" + +#: ./src/pyams_content/shared/common/interfaces/__init__.py:149 msgid "Last modifier" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:147 -msgid "Last principal who modified this content" -msgstr "" - #: ./src/pyams_content/shared/common/interfaces/__init__.py:150 +msgid "Last principal who modified this content" +msgstr "" + +#: ./src/pyams_content/shared/common/interfaces/__init__.py:153 msgid "Last update" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:154 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:157 msgid "Content's header is generally displayed in page header" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:159 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:162 msgid "Meta-description" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:160 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:163 msgid "" "The content's description is 'hidden' into HTML's page headers; but it can be" " seen, for example, in some search engines results as content's description; " "if description is empty, content's header will be used." msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:165 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:170 msgid "Keywords" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:166 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:171 msgid "They will be included into HTML pages metadata" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:169 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:174 #: ./src/pyams_content/shared/site/zmi/folder.py:79 #: ./src/pyams_content/shared/site/interfaces/__init__.py:76 msgid "Notepad" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:170 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:175 #: ./src/pyams_content/shared/site/zmi/folder.py:80 #: ./src/pyams_content/shared/site/interfaces/__init__.py:77 msgid "Internal information to be known about this content" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:189 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:194 msgid "Content owner" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:190 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:195 msgid "" "The owner is the creator of content's first version, except if it was " "transferred afterwards to another owner" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:203 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:208 msgid "" "Contributors are users which are allowed to update this content in addition " "to it's owner" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:213 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:218 msgid "Readers" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:214 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:219 msgid "" "Readers are users which are asked to verify and comment contents before they " "are published" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:219 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:224 msgid "Guests" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:220 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:225 msgid "" "Guests are users which are allowed to view contents with restricted access" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:243 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:248 msgid "Principal ID" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:282 -#: ./src/pyams_content/shared/common/interfaces/__init__.py:307 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:287 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:312 msgid "Publication checks" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:283 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:288 msgid "" "If 'yes', this contributor will have to confirm that contents have been " "previewed and checked before asking for publication" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:308 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:313 msgid "" "If 'yes', this manager will have to confirm that contents have been previewed" " and checked before publishing a content" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:313 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:318 msgid "Restricted contents" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:314 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:319 msgid "" "If 'yes', this manager will get restricted access to manage contents based on" " selected settings" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:319 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:324 msgid "Selected owners" msgstr "" -#: ./src/pyams_content/shared/common/interfaces/__init__.py:320 +#: ./src/pyams_content/shared/common/interfaces/__init__.py:325 msgid "Manager will have access to contents owned by these principals" msgstr "" @@ -4210,11 +4211,11 @@ msgid "logo '{0}' is not published" msgstr "" -#: ./src/pyams_content/shared/logo/__init__.py:69 +#: ./src/pyams_content/shared/logo/__init__.py:74 msgid "no image defined" msgstr "" -#: ./src/pyams_content/shared/logo/__init__.py:72 +#: ./src/pyams_content/shared/logo/__init__.py:77 msgid "no URL defined" msgstr "" @@ -4226,7 +4227,7 @@ msgid "Add new logos paragraph" msgstr "" -#: ./src/pyams_content/shared/logo/zmi/properties.py:40 +#: ./src/pyams_content/shared/logo/zmi/properties.py:52 msgid "Main logo settings" msgstr "" @@ -4244,35 +4245,47 @@ msgid "Logo « {title} »" msgstr "" -#: ./src/pyams_content/shared/logo/interfaces/__init__.py:33 +#: ./src/pyams_content/shared/logo/interfaces/__init__.py:34 msgid "Logo" msgstr "" -#: ./src/pyams_content/shared/logo/interfaces/__init__.py:70 +#: ./src/pyams_content/shared/logo/interfaces/__init__.py:79 msgid "Logos" msgstr "" -#: ./src/pyams_content/shared/logo/interfaces/__init__.py:47 -msgid "Image (colored)" -msgstr "" - -#: ./src/pyams_content/shared/logo/interfaces/__init__.py:51 -msgid "Image (monochrome)" +#: ./src/pyams_content/shared/logo/interfaces/__init__.py:49 +msgid "Full name of logo organization" msgstr "" #: ./src/pyams_content/shared/logo/interfaces/__init__.py:52 +msgid "Acronym" +msgstr "" + +#: ./src/pyams_content/shared/logo/interfaces/__init__.py:53 +msgid "Matching logo acronym, without spaces or separators" +msgstr "" + +#: ./src/pyams_content/shared/logo/interfaces/__init__.py:60 +msgid "Image (colored)" +msgstr "" + +#: ./src/pyams_content/shared/logo/interfaces/__init__.py:64 +msgid "Image (monochrome)" +msgstr "" + +#: ./src/pyams_content/shared/logo/interfaces/__init__.py:65 msgid "An alternate image which can be used by some presentation templates" msgstr "" -#: ./src/pyams_content/shared/logo/interfaces/__init__.py:77 +#: ./src/pyams_content/shared/logo/interfaces/__init__.py:86 msgid "Logos references" msgstr "" -#: ./src/pyams_content/shared/logo/interfaces/__init__.py:78 +#: ./src/pyams_content/shared/logo/interfaces/__init__.py:87 msgid "List of internal logos references" msgstr "" -#: ./src/pyams_content/shared/logo/interfaces/__init__.py:81 +#: ./src/pyams_content/shared/logo/interfaces/__init__.py:90 msgid "Logos template" msgstr "" diff -r 12ad545bc649 -r 9395a088cd46 src/pyams_content/shared/common/__init__.py --- a/src/pyams_content/shared/common/__init__.py Mon Sep 17 17:37:46 2018 +0200 +++ b/src/pyams_content/shared/common/__init__.py Tue Sep 18 15:40:16 2018 +0200 @@ -17,7 +17,6 @@ # import interfaces from hypatia.interfaces import ICatalog -# import packages from persistent import Persistent from pyramid.events import subscriber from pyramid.interfaces import IWSGIApplicationCreatedEvent @@ -32,6 +31,7 @@ from zope.schema.vocabulary import SimpleVocabulary, SimpleTerm from pyams_content import _ +# import packages from pyams_content.features.checker import BaseContentChecker from pyams_content.features.checker.interfaces import IContentChecker, MISSING_VALUE, MISSING_LANG_VALUE, ERROR_VALUE from pyams_content.features.review.interfaces import IReviewComments @@ -127,7 +127,9 @@ content_type = None content_name = None + handle_content_url = True handle_header = True + handle_description = True title = FieldProperty(IWfSharedContent['title']) short_name = FieldProperty(IWfSharedContent['short_name']) diff -r 12ad545bc649 -r 9395a088cd46 src/pyams_content/shared/common/interfaces/__init__.py --- a/src/pyams_content/shared/common/interfaces/__init__.py Mon Sep 17 17:37:46 2018 +0200 +++ b/src/pyams_content/shared/common/interfaces/__init__.py Tue Sep 18 15:40:16 2018 +0200 @@ -126,6 +126,8 @@ "underscores will be automatically replaced by hyphens"), required=True) + handle_content_url = Attribute("Static boolean value to specify if content URL is supported by this content type") + creator = Principal(title=_("Version creator"), description=_("Name of content's version creator. " "The creator of the first version is also it's owner."), @@ -162,6 +164,8 @@ "description; if description is empty, content's header will be used."), required=False) + handle_description = Attribute("Static boolean value to specify if description is supported by this content type") + keywords = TextLineListField(title=_("Keywords"), description=_("They will be included into HTML pages metadata"), required=False) diff -r 12ad545bc649 -r 9395a088cd46 src/pyams_content/shared/common/zmi/properties.py --- a/src/pyams_content/shared/common/zmi/properties.py Mon Sep 17 17:37:46 2018 +0200 +++ b/src/pyams_content/shared/common/zmi/properties.py Tue Sep 18 15:40:16 2018 +0200 @@ -86,8 +86,12 @@ fields = field.Fields(IWfSharedContent).select('title', 'short_name', 'content_url', 'header', 'description', 'notepad') fields['title'].widgetFactory = I18nSEOTextLineFieldWidget + if not self.context.handle_content_url: + fields = fields.omit('content_url') if not self.context.handle_header: fields = fields.omit('header') + if not self.context.handle_description: + fields = fields.omit('description') return fields def updateWidgets(self, prefix=None): @@ -117,7 +121,8 @@ """Automatically set short_name as title""" data = event.data data['short_name'] = data['title'].copy() - data['content_url'] = generate_url(data['content_url']) + if 'content_url' in data: + data['content_url'] = generate_url(data['content_url']) @adapter_config(context=(IWfSharedContent, IAdminLayer, SharedContentPropertiesEditForm), provides=IPageHeader) diff -r 12ad545bc649 -r 9395a088cd46 src/pyams_content/shared/common/zmi/summary.py --- a/src/pyams_content/shared/common/zmi/summary.py Mon Sep 17 17:37:46 2018 +0200 +++ b/src/pyams_content/shared/common/zmi/summary.py Tue Sep 18 15:40:16 2018 +0200 @@ -9,39 +9,38 @@ # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS # FOR A PARTICULAR PURPOSE. # -from pyams_content.shared.common.interfaces.types import IWfTypedSharedContent -from pyams_sequence.interfaces import ISequentialIdInfo __docformat__ = 'restructuredtext' # import standard library +from z3c.form import field +from z3c.form.interfaces import DISPLAY_MODE, IDataConverter +from zope.interface import implementer, Interface + +from pyams_content import _ # import interfaces from pyams_content.shared.common.interfaces import IWfSharedContent, IWfSharedContentRoles, IBaseSharedTool +from pyams_content.shared.common.interfaces.types import IWfTypedSharedContent +# import packages +from pyams_content.shared.common.zmi.header import SharedContentHeaderContentProvider from pyams_form.interfaces.form import IWidgetForm, IInnerTabForm, IInnerSubForm +from pyams_pagelet.pagelet import pagelet_config +from pyams_security.utility import get_principal +from pyams_sequence.interfaces import ISequentialIdInfo from pyams_skin.interfaces import IInnerPage from pyams_skin.layer import IPyAMSLayer -from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION -from pyams_workflow.interfaces import IWorkflowState, IWorkflow, IWorkflowPublicationInfo, IWorkflowStateHistoryItem, \ - IWorkflowVersions -from z3c.form.interfaces import DISPLAY_MODE, IDataConverter - -# import packages -from pyams_content.shared.common.zmi.header import SharedContentHeaderContentProvider -from pyams_pagelet.pagelet import pagelet_config -from pyams_security.utility import get_principal from pyams_utils.adapter import adapter_config from pyams_utils.date import format_datetime +from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION from pyams_utils.timezone import tztime from pyams_utils.traversing import get_parent from pyams_utils.url import absolute_url from pyams_viewlet.viewlet import contentprovider_config +from pyams_workflow.interfaces import IWorkflowState, IWorkflow, IWorkflowPublicationInfo, IWorkflowStateHistoryItem, \ + IWorkflowVersions from pyams_zmi.form import AdminDisplayForm, InnerAdminDisplayForm, InnerAdminAddForm -from z3c.form import field -from zope.interface import implementer, Interface - -from pyams_content import _ @pagelet_config(name='summary.html', context=IWfSharedContent, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION) diff -r 12ad545bc649 -r 9395a088cd46 src/pyams_content/shared/common/zmi/types.py --- a/src/pyams_content/shared/common/zmi/types.py Mon Sep 17 17:37:46 2018 +0200 +++ b/src/pyams_content/shared/common/zmi/types.py Tue Sep 18 15:40:16 2018 +0200 @@ -580,6 +580,15 @@ class TypedSharedContentProperteisEditForm(SharedContentPropertiesEditForm): """Typed shared content properties edit form""" - fields = field.Fields(IWfTypedSharedContent).select('title', 'short_name', 'content_url', - 'data_type', 'description', 'notepad') - fields['title'].widgetFactory = I18nSEOTextLineFieldWidget + @property + def fields(self): + fields = field.Fields(IWfTypedSharedContent).select('title', 'short_name', 'content_url', + 'data_type', 'header', 'description', 'notepad') + fields['title'].widgetFactory = I18nSEOTextLineFieldWidget + if not self.context.handle_content_url: + fields = fields.omit('content_url') + if not self.context.handle_header: + fields = fields.omit('header') + if not self.context.handle_description: + fields = fields.omit('description') + return fields diff -r 12ad545bc649 -r 9395a088cd46 src/pyams_content/shared/logo/__init__.py --- a/src/pyams_content/shared/logo/__init__.py Mon Sep 17 17:37:46 2018 +0200 +++ b/src/pyams_content/shared/logo/__init__.py Tue Sep 18 15:40:16 2018 +0200 @@ -20,8 +20,9 @@ from pyams_content import _ # import interfaces +from pyams_content.component.theme.interfaces import IThemesTarget from pyams_content.features.checker.interfaces import IContentChecker, MISSING_VALUE -from pyams_content.features.review import IReviewTarget +from pyams_content.features.review.interfaces import IReviewTarget # import packages from pyams_content.shared.common import WfSharedContent, register_content_type, SharedContent, WfSharedContentChecker, \ IWfSharedContentFactory @@ -30,18 +31,21 @@ from pyams_utils.adapter import adapter_config -@implementer(IWfLogo, IReviewTarget) +@implementer(IWfLogo, IThemesTarget, IReviewTarget) class WfLogo(WfSharedContent): """Logo persistent class""" content_type = LOGO_CONTENT_TYPE content_name = LOGO_CONTENT_NAME + handle_content_url = False handle_header = False + handle_description = False + acronym = FieldProperty(IWfLogo['acronym']) + url = FieldProperty(IWfLogo['url']) image = FileProperty(IWfLogo['image']) monochrome_image = FileProperty(IWfLogo['monochrome_image']) - url = FieldProperty(IWfLogo['url']) register_content_type(WfLogo) diff -r 12ad545bc649 -r 9395a088cd46 src/pyams_content/shared/logo/interfaces/__init__.py --- a/src/pyams_content/shared/logo/interfaces/__init__.py Mon Sep 17 17:37:46 2018 +0200 +++ b/src/pyams_content/shared/logo/interfaces/__init__.py Tue Sep 18 15:40:16 2018 +0200 @@ -15,19 +15,18 @@ # import standard library +from zope.interface import Interface +from zope.schema import URI, Choice, TextLine + +from pyams_content import _ # import interfaces from pyams_content.component.paragraph import IBaseParagraph from pyams_content.shared.common.interfaces import ISharedTool, IWfSharedContent, ISharedContent -from pyams_sequence.interfaces import IInternalReferencesList - # import packages from pyams_file.schema import ImageField +from pyams_i18n.schema import I18nTextLineField +from pyams_sequence.interfaces import IInternalReferencesList from pyams_sequence.schema import InternalReferencesListField -from zope.interface import Interface -from zope.schema import URI, Choice - -from pyams_content import _ - LOGO_CONTENT_TYPE = 'logo' LOGO_CONTENT_NAME = _("Logo") @@ -44,6 +43,18 @@ class IWfLogo(IWfSharedContent): """Logo interface""" + title = I18nTextLineField(title=_("Title"), + description=_("Full name of logo organization"), + required=True) + + acronym = TextLine(title=_("Acronym"), + description=_("Matching logo acronym, without spaces or separators"), + required=False) + + url = URI(title=_("Target URL"), + description=_("URL used to access external resource"), + required=False) + image = ImageField(title=_("Image (colored)"), description=_("Image data"), required=True) @@ -53,10 +64,6 @@ "presentation templates"), required=False) - url = URI(title=_("Target URL"), - description=_("URL used to access external resource"), - required=False) - class IWfLogoFactory(Interface): """Logo factory interface""" diff -r 12ad545bc649 -r 9395a088cd46 src/pyams_content/shared/logo/zmi/properties.py --- a/src/pyams_content/shared/logo/zmi/properties.py Mon Sep 17 17:37:46 2018 +0200 +++ b/src/pyams_content/shared/logo/zmi/properties.py Tue Sep 18 15:40:16 2018 +0200 @@ -9,6 +9,9 @@ # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS # FOR A PARTICULAR PURPOSE. # +from pyams_content.interfaces import MANAGE_CONTENT_PERMISSION +from pyams_form.form import ajax_config +from pyams_pagelet.pagelet import pagelet_config __docformat__ = 'restructuredtext' @@ -17,11 +20,13 @@ # import interfaces from pyams_content.shared.logo import IWfLogo -from pyams_form.interfaces.form import IInnerSubForm +from pyams_form.interfaces.form import IInnerSubForm, IInnerTabForm +from pyams_sequence.interfaces import ISequentialIdInfo from pyams_skin.layer import IPyAMSLayer # import packages from pyams_content.shared.common.zmi.properties import SharedContentPropertiesEditForm +from pyams_content.shared.common.zmi.summary import SharedContentSummaryForm, SharedContentDublinCoreSummary from pyams_utils.adapter import adapter_config from pyams_zmi.form import InnerAdminEditForm from z3c.form import field @@ -29,6 +34,26 @@ from pyams_content import _ +@adapter_config(name='dublincore-summary', + context=(IWfLogo, IPyAMSLayer, SharedContentSummaryForm), + provides=IInnerTabForm) +class LogoDublinCoreSummary(SharedContentDublinCoreSummary): + """Shared content DublinCore summary""" + + fields = field.Fields(IWfLogo).select('title', 'acronym') + \ + field.Fields(ISequentialIdInfo).select('public_oid') + + +@pagelet_config(name='properties.html', context=IWfLogo, layer=IPyAMSLayer, + permission=MANAGE_CONTENT_PERMISSION) +@ajax_config(name='properties.json', context=IWfLogo, layer=IPyAMSLayer, + permission=MANAGE_CONTENT_PERMISSION) +class LogoMainPropertiesEditForm(SharedContentPropertiesEditForm): + """Logo properties edit form""" + + fields = field.Fields(IWfLogo).select('title', 'short_name', 'notepad') + + @adapter_config(name='logo-settings', context=(IWfLogo, IPyAMSLayer, SharedContentPropertiesEditForm), provides=IInnerSubForm) @@ -40,7 +65,7 @@ legend = _("Main logo settings") fieldset_class = 'bordered no-x-margin margin-y-10' - fields = field.Fields(IWfLogo).select('image', 'monochrome_image', 'url') + fields = field.Fields(IWfLogo).select('acronym', 'url', 'image', 'monochrome_image') weight = 1 def get_ajax_output(self, changes): diff -r 12ad545bc649 -r 9395a088cd46 src/pyams_content/shared/news/__init__.py --- a/src/pyams_content/shared/news/__init__.py Mon Sep 17 17:37:46 2018 +0200 +++ b/src/pyams_content/shared/news/__init__.py Tue Sep 18 15:40:16 2018 +0200 @@ -15,20 +15,20 @@ # import standard library +from zope.interface import implementer, provider + # import interfaces -from pyams_content.component.illustration import IIllustrationTarget, ILinkIllustrationTarget +from pyams_content.component.illustration.interfaces import IIllustrationTarget, ILinkIllustrationTarget from pyams_content.component.paragraph.interfaces import IParagraphContainerTarget from pyams_content.component.theme.interfaces import ITagsTarget, IThemesTarget from pyams_content.features.preview.interfaces import IPreviewTarget from pyams_content.features.review.interfaces import IReviewTarget +# import packages +from pyams_content.shared.common import SharedContent, WfSharedContent, register_content_type from pyams_content.shared.common.interfaces import IWfSharedContentFactory from pyams_content.shared.news.interfaces import INewsEvent, IWfNewsEvent, NEWS_CONTENT_TYPE, NEWS_CONTENT_NAME, \ IWfNewsEventFactory - -# import packages -from pyams_content.shared.common import SharedContent, WfSharedContent, register_content_type from pyams_utils.adapter import adapter_config -from zope.interface import implementer, provider @implementer(IWfNewsEvent, IIllustrationTarget, ILinkIllustrationTarget, IParagraphContainerTarget,