From 9f51a2431119b14e941a3f104f964d928206f6b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rene=CC=81=20Ko=CC=88cher?= Date: Thu, 22 Nov 2012 10:26:44 +0100 Subject: [PATCH] #419 - aftermath MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - remove accidental print statements left over from debugging - create missing groups on import Signed-off-by: René Köcher --- openslides/locale/de/LC_MESSAGES/django.mo | Bin 36410 -> 36442 bytes openslides/locale/de/LC_MESSAGES/django.po | 110 +++++++++++---------- openslides/motion/views.py | 17 +++- 3 files changed, 73 insertions(+), 54 deletions(-) diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 80230a43128f2b06af7f6844a41530dfd572e0e3..8a652975791b3148cb5c4cabdfa1ad96f44f6d49 100644 GIT binary patch delta 10522 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 B;2Zz| delta 10456 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 diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index e024ae92c..c693aed2a 100644 --- a/openslides/locale/de/LC_MESSAGES/django.po +++ b/openslides/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: OpenSlides 1.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-21 23:23+0100\n" +"POT-Creation-Date: 2012-11-22 10:22+0100\n" "PO-Revision-Date: 2012-07-28 11:07+0200\n" "Last-Translator: Emanuel Schuetze \n" "Language-Team: support@openslides.de\n" @@ -231,7 +231,7 @@ msgstr "Möchten Sie die geänderte Reihenfolge der Einträge speichern?" #: assignment/templates/assignment/view.html:172 #: assignment/templates/projector/Assignment.html:78 #: assignment/templates/projector/Assignment.html:82 motion/models.py:579 -#: motion/views.py:833 motion/views.py:884 +#: motion/views.py:842 motion/views.py:893 #: motion/templates/motion/view.html:79 #: motion/templates/projector/Motion.html:37 utils/utils.py:53 #: utils/views.py:111 @@ -241,7 +241,7 @@ msgstr "Ja" #: agenda/templates/agenda/overview.html:47 assignment/models.py:301 #: assignment/views.py:580 assignment/templates/assignment/view.html:169 #: assignment/templates/projector/Assignment.html:79 motion/models.py:579 -#: motion/views.py:833 motion/views.py:885 +#: motion/views.py:842 motion/views.py:894 #: motion/templates/motion/view.html:80 #: motion/templates/projector/Motion.html:38 utils/utils.py:53 #: utils/views.py:111 @@ -483,7 +483,7 @@ msgstr "Neue Wahl wurde erfolgreich angelegt." msgid "Election was successfully modified." msgstr "Wahl wurde erfolgreich geändert." -#: assignment/views.py:138 motion/views.py:257 motion/views.py:692 +#: assignment/views.py:138 motion/views.py:257 motion/views.py:701 #: participant/views.py:506 participant/views.py:529 utils/views.py:225 #: utils/views.py:243 utils/views.py:267 msgid "Please check the form for errors." @@ -585,7 +585,7 @@ msgstr "Wahlen: %s" msgid "Candidates" msgstr "Kandidaten/innen" -#: assignment/views.py:412 motion/views.py:826 +#: assignment/views.py:412 motion/views.py:835 #: motion/templates/motion/view.html:44 msgid "Vote results" msgstr "Abstimmungsergebnis" @@ -625,7 +625,7 @@ msgstr "Ungültige Stimmen" #: assignment/templates/assignment/view.html:202 #: assignment/templates/assignment/view.html:207 #: assignment/templates/projector/Assignment.html:109 -#: assignment/templates/projector/Assignment.html:115 motion/views.py:833 +#: assignment/templates/projector/Assignment.html:115 motion/views.py:842 #: motion/templates/motion/poll_view.html:35 #: motion/templates/motion/view.html:84 #: motion/templates/projector/Motion.html:42 poll/models.py:76 @@ -660,8 +660,8 @@ msgstr[0] "%d verfügbare Posten" msgstr[1] "%d verfügbare Posten" #: assignment/views.py:580 assignment/templates/assignment/view.html:170 -#: assignment/templates/projector/Assignment.html:80 motion/views.py:833 -#: motion/views.py:886 motion/templates/motion/view.html:81 +#: assignment/templates/projector/Assignment.html:80 motion/views.py:842 +#: motion/views.py:895 motion/templates/motion/view.html:81 #: motion/templates/projector/Motion.html:39 msgid "Abstention" msgstr "Enthaltung" @@ -722,7 +722,7 @@ msgstr "Wahl-Einstellungen" #: assignment/templates/assignment/overview.html:14 #: assignment/templates/assignment/overview.html:27 #: assignment/templates/assignment/view.html:11 -#: assignment/templates/projector/Assignment.html:18 motion/views.py:804 +#: assignment/templates/projector/Assignment.html:18 motion/views.py:813 #: motion/templates/motion/overview.html:20 #: motion/templates/motion/overview.html:40 #: motion/templates/motion/view.html:34 @@ -844,7 +844,7 @@ msgid "was not a
candidate" msgstr "war kein Kandidat" #: assignment/templates/assignment/view.html:191 -#: assignment/templates/projector/Assignment.html:100 motion/views.py:833 +#: assignment/templates/projector/Assignment.html:100 motion/views.py:842 #: motion/templates/motion/view.html:82 #: motion/templates/projector/Motion.html:40 msgid "Invalid" @@ -904,7 +904,7 @@ msgstr "Allgemein" #: config/models.py:127 config/templates/config/version.html:5 #: config/templates/config/version.html:8 -#: config/templates/config/version.html:11 motion/views.py:818 +#: config/templates/config/version.html:11 motion/views.py:827 #: motion/templates/motion/view.html:214 motion/templates/motion/view.html:244 msgid "Version" msgstr "Version" @@ -942,7 +942,7 @@ msgstr "Willkommens-Widget" msgid "System" msgstr "System" -#: motion/forms.py:25 motion/models.py:547 motion/views.py:852 +#: motion/forms.py:25 motion/models.py:547 motion/views.py:861 #: motion/templates/motion/view.html:229 motion/templates/motion/view.html:249 #: motion/templates/projector/Motion.html:77 msgid "Reason" @@ -956,14 +956,14 @@ msgstr "Triviale Änderung" msgid "Trivial changes don't create a new version." msgstr "Triviale Änderungen erzeugen keine neue Version." -#: motion/forms.py:35 motion/models.py:68 motion/views.py:771 +#: motion/forms.py:35 motion/models.py:68 motion/views.py:780 #: motion/templates/motion/overview.html:41 #: motion/templates/motion/view.html:18 #: motion/templates/projector/Motion.html:55 msgid "Submitter" msgstr "Antragsteller/in" -#: motion/forms.py:44 motion/views.py:791 motion/templates/motion/view.html:22 +#: motion/forms.py:44 motion/views.py:800 motion/templates/motion/view.html:22 msgid "Supporters" msgstr "Unterstützer/innen" @@ -1182,8 +1182,8 @@ msgstr "Darf Anträge verwalten" msgid "The assembly may decide," msgstr "Die Versammlung möge beschließen," -#: motion/models.py:609 motion/views.py:721 motion/views.py:946 -#: motion/views.py:957 motion/templates/motion/base_motion.html:9 +#: motion/models.py:609 motion/views.py:730 motion/views.py:955 +#: motion/views.py:966 motion/templates/motion/base_motion.html:9 #: motion/templates/motion/overview.html:7 #: motion/templates/motion/overview.html:10 msgid "Motions" @@ -1330,73 +1330,77 @@ msgstr "FEHLER beim Zurückweisen der Version." msgid "Do you really want to reject version %s?" msgstr "Soll Version %s wirklich zurückgewiesen werden?" -#: motion/views.py:600 motion/views.py:604 motion/views.py:610 -#: motion/views.py:613 participant/api.py:76 +#: motion/views.py:599 motion/views.py:603 motion/views.py:609 +#: motion/views.py:612 participant/api.py:76 #, python-format msgid "Ignoring malformed line %d in import file." msgstr "Fehlerhafte Zeile %d der Quelldatei wurde ignoriert." -#: motion/views.py:621 +#: motion/views.py:620 #, python-format msgid "Ignoring line %d because the assigned group may not act as a person." msgstr "" -"Fehlerhafte Zeile %d der Quelldatei wurde ignoriert da die verwendete " -"Gruppe nicht als Person auftreten darf." +"Fehlerhafte Zeile %d der Quelldatei wurde ignoriert da die verwendete Gruppe " +"nicht als Person auftreten darf." -#: motion/views.py:628 -#, python-format -msgid "Ignoring line %d because the assigned group does not exist." -msgstr "" -"Fehlerhafte Zeile %d der Quelldatei wurde ignoriert da die verwendete " -"Gruppe nicht existiert." +#: motion/views.py:629 +msgid "Created by motion import." +msgstr "Erstellt durch Antragsimport." -#: motion/views.py:638 +#: motion/views.py:643 #, python-format msgid "" "Ignoring line %d because it contains an incomplete first / last name pair." msgstr "" -"Fehlerhafte Zeile %d der Quelldatei wurde ignoriert, da Vor- bzw. Nachname" -" Leerstrings enthalten." +"Fehlerhafte Zeile %d der Quelldatei wurde ignoriert, da Vor- bzw. Nachname " +"Leerstrings enthalten." -#: motion/views.py:676 +#: motion/views.py:681 #, python-format msgid "%d motion was successfully imported." msgid_plural "%d motions were successfully imported." msgstr[0] "%d Antrag wurde erfolgreich importiert." msgstr[1] "%d Anträge wurden erfolgreich importiert." -#: motion/views.py:679 +#: motion/views.py:684 #, python-format msgid "%d motion was successfully modified." msgid_plural "%d motions were successfully modified." msgstr[0] "%d Antrag wurde erfolgreich geändert." msgstr[1] "%d Anträge wurden erfolgreich geändert." -#: motion/views.py:682 +#: motion/views.py:687 #, python-format msgid "%d new user was added." msgid_plural "%d new users were added." msgstr[0] "%d neuer Nutzer wurde erstellt." msgstr[1] "%d neue Nutzer wurden erstellt." -#: motion/views.py:684 +#: motion/views.py:690 +#, python-format +msgid "%d new group was added." +msgid_plural "%d new groups were added." +msgstr[0] "%d neue Gruppe wurde erstellt." +msgstr[1] "%d neue Gruppen wurden erstellt." + +#: motion/views.py:693 #, python-format msgid "%d group assigned to motions." msgid_plural "%d groups assigned to motions." msgstr[0] "%d Gruppe wurde zugewiesen." msgstr[1] "%d Gruppen wurden zugewiesen." -#: motion/views.py:688 participant/api.py:92 +#: motion/views.py:697 participant/api.py:92 msgid "Import aborted because of severe errors in the input file." msgstr "Import auf Grund von schweren Fehlern in der Quelldatei abgebrochen." -#: motion/views.py:690 participant/api.py:94 +#: motion/views.py:699 participant/api.py:94 msgid "Import file has wrong character encoding, only UTF-8 is supported!" msgstr "" "Die Quelldatei benutzt eine ungültige Zeichenkodierung, es wird nur UTF-8 " "wird unterstützt!" -#: motion/views.py:694 +#: motion/views.py:703 msgid "" "Attention: Existing motions will be modified if you import new motions with " "the same number." @@ -1404,7 +1408,7 @@ msgstr "" "Achtung: Existierende Anträge werden geändert wenn Sie neue Anträge mit " "identischer Nummer importieren." -#: motion/views.py:695 +#: motion/views.py:704 msgid "" "Attention: Importing an motions without a number multiple times will create " "duplicates." @@ -1412,7 +1416,7 @@ msgstr "" "Achtung: Bei mehrfachem Import eines Antrags ohne Nummer können Duplikate " "entstehen." -#: motion/views.py:728 motion/views.py:866 +#: motion/views.py:737 motion/views.py:875 #: motion/templates/motion/poll_view.html:7 #: motion/templates/motion/poll_view.html:12 #: motion/templates/motion/view.html:7 motion/templates/motion/view.html:206 @@ -1422,21 +1426,21 @@ msgstr "" msgid "Motion" msgstr "Antrag" -#: motion/views.py:742 motion/templates/motion/overview.html:84 +#: motion/views.py:751 motion/templates/motion/overview.html:84 msgid "No motions available." msgstr "Keine Anträge vorhanden." -#: motion/views.py:747 motion/views.py:749 motion/views.py:764 -#: motion/views.py:766 motion/templates/motion/base_motion.html:24 +#: motion/views.py:756 motion/views.py:758 motion/views.py:773 +#: motion/views.py:775 motion/templates/motion/base_motion.html:24 #: motion/templates/projector/Motion.html:63 msgid "Motion No." msgstr "Antrag Nr." -#: motion/views.py:781 +#: motion/views.py:790 msgid "Signature" msgstr "Unterschrift" -#: motion/views.py:832 motion/templates/motion/base_motion.html:55 +#: motion/views.py:841 motion/templates/motion/base_motion.html:55 #: motion/templates/motion/poll_view.html:8 #: motion/templates/motion/poll_view.html:13 #: motion/templates/motion/view.html:66 motion/templates/motion/view.html:74 @@ -1444,21 +1448,21 @@ msgstr "Unterschrift" msgid "Vote" msgstr "Abstimmung" -#: motion/views.py:866 +#: motion/views.py:875 msgid "Poll" msgstr "Abstimmung" -#: motion/views.py:880 +#: motion/views.py:889 #, python-format msgid "Motion No. %s" msgstr "Antrag Nr. %s" -#: motion/views.py:882 +#: motion/views.py:891 #, python-format msgid "%d. Vote" msgstr "%d. Abstimmung" -#: motion/views.py:939 +#: motion/views.py:948 msgid "Motion settings successfully saved." msgstr "Antrags-Einstellungen wurden erfolgreich gespeichert." @@ -1519,8 +1523,9 @@ msgid "" "code> and is_group are optional and may be empty)" msgstr "" "Erforderliche kommaseparierte Werte: {Nummer, Titel, Text, Begründung, " -"Vorname, Nachname, Gruppenantrag} (Nummer, Begründung " -" und Gruppenantrag sind optional und können auch leer sein)" +"Vorname, Nachname, Gruppenantrag} (Nummer, " +"Begründung und Gruppenantrag sind optional und " +"können auch leer sein)" #: motion/templates/motion/import.html:13 #: participant/templates/participant/import.html:13 @@ -2381,6 +2386,11 @@ msgstr "undefinierter-dateiname" msgid "Enter valid JSON" msgstr "Gebe valides JSON ein" +#~ msgid "Ignoring line %d because the assigned group does not exist." +#~ msgstr "" +#~ "Fehlerhafte Zeile %d der Quelldatei wurde ignoriert da die verwendete " +#~ "Gruppe nicht existiert." + #~ msgid "posts" #~ msgstr "Posten" diff --git a/openslides/motion/views.py b/openslides/motion/views.py index 2b0b92467..15dbf4913 100644 --- a/openslides/motion/views.py +++ b/openslides/motion/views.py @@ -580,6 +580,7 @@ def motion_import(request): motions_generated = 0 motions_modified = 0 groups_assigned = 0 + groups_generated = 0 with transaction.commit_on_success(): dialect = csv.Sniffer().sniff(request.FILES['csvfile'].readline()) dialect = csv_ext.patchup(dialect) @@ -594,9 +595,7 @@ def motion_import(request): is_group = True else: is_group = False - print 'works for %d' % (lno + 1) except ValueError: - print 'doesn\'t work for %d' % (lno + 1) messages.error(request, _('Ignoring malformed line %d in import file.') % (lno + 1)) continue form = MotionForm({'title': title, 'text': text, 'reason': reason}) @@ -625,8 +624,14 @@ def motion_import(request): groups_assigned += 1 except Group.DoesNotExist: - messages.error(request, _('Ignoring line %d because the assigned group does not exist.') % (lno + 1)) - continue + group = Group() + group.group_as_person = True + group.description = _('Created by motion import.') + group.name = last_name + group.save() + groups_generated += 1 + + user = get_person(group.person_id) else: # fetch existing users or create new users as needed try: @@ -680,6 +685,10 @@ def motion_import(request): '%d motions were successfully modified.', motions_modified) % motions_modified) if users_generated: messages.success(request, ungettext('%d new user was added.', '%d new users were added.', users_generated) % users_generated) + + if groups_generated: + messages.success(request, ungettext('%d new group was added.', '%d new groups were added.', groups_generated) % groups_generated) + if groups_assigned: messages.success(request, ungettext('%d group assigned to motions.', '%d groups assigned to motions.', groups_assigned) % groups_assigned) return redirect(reverse('motion_overview'))