Merge remote-tracking branch 'openslides/stable/1.4.x'

Conflicts:
	AUTHORS

AUTHORS

@@ -12,3 +12,4 @@ Authors of OpenSlides in chronological order of first contribution:
     Tobias Hößl <tobias@hoessl.eu>
     Pavel Fric <pavelfric@seznam.cz> (Czech translation)
     Max Brauer <max@max-brauer.de>
+    Marco A.G.Pinto <marcoagpinto@mail.telepac.pt> (Portuguese translation)

openslides/global_settings.py

@@ -34,6 +34,7 @@ LANGUAGES = (
     ('en', ugettext('English')),
     ('fr', ugettext('French')),
     ('cs', ugettext('Czech')),
+    ('pt', ugettext('Portuguese')),
 )
 
 # If you set this to False, Django will make some optimizations so as not

openslides/locale/pt/LC_MESSAGES/djangojs.po

@@ -0,0 +1,257 @@
+# Language file (for JavaScript) of OpenSlides used by transifex:
+# https://www.transifex.com/projects/p/openslides/
+# Copyright (C) 2011–2013 by OpenSlides team, see AUTHORS.
+# This file is distributed under the same license as the OpenSlides package.
+# Translators:
+# marcoagpinto <marcoagpinto@mail.telepac.pt>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenSlides\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-09-02 13:52+0200\n"
+"PO-Revision-Date: 2013-09-07 10:01+0000\n"
+"Last-Translator: marcoagpinto <marcoagpinto@mail.telepac.pt>\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/openslides/language/pt_PT/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:9
+#: agenda/static/javascript/agenda-config-datepicker.js:39
+msgid "en"
+msgstr "Inglês"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:10
+msgid "previous month"
+msgstr "mês anterior"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:11
+msgid "next month"
+msgstr "próximo mês"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:13
+msgid "January"
+msgstr "Janeiro"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:13
+msgid "February"
+msgstr "Fevereiro"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:13
+msgid "March"
+msgstr "Março"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:14
+msgid "April"
+msgstr "Abril"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:14
+#: agenda/static/javascript/agenda-config-datepicker.js:20
+msgid "May"
+msgstr "Maio"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:14
+msgid "June"
+msgstr "Junho"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:15
+msgid "July"
+msgstr "Julho"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:15
+msgid "August"
+msgstr "Agosto"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:15
+msgid "September"
+msgstr "Setembro"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:16
+msgid "October"
+msgstr "Outubro"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:16
+msgid "November"
+msgstr "Novembro"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:16
+msgid "December"
+msgstr "Dezembro"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:19
+msgid "Jan"
+msgstr "Jan"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:19
+msgid "Feb"
+msgstr "Fev"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:19
+msgid "Mar"
+msgstr "Mar"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:20
+msgid "Apr"
+msgstr "Abr"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:20
+msgid "Jun"
+msgstr "Jun"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:21
+msgid "Jul"
+msgstr "Jul"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:21
+msgid "Aug"
+msgstr "Ago"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:21
+msgid "Sep"
+msgstr "Set"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:22
+msgid "Oct"
+msgstr "Out"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:22
+msgid "Nov"
+msgstr "Nov"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:22
+msgid "Dec"
+msgstr "Dez"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:25
+msgid "Sunday"
+msgstr "domingo"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:25
+msgid "Monday"
+msgstr "segunda-feira"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:25
+msgid "Tuesday"
+msgstr "terça-feira"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:25
+msgid "Wednesday"
+msgstr "quarta-feira"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:26
+msgid "Thursday"
+msgstr "quinta-feira"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:26
+msgid "Friday"
+msgstr "sexta-feira"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:26
+msgid "Saturday"
+msgstr "sábado"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:29
+#: agenda/static/javascript/agenda-config-datepicker.js:33
+msgid "Su"
+msgstr "Dom"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:29
+#: agenda/static/javascript/agenda-config-datepicker.js:33
+msgid "Mo"
+msgstr "Seg"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:29
+#: agenda/static/javascript/agenda-config-datepicker.js:33
+msgid "Tu"
+msgstr "Ter"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:29
+#: agenda/static/javascript/agenda-config-datepicker.js:33
+msgid "We"
+msgstr "Qua"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:30
+#: agenda/static/javascript/agenda-config-datepicker.js:34
+msgid "Th"
+msgstr "Qui"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:30
+#: agenda/static/javascript/agenda-config-datepicker.js:34
+msgid "Fr"
+msgstr "Sex"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:30
+#: agenda/static/javascript/agenda-config-datepicker.js:34
+msgid "Sa"
+msgstr "Sáb"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:45
+msgid "Time"
+msgstr "Tempo"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:46
+msgid "Hour"
+msgstr "Hora"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:47
+msgid "Minute"
+msgstr "Minuto"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:48
+msgid "Current time"
+msgstr "Tempo actual"
+
+#: agenda/static/javascript/agenda-config-datepicker.js:49
+msgid "Close"
+msgstr "Fechar"
+
+#: agenda/static/javascript/agenda.js:17
+#, c-format
+msgid ", of which %s are hidden."
+msgstr ", das quais %s estão ocultadas."
+
+#: static/javascript/dataTables.bootstrap.js:14
+msgid "All"
+msgstr "Tudo"
+
+#: static/javascript/dataTables.bootstrap.js:19
+msgid "_MENU_ entries per page"
+msgstr "_MENU_ entradas por página"
+
+#: static/javascript/dataTables.bootstrap.js:20
+msgid "Search:"
+msgstr "Busca:"
+
+#: static/javascript/dataTables.bootstrap.js:21
+msgid "Showing _START_ to _END_ of _TOTAL_ entries"
+msgstr "A mostrar _START_ a _END_ de _TOTAL_ entradas"
+
+#: static/javascript/dataTables.bootstrap.js:22
+msgid "Showing 0 entries"
+msgstr "A mostrar 0 entradas"
+
+#: static/javascript/dataTables.bootstrap.js:23
+msgid "(filtered from _MAX_ total entries)"
+msgstr "(filtrado de _MAX_ entradas totais )"
+
+#: static/javascript/dataTables.bootstrap.js:24
+msgid "No matching records found"
+msgstr "Não foram encontrados registos correspondentes"
+
+#: static/javascript/dataTables.bootstrap.js:26
+msgid "First"
+msgstr "Primeiro"
+
+#: static/javascript/dataTables.bootstrap.js:27
+msgid "Last"
+msgstr "Último"
+
+#: static/javascript/dataTables.bootstrap.js:28
+msgid "Next"
+msgstr "Próximo"
+
+#: static/javascript/dataTables.bootstrap.js:29
+msgid "Previous"
+msgstr "Anterior"

