Description Article not required

This commit is contained in:
Raimon Esteve 2016-07-18 15:59:58 +02:00
parent 5e5fe033fd
commit 120369d5e1
3 changed files with 13 additions and 32 deletions

9
cms.py
View file

@ -141,10 +141,8 @@ class Article(GalateaVisiblePage, ModelSQL, ModelView):
__name__ = 'galatea.cms.article'
websites = fields.Many2Many('galatea.cms.article-galatea.website',
'article', 'website', 'Websites', required=True)
description = fields.Text('Description', required=True, translate=True,
help='You could write wiki markup to create html content. Formats '
'text following the MediaWiki '
'(http://meta.wikimedia.org/wiki/Help:Editing) syntax.')
description = fields.Text('Description', translate=True,
help='You could write wiki or RST markups to create html content.')
markup = fields.Selection([
(None, ''),
('wikimedia', 'WikiMedia'),
@ -254,8 +252,7 @@ class Block(ModelSQL, ModelView):
'required': Equal(Eval('type'), 'custom_code'),
'invisible': Not(Equal(Eval('type'), 'custom_code'))
},
help='You could write wiki markup to create html content. Formats text following '
'the MediaWiki (http://meta.wikimedia.org/wiki/Help:Editing) syntax.')
help='You could write wiki or RST markups to create html content.')
height = fields.Integer('Height',
states = {
'invisible': Not(In(Eval('type'), ['image', 'remote_image']))

View file

@ -451,13 +451,9 @@ msgid "Dissable to not show this content."
msgstr "Desactivar per no mostrar contingut article."
msgctxt "help:galatea.cms.article,description:"
msgid ""
"You could write wiki markup to create html content. Formats text following "
"the MediaWiki (http://meta.wikimedia.org/wiki/Help:Editing) syntax."
msgid "You could write wiki or RST markups to create html content."
msgstr ""
"Pot escriure amb els tags de wiki per formatejar contingut HTML. Pot "
"consultar la xuleta a MediaWiki "
"(http://meta.wikimedia.org/wiki/Help:Editing)."
"Pot escriure amb els tags de wiki o RST per formatejar contingut HTML."
msgctxt "help:galatea.cms.article,metadescription:"
msgid ""
@ -475,13 +471,9 @@ msgid "Internal code."
msgstr "Codi intern."
msgctxt "help:galatea.cms.block,custom_code:"
msgid ""
"You could write wiki markup to create html content. Formats text following "
"the MediaWiki (http://meta.wikimedia.org/wiki/Help:Editing) syntax."
msgid "You could write wiki or RST markups to create html content."
msgstr ""
"Pot escriure amb els tags de wiki per formatejar contingut HTML. Pot "
"consultar la xuleta a MediaWiki "
"(http://meta.wikimedia.org/wiki/Help:Editing)."
"Pot escriure amb els tags de wiki o RST per formatejar contingut HTML."
msgctxt "help:galatea.cms.carousel,code:"
msgid "Internal code. Use characters az09"

View file

@ -450,14 +450,10 @@ msgctxt "help:galatea.cms.article,active:"
msgid "Dissable to not show this content."
msgstr "Desactivar para no mostrar el contenido del artículo."
#, fuzzy
msgctxt "help:galatea.cms.article,description:"
msgid ""
"You could write wiki markup to create html content. Formats text following "
"the MediaWiki (http://meta.wikimedia.org/wiki/Help:Editing) syntax."
msgstr ""
"Puede escribir etiquetas wiki para el formateo del texto. Para la chuleta de"
" las etiquetas puede consultar a MediaWiki "
"(http://meta.wikimedia.org/wiki/Help:Editing)."
msgid "You could write wiki or RST markups to create html content."
msgstr "Puede escribir etiquetas wiki o RST para el formateo del texto."
msgctxt "help:galatea.cms.article,metadescription:"
msgid ""
@ -475,14 +471,10 @@ msgctxt "help:galatea.cms.block,code:"
msgid "Internal code."
msgstr "Código interno."
#, fuzzy
msgctxt "help:galatea.cms.block,custom_code:"
msgid ""
"You could write wiki markup to create html content. Formats text following "
"the MediaWiki (http://meta.wikimedia.org/wiki/Help:Editing) syntax."
msgstr ""
"Puede escribir etiquetas wiki para el formateo del texto. Para la chuleta de"
" las etiquetas puede consultar a MediaWiki "
"(http://meta.wikimedia.org/wiki/Help:Editing)."
msgid "You could write wiki or RST markups to create html content."
msgstr "Puede escribir etiquetas wiki o RST para el formateo del texto."
msgctxt "help:galatea.cms.carousel,code:"
msgid "Internal code. Use characters az09"