From b23b3207da13da2ee06171475400b20d964adc11 Mon Sep 17 00:00:00 2001 From: Franco Pellegrini Date: Sat, 7 Jan 2012 20:15:26 -0300 Subject: [PATCH] Added the ability to select between showing percentage or number of votes. gh-4 --- src/collective/polls/content/poll.py | 12 +++++ .../polls/content/poll_templates/view.pt | 10 +++- .../polls/locales/collective.polls.pot | 42 +++++++++++----- .../es/LC_MESSAGES/collective.polls.po | 49 +++++++++++++------ .../pt_BR/LC_MESSAGES/collective.polls.po | 40 ++++++++++----- 5 files changed, 111 insertions(+), 42 deletions(-) diff --git a/src/collective/polls/content/poll.py b/src/collective/polls/content/poll.py index 79caa0b..4cd8806 100644 --- a/src/collective/polls/content/poll.py +++ b/src/collective/polls/content/poll.py @@ -39,6 +39,10 @@ SimpleTerm(value=u'pie', title=_(u'Pie Chart')), SimpleTerm(value=u'numbers', title=_(u'Numbers Only'))]) +format_options = SimpleVocabulary( + [SimpleTerm(value=u'percentage', title=_(u'Percentage')), + SimpleTerm(value=u'numbers', title=_(u'Numbers'))]) + class IOption(interface.Interface): ''' An option in a poll ''' @@ -82,6 +86,13 @@ class IPoll(form.Schema): required=True, source=graph_options) + results_format = schema.Choice( + title=_(u'Results Format'), + description=_(u"Format to show the numbers."), + default='numbers', + required=True, + source=format_options) + options = schema.List( title=_(u"Available options"), value_type=DictRow(title=_(u'Option'), @@ -140,6 +151,7 @@ def getResults(self): all_results.append((item['description'], item['votes'], item['percentage'])) + return all_results def _validateVote(self, options=[]): diff --git a/src/collective/polls/content/poll_templates/view.pt b/src/collective/polls/content/poll_templates/view.pt index 1a521af..1fb1012 100644 --- a/src/collective/polls/content/poll_templates/view.pt +++ b/src/collective/polls/content/poll_templates/view.pt @@ -47,7 +47,15 @@ diff --git a/src/collective/polls/locales/collective.polls.pot b/src/collective/polls/locales/collective.polls.pot index c98d698..00948f9 100644 --- a/src/collective/polls/locales/collective.polls.pot +++ b/src/collective/polls/locales/collective.polls.pot @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2012-01-07 03:55+0000\n" +"POT-Creation-Date: 2012-01-07 23:14+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI +ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,15 +26,15 @@ msgstr "" msgid "A portlet to allow voting on a specific poll" msgstr "" -#: collective/polls/content/poll.py:60 +#: collective/polls/content/poll.py:64 msgid "Allow anonymous" msgstr "" -#: collective/polls/content/poll.py:61 +#: collective/polls/content/poll.py:65 msgid "Allow not logged in users to vote." msgstr "" -#: collective/polls/content/poll.py:86 +#: collective/polls/content/poll.py:97 msgid "Available options" msgstr "" @@ -46,15 +46,19 @@ msgstr "" msgid "Bar Chart" msgstr "" -#: collective/polls/content/poll.py:51 +#: collective/polls/content/poll.py:55 msgid "Description" msgstr "" -#: collective/polls/content/poll.py:80 +#: collective/polls/content/poll.py:91 +msgid "Format to show the numbers." +msgstr "" + +#: collective/polls/content/poll.py:84 msgid "Format to show the results." msgstr "" -#: collective/polls/content/poll.py:79 +#: collective/polls/content/poll.py:83 msgid "Graph" msgstr "" @@ -62,7 +66,7 @@ msgstr "" msgid "Header" msgstr "" -#: collective/polls/content/poll.py:292 +#: collective/polls/content/poll.py:304 msgid "Invalid option" msgstr "" @@ -74,11 +78,15 @@ msgstr "" msgid "Nothing to see here" msgstr "" +#: collective/polls/content/poll.py:44 +msgid "Numbers" +msgstr "" + #: collective/polls/content/poll.py:40 msgid "Numbers Only" msgstr "" -#: collective/polls/content/poll.py:87 +#: collective/polls/content/poll.py:98 msgid "Option" msgstr "" @@ -86,6 +94,10 @@ msgstr "" msgid "Partial results" msgstr "" +#: collective/polls/content/poll.py:43 +msgid "Percentage" +msgstr "" + #: collective/polls/content/poll.py:39 msgid "Pie Chart" msgstr "" @@ -95,19 +107,23 @@ msgstr "" msgid "Poll" msgstr "" +#: collective/polls/content/poll.py:90 +msgid "Results Format" +msgstr "" + #: collective/polls/content/poll_templates/view.pt:45 msgid "Results:" msgstr "" -#: collective/polls/content/poll.py:72 +#: collective/polls/content/poll.py:76 msgid "Show partial results" msgstr "" -#: collective/polls/content/poll.py:73 +#: collective/polls/content/poll.py:77 msgid "Show partial results after a voter has already voted." msgstr "" -#: collective/polls/content/poll.py:306 +#: collective/polls/content/poll.py:318 msgid "Thanks for your vote" msgstr "" @@ -130,7 +146,7 @@ msgstr "" msgid "Which poll to show in the portlet." msgstr "" -#: collective/polls/content/poll.py:311 +#: collective/polls/content/poll.py:323 msgid "You are not authorized to vote" msgstr "" diff --git a/src/collective/polls/locales/es/LC_MESSAGES/collective.polls.po b/src/collective/polls/locales/es/LC_MESSAGES/collective.polls.po index 9b93649..73fa35e 100644 --- a/src/collective/polls/locales/es/LC_MESSAGES/collective.polls.po +++ b/src/collective/polls/locales/es/LC_MESSAGES/collective.polls.po @@ -1,11 +1,11 @@ -# Franco Pellegrini , 2011. +# Franco Pellegrini , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: collective.polls\n" "POT-Creation-Date: YEAR-MO-DA HO:MI +ZONE\n" -"PO-Revision-Date: 2012-01-06 21:56-0600\n" -"Last-Translator: Héctor Velarde \n" -"Language-Team: Spanish \n" +"PO-Revision-Date: 2012-01-07 20:12-0300\n" +"Last-Translator: Franco Pellegrini\n" +"Language-Team: Spanish <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -15,6 +15,7 @@ msgstr "" "Preferred-Encodings: utf-8 latin1\n" "Domain: collective.polls\n" "X-Generator: Lokalize 1.2\n" +"Language: es\n" #: collective/polls/profiles/default/types/collective.polls.poll.xml msgid "A poll" @@ -25,15 +26,15 @@ msgstr "Una encuesta" msgid "A portlet to allow voting on a specific poll" msgstr "Un portlet que permite votar en una encuesta específica" -#: collective/polls/content/poll.py:60 +#: collective/polls/content/poll.py:64 msgid "Allow anonymous" msgstr "Permitir anónimos" -#: collective/polls/content/poll.py:61 +#: collective/polls/content/poll.py:65 msgid "Allow not logged in users to vote." msgstr "Permitir a usuarios que no han iniciado sesión, votar." -#: collective/polls/content/poll.py:86 +#: collective/polls/content/poll.py:97 msgid "Available options" msgstr "Opciones disponibles" @@ -45,15 +46,19 @@ msgstr "Opciones disponibles:" msgid "Bar Chart" msgstr "Gráfico de barras" -#: collective/polls/content/poll.py:51 +#: collective/polls/content/poll.py:55 msgid "Description" msgstr "Descripción" -#: collective/polls/content/poll.py:80 +#: collective/polls/content/poll.py:91 +msgid "Format to show the numbers." +msgstr "Formato para mostrar los numeros." + +#: collective/polls/content/poll.py:84 msgid "Format to show the results." msgstr "Formato en el que se mostrarán los resultados." -#: collective/polls/content/poll.py:79 +#: collective/polls/content/poll.py:83 msgid "Graph" msgstr "Gráfico" @@ -61,7 +66,7 @@ msgstr "Gráfico" msgid "Header" msgstr "Cabecera" -#: collective/polls/content/poll.py:292 +#: collective/polls/content/poll.py:304 msgid "Invalid option" msgstr "Opción inválida" @@ -73,11 +78,15 @@ msgstr "La encuesta abierta más reciente" msgid "Nothing to see here" msgstr "No hay nada aquí que pueda ver" +#: collective/polls/content/poll.py:44 +msgid "Numbers" +msgstr "Números" + #: collective/polls/content/poll.py:40 msgid "Numbers Only" msgstr "Sólo números" -#: collective/polls/content/poll.py:87 +#: collective/polls/content/poll.py:98 msgid "Option" msgstr "Opción" @@ -85,6 +94,10 @@ msgstr "Opción" msgid "Partial results" msgstr "Resultados parciales" +#: collective/polls/content/poll.py:43 +msgid "Percentage" +msgstr "Porcentaje" + #: collective/polls/content/poll.py:39 msgid "Pie Chart" msgstr "Gráfico de tarta" @@ -94,19 +107,23 @@ msgstr "Gráfico de tarta" msgid "Poll" msgstr "Encuesta" +#: collective/polls/content/poll.py:90 +msgid "Results Format" +msgstr "Formato de Resultados" + #: collective/polls/content/poll_templates/view.pt:45 msgid "Results:" msgstr "Resultados:" -#: collective/polls/content/poll.py:72 +#: collective/polls/content/poll.py:76 msgid "Show partial results" msgstr "Mostrar resultados parciales" -#: collective/polls/content/poll.py:73 +#: collective/polls/content/poll.py:77 msgid "Show partial results after a voter has already voted." msgstr "Mostrar resultados parciales luego de que el votante ya haya votado." -#: collective/polls/content/poll.py:306 +#: collective/polls/content/poll.py:318 msgid "Thanks for your vote" msgstr "Gracias por su voto" @@ -124,7 +141,7 @@ msgstr "Portlet de votación" msgid "Which poll to show in the portlet." msgstr "Qué encuesta mostrar en el portlet." -#: collective/polls/content/poll.py:311 +#: collective/polls/content/poll.py:323 msgid "You are not authorized to vote" msgstr "Usted no está autorizado para votar" diff --git a/src/collective/polls/locales/pt_BR/LC_MESSAGES/collective.polls.po b/src/collective/polls/locales/pt_BR/LC_MESSAGES/collective.polls.po index c4f9eae..7d14625 100644 --- a/src/collective/polls/locales/pt_BR/LC_MESSAGES/collective.polls.po +++ b/src/collective/polls/locales/pt_BR/LC_MESSAGES/collective.polls.po @@ -25,15 +25,15 @@ msgstr "Uma enquete" msgid "A portlet to allow voting on a specific poll" msgstr "Um portlet para permitir voto numa enquete específica" -#: collective/polls/content/poll.py:60 +#: collective/polls/content/poll.py:64 msgid "Allow anonymous" msgstr "Permitir voto anônimo" -#: collective/polls/content/poll.py:61 +#: collective/polls/content/poll.py:65 msgid "Allow not logged in users to vote." msgstr "Permitir aos usuários não logados votar." -#: collective/polls/content/poll.py:86 +#: collective/polls/content/poll.py:97 msgid "Available options" msgstr "Opções disponíveis" @@ -45,15 +45,19 @@ msgstr "Opções disponíveis:" msgid "Bar Chart" msgstr "Gráfico de barras" -#: collective/polls/content/poll.py:51 +#: collective/polls/content/poll.py:55 msgid "Description" msgstr "Descrição" -#: collective/polls/content/poll.py:80 +#: collective/polls/content/poll.py:91 +msgid "Format to show the numbers." +msgstr "" + +#: collective/polls/content/poll.py:84 msgid "Format to show the results." msgstr "Formato para mostrar os resultados" -#: collective/polls/content/poll.py:79 +#: collective/polls/content/poll.py:83 msgid "Graph" msgstr "Gráfico" @@ -61,7 +65,7 @@ msgstr "Gráfico" msgid "Header" msgstr "Título" -#: collective/polls/content/poll.py:292 +#: collective/polls/content/poll.py:304 msgid "Invalid option" msgstr "Opção inválida" @@ -73,11 +77,15 @@ msgstr "Última enquete aberta" msgid "Nothing to see here" msgstr "Nada para ver aqui" +#: collective/polls/content/poll.py:44 +msgid "Numbers" +msgstr "" + #: collective/polls/content/poll.py:40 msgid "Numbers Only" msgstr "Só nûmeros" -#: collective/polls/content/poll.py:87 +#: collective/polls/content/poll.py:98 msgid "Option" msgstr "Escolha" @@ -85,6 +93,10 @@ msgstr "Escolha" msgid "Partial results" msgstr "Resultados parciais" +#: collective/polls/content/poll.py:43 +msgid "Percentage" +msgstr "" + #: collective/polls/content/poll.py:39 msgid "Pie Chart" msgstr "Gráfico de pizza" @@ -94,19 +106,23 @@ msgstr "Gráfico de pizza" msgid "Poll" msgstr "Enquete" +#: collective/polls/content/poll.py:90 +msgid "Results Format" +msgstr "" + #: collective/polls/content/poll_templates/view.pt:45 msgid "Results:" msgstr "Resultados:" -#: collective/polls/content/poll.py:72 +#: collective/polls/content/poll.py:76 msgid "Show partial results" msgstr "Mostrar resultados parciais" -#: collective/polls/content/poll.py:73 +#: collective/polls/content/poll.py:77 msgid "Show partial results after a voter has already voted." msgstr "Mostrar resultados parciais, após o usuário já votou." -#: collective/polls/content/poll.py:306 +#: collective/polls/content/poll.py:318 msgid "Thanks for your vote" msgstr "Obrigado pelo seu voto" @@ -124,7 +140,7 @@ msgstr "Portlet de voto" msgid "Which poll to show in the portlet." msgstr "Que enquete para mostrar no portlet." -#: collective/polls/content/poll.py:311 +#: collective/polls/content/poll.py:323 msgid "You are not authorized to vote" msgstr "Você não está autorizado a votar"