openslides/participant/forms.py

@@ -165,6 +165,7 @@ class UsersettingsForm(CssClassMixin, forms.ModelForm):
     language = forms.ChoiceField(choices=settings.LANGUAGES)
 
     def __init__(self, *args, **kwargs):
+        kwargs['initial'] = kwargs.get('initial', {})
         kwargs['initial']['user_name'] = kwargs['instance'].username
         return super(UsersettingsForm, self).__init__(*args, **kwargs)
 

tests/participant/test_views.py

@@ -122,3 +122,23 @@ class LockoutProtection(TestCase):
             form='form',
             field=None,
             errors='You can not remove the permission to manage participants from the last group your are in.')
+
+
+class TestUserSettings(TestCase):
+    def setUp(self):
+        self.admin = User.objects.get(pk=1)
+        self.admin_client = Client()
+        self.admin_client.login(username='admin', password='admin')
+
+    def test_get(self):
+        response = self.admin_client.get('/usersettings/')
+        self.assertEqual(response.status_code, 200)
+
+    def test_pst(self):
+        response = self.admin_client.post('/usersettings/', {
+            'user_name': 'new_name',
+            'language': 'de'})
+        self.assertEqual(response.status_code, 200)
+
+        admin = User.objects.get(pk=1)
+        self.assertEqual(admin.username, 'new_name')