Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

cleaning up

  • Loading branch information...
commit c608a557506197ed59a6f468c38df24c7f89b634 1 parent b9e16ac
@OriHoch OriHoch authored
View
8 laws/migrations/0018_auto__add_field_bill_slug__add_field_bill_popular_name_slug.py
@@ -16,10 +16,10 @@ def forwards(self, orm):
# Adding field 'Bill.popular_name_slug'
db.add_column('laws_bill', 'popular_name_slug', self.gf('django.db.models.fields.CharField')(default='', max_length=1000, blank=True), keep_default=False)
- #for bill in orm.Bill.objects.all():
- # bill.slug = slugify_name(bill.title)
- # bill.popular_name_slug = slugify_name(bill.popular_name)
- # bill.save() # this will slugify what's needed
+ for bill in orm.Bill.objects.all():
+ bill.slug = slugify_name(bill.title)
+ bill.popular_name_slug = slugify_name(bill.popular_name)
+ bill.save() # this will slugify what's needed
def backwards(self, orm):
View
2  laws/migrations/0019_auto__chg_field_bill_slug.py
@@ -12,7 +12,7 @@ def forwards(self, orm):
db.alter_column('laws_bill', 'slug', self.gf('django.db.models.fields.SlugField')(max_length=1000))
# Adding index on 'Bill', fields ['slug']
- # db.create_index('laws_bill', ['slug'])
+ db.create_index('laws_bill', ['slug'])
def backwards(self, orm):
View
12 links/migrations/0005_auto__add_field_link_active.py
@@ -12,14 +12,14 @@ def forwards(self, orm):
db.add_column('links_link', 'active', self.gf('django.db.models.fields.BooleanField')(default=True), keep_default=False)
# set 'active' field of all links to 'true'
- # for l in orm.Link.objects.all():
- # l.active = True
- # l.save()
+ for l in orm.Link.objects.all():
+ l.active = True
+ l.save()
# set links to 'parlament.co.il' inactive
- # for l in orm.Link.objects.filter(url__contains='parlament.co.il'):
- # l.active = False
- # l.save()
+ for l in orm.Link.objects.filter(url__contains='parlament.co.il'):
+ l.active = False
+ l.save()
def backwards(self, orm):
View
BIN  locale/he/LC_MESSAGES/django.mo
Binary file not shown
View
333 locale/he/LC_MESSAGES/django.po
@@ -3,15 +3,9 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-<<<<<<< HEAD
-"POT-Creation-Date: 2013-02-18 21:45+0200\n"
-"PO-Revision-Date: 2013-01-17 01:10+0200\n"
-"Last-Translator: Benny Daon <bennydaon@gmail.com>\n"
-=======
"POT-Creation-Date: 2013-02-13 22:22+0200\n"
"PO-Revision-Date: 2013-02-13 22:22+0200\n"
"Last-Translator: Ofri Raviv <ofri.raviv@gmail.com>\n"
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
"Language-Team: Django-i18n <django-i18n@googlegroups.com>\n"
"Language: \n"
"MIME-Version: 1.0\n"
@@ -176,13 +170,6 @@ msgstr "אג'נדות"
msgid "edited by"
msgstr "בעריכת"
-<<<<<<< HEAD
-#: agendas/views.py:102 agendas/views.py:227 agendas/views.py:245
-#: agendas/views.py:263 agendas/views.py:284
-#: templates/committees/committee_detail.html:80
-#: templates/committees/committee_detail.html:90
-#: templates/committees/committee_detail.html:101
-=======
#: agendas/views.py:108
#: agendas/views.py:233
#: agendas/views.py:251
@@ -195,7 +182,6 @@ msgstr "בעריכת"
#: templates/user/editprofile.html:56
#: templates/user/editprofile.html.py:70
#: templates/user/editprofile.html:84
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
msgid "None"
msgstr "אין"
@@ -296,19 +282,10 @@ msgstr "עוקב אחר חבר כנסת"
msgid "You are following an MK"
msgstr "עוקב/ת אחר ח\"כ"
-#: committees/models.py:142
+#: committees/models.py:137
msgid "Committee Meeting"
msgstr "ישיבת ועדה"
-<<<<<<< HEAD
-#: committees/models.py:143 templates/laws/bill_detail.html:319
-#: templates/laws/bill_detail.html:378 templates/laws/law_detail.html:17
-#: templates/laws/law_detail.html.py:30 templates/laws/law_detail.html:43
-msgid "Committee Meetings"
-msgstr "ישיבות הוועדה"
-
-#: committees/models.py:334 laws/views.py:525
-=======
#: committees/models.py:138
#: templates/laws/bill_detail.html:341
#: templates/laws/bill_detail.html:400
@@ -320,47 +297,41 @@ msgstr "ישיבות הוועדה"
#: committees/models.py:322
#: laws/views.py:548
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
msgid "Title"
msgstr "כותרת"
-#: committees/models.py:336
+#: committees/models.py:324
msgid "Description"
msgstr "תאור"
-#: committees/models.py:338
+#: committees/models.py:326
msgid "published"
msgstr "פורסמה"
-#: committees/models.py:339
+#: committees/models.py:327
msgid "flagged"
msgstr "חשודה"
-#: committees/models.py:340
+#: committees/models.py:328
msgid "rejected"
msgstr "נדחתה"
-#: committees/models.py:341
+#: committees/models.py:329
msgid "accepted"
msgstr "אושרה"
-#: committees/models.py:342
+#: committees/models.py:330
msgid "appeal"
msgstr "בערעור"
-#: committees/models.py:343
+#: committees/models.py:331
msgid "deleted"
msgstr "נמחקה"
-<<<<<<< HEAD
-#: committees/models.py:352 templates/base.html:72 templates/base.html.py:124
-#: templates/committees/committee_detail.html:45
-=======
#: committees/models.py:340
#: templates/base.html:72
#: templates/base.html.py:124
#: templates/committees/committee_detail.html:44
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
#: templates/committees/committee_list.html:3
#: templates/committees/committee_list.html:4
#: templates/committees/committee_list.html:5
@@ -377,16 +348,12 @@ msgstr "נמחקה"
msgid "Committees"
msgstr "ועדות"
-#: committees/models.py:360
+#: committees/models.py:348
msgid "Topic"
msgstr "הצעה לסדר"
-<<<<<<< HEAD
-#: committees/models.py:361 templates/committees/topic_list.html:4
-=======
#: committees/models.py:349
#: templates/committees/topic_list.html:4
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
#: templates/user/followed_topics.html:4
msgid "Topics"
msgstr "הצעות לסדר"
@@ -499,39 +466,39 @@ msgstr "הארות"
msgid "feed"
msgstr "פיד"
-#: knesset/settings.py:235
+#: knesset/settings.py:234
msgid "Statement"
msgstr "הצהרה"
-#: knesset/settings.py:236
+#: knesset/settings.py:235
msgid "Funny :-)"
msgstr "מצחיק :-)"
-#: knesset/settings.py:237
+#: knesset/settings.py:236
msgid "False fact"
msgstr "עובדה שגויה"
-#: knesset/settings.py:238
+#: knesset/settings.py:237
msgid "Source?"
msgstr "מקור?"
-#: knesset/settings.py:239
+#: knesset/settings.py:238
msgid "Found source"
msgstr "הפניה למקור"
-#: knesset/settings.py:240
+#: knesset/settings.py:239
msgid "Cross reference"
msgstr "ראה גם"
-#: knesset/settings.py:241
+#: knesset/settings.py:240
msgid "Important"
msgstr "חשוב"
-#: knesset/settings.py:242
+#: knesset/settings.py:241
msgid "Formatting/Error!"
msgstr "עיצוב/שגיאה"
-#: knesset/settings.py:243
+#: knesset/settings.py:242
msgid "Comment"
msgstr "תגובה"
@@ -581,16 +548,6 @@ msgstr "סיכום ההערכה"
msgid "Vote types"
msgstr "סוגי הצבעות"
-<<<<<<< HEAD
-#: laws/forms.py:44 laws/forms.py:66 templates/auxiliary/tag_detail.html:9
-#: templates/auxiliary/tag_list.html:4 templates/auxiliary/tag_list.html:5
-#: templates/auxiliary/tag_list.html:6 templates/auxiliary/tag_list.html:13
-#: templates/committees/committeemeeting_detail.html:63
-#: templates/committees/committeemeeting_detail.html:93
-#: templates/include/vote_list.html:8 templates/laws/bill_detail.html:516
-#: templates/laws/bill_list_by_tag.html:10 templates/laws/item_tags.html:3
-#: templates/laws/vote_detail.html:24 templates/laws/vote_detail.html.py:54
-=======
#: laws/forms.py:44
#: laws/forms.py:66
#: templates/auxiliary/tag_detail.html:8
@@ -606,7 +563,6 @@ msgstr "סוגי הצבעות"
#: templates/laws/item_tags.html:3
#: templates/laws/vote_detail.html:114
#: templates/laws/vote_list_by_tag.html:10
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
msgid "Tags"
msgstr "תגיות"
@@ -711,15 +667,10 @@ msgstr "הצבעות"
msgid "Bill"
msgstr "הצעת חוק"
-<<<<<<< HEAD
-#: laws/models.py:530 laws/urls.py:11
-#: templates/committees/committeemeeting_detail.html:47
-=======
#: laws/models.py:530
#: laws/urls.py:11
#: templates/committees/committeemeeting_detail.html:83
#: templates/mks/member_detail.html:389
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
msgid "Bills"
msgstr "הצעות חוק"
@@ -1108,13 +1059,6 @@ msgstr "מפלגה"
msgid "Parties"
msgstr "סיעות"
-<<<<<<< HEAD
-#: mks/models.py:131 mks/views.py:572 templates/mks/parties_members.html:23
-msgid "Coalition"
-msgstr "קואליציה"
-
-#: mks/models.py:131 mks/views.py:576 templates/mks/parties_members.html:36
-=======
#: mks/models.py:145
#: mks/views.py:601
#: templates/mks/parties_members.html:31
@@ -1124,7 +1068,6 @@ msgstr "קואליציה"
#: mks/models.py:145
#: mks/views.py:602
#: templates/mks/parties_members.html:44
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
msgid "Opposition"
msgstr "אופוזיציה"
@@ -1214,13 +1157,9 @@ msgstr "מספר ישיבות וועדות בחודש"
msgid "Graphical view"
msgstr "תצוגה גרפית"
-<<<<<<< HEAD
-#: mks/views.py:168 mks/views.py:589 polyorg/models.py:6
-=======
#: mks/views.py:180
#: mks/views.py:613
#: polyorg/models.py:6
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
msgid "Name"
msgstr "שם"
@@ -1299,21 +1238,6 @@ msgstr "הצעות חוק שאושרו סופית"
msgid "Parties by %s"
msgstr "סיעות לפי %s"
-<<<<<<< HEAD
-#: mks/views.py:590
-msgid "Number of Members"
-msgstr "מספר חברים"
-
-#: mks/views.py:591
-msgid "Number of Seats"
-msgstr "מספר מנדטים"
-
-#: mks/views.py:592
-msgid "Affiliation"
-msgstr "שיוך"
-
-#: mks/views.py:643
-=======
#: mks/views.py:614
msgid "Number of Members"
msgstr "מספר חברים"
@@ -1327,7 +1251,6 @@ msgid "Affiliation"
msgstr "שיוך"
#: mks/views.py:667
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
#, python-format
msgid "No %(object_type)s found matching \"%(name)s\"."
msgstr "לא נמצאו %(object_type)s התואמים ל- \"%(name)s\"."
@@ -1495,19 +1418,6 @@ msgstr "אודות"
#: templates/committees/committee_list.html:5
#: templates/committees/committeemeeting_detail.html:7
#: templates/committees/committeemeeting_list_by_tag.html:5
-<<<<<<< HEAD
-#: templates/committees/flatpages.html:5 templates/laws/bill_detail.html:167
-#: templates/laws/bill_list.html:6 templates/laws/bill_list_by_tag.html:5
-#: templates/laws/bill_tags_cloud.html:5 templates/laws/vote_detail.html:7
-#: templates/laws/vote_list.html:6 templates/laws/vote_list_by_tag.html:5
-#: templates/laws/vote_tags_cloud.html:5 templates/mks/member_list.html:5
-#: templates/mks/member_list_with_bars.html:7
-#: templates/mks/parties_members.html:4 templates/mks/party_detail.html:33
-#: templates/mks/party_list.html:5 templates/mmm/committee_mmm_docs.html:9
-#: templates/mmm/member_mmm_docs.html:9 templates/planet/posts/list.html:5
-#: templates/planet/tags/cloud.html:5 templates/planet/tags/detail.html:6
-#: templates/plenum/plenummeeting_detail.html:6
-=======
#: templates/committees/flatpages.html:5
#: templates/laws/bill_detail.html:166
#: templates/laws/bill_list.html:6
@@ -1526,7 +1436,6 @@ msgstr "אודות"
#: templates/planet/posts/list.html:5
#: templates/planet/tags/cloud.html:5
#: templates/planet/tags/detail.html:6
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
#: templates/polyorg/candidatelist_compare.html:5
#: templates/polyorg/candidatelist_detail.html:7
#: templates/polyorg/candidatelist_list.html:7
@@ -1556,15 +1465,6 @@ msgid "login"
msgstr "כניסה לחשבון"
#: templates/base.html:69
-<<<<<<< HEAD
-msgid "Election"
-msgstr "בחירות 2013"
-
-#: templates/base.html:70 templates/base.html.py:122
-#: templates/mks/member_detail.html:67 templates/mks/parties_members.html:3
-#: templates/mks/parties_members.html:4 templates/mks/parties_members.html:7
-#: templates/mks/party_detail.html:37 templates/mks/party_list.html:24
-=======
msgid "Knesset 19"
msgstr "הכנסת ה- 19"
@@ -1577,7 +1477,6 @@ msgstr "הכנסת ה- 19"
#: templates/mks/parties_members.html:15
#: templates/mks/party_detail.html:36
#: templates/mks/party_list.html:24
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
#: templates/polyorg/candidatelist_compare.html:4
msgid "Members and Parties"
msgstr "ח&quot;כים וסיעות"
@@ -2260,15 +2159,6 @@ msgstr "ההצעות שלך"
msgid "Please select"
msgstr "נא לבחור"
-<<<<<<< HEAD
-#: templates/agendas/agendasfor.html:38
-#: templates/committees/committeemeeting_detail.html:40
-#: templates/committees/committeemeeting_detail.html:56
-#: templates/committees/committeemeeting_list.html:10
-#: templates/laws/bill_detail.html:310 templates/laws/bill_detail.html:369
-#: templates/laws/bill_detail.html:428 templates/laws/vote_detail.html:102
-#: templates/laws/vote_detail.html:127
-=======
#: templates/agendas/agendasfor.html:47
#: templates/committees/committeemeeting_detail.html:61
#: templates/committees/committeemeeting_detail.html:94
@@ -2278,7 +2168,6 @@ msgstr "נא לבחור"
#: templates/laws/bill_detail.html:391
#: templates/laws/bill_detail.html:450
#: templates/laws/vote_member_photos.html:37
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
msgid "Submit"
msgstr "אישור"
@@ -2429,11 +2318,7 @@ msgid "Remove"
msgstr "מחיקה"
#: templates/comments/delete.html:13
-<<<<<<< HEAD
-#: templates/committees/committeemeeting_detail.html:147
-=======
#: templates/committees/committeemeeting_detail.html:139
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
#: templates/committees/delete_topic.html:13
#: templates/laws/bill_confirm_vote.html:22
#: templates/laws/bill_unbind_vote.html:18
@@ -2464,21 +2349,6 @@ msgstr "מחיקת תגובה"
msgid "No comments yet"
msgstr "אין עדיין תגובות"
-<<<<<<< HEAD
-#: templates/comments/object_comment_list.html:37
-#: templates/committees/committee_detail.html:126
-#: templates/committees/committeemeeting_detail.html:88
-#: templates/laws/bill_detail.html:542 templates/laws/bill_detail.html:579
-#: templates/laws/vote_detail.html:49
-msgid "Please"
-msgstr "אנא"
-
-#: templates/comments/object_comment_list.html:37
-#: templates/committees/committee_detail.html:127
-#: templates/committees/committeemeeting_detail.html:88
-#: templates/laws/bill_detail.html:542 templates/laws/bill_detail.html:579
-#: templates/laws/vote_detail.html:49
-=======
#: templates/comments/object_comment_list.html:36
#: templates/committees/committee_detail.html:115
#: templates/committees/committeemeeting_detail.html:215
@@ -2494,7 +2364,6 @@ msgstr "אנא"
#: templates/laws/bill_detail.html:564
#: templates/laws/bill_detail.html:601
#: templates/laws/vote_detail.html:140
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
msgid "validate your email"
msgstr "אמת/י את הדואר אלקטרוני שסיפקת"
@@ -2525,69 +2394,52 @@ msgstr "מ&quot;מ"
msgid "No topics suggested yet"
msgstr "טרם הוצעו הצעות לסדר"
-#: templates/committees/committee_detail.html:75
+#: templates/committees/committee_detail.html:68
msgid "Future Meetings"
msgstr "ישיבות קרובות"
-#: templates/committees/committee_detail.html:85
+#: templates/committees/committee_detail.html:78
msgid "Meetings for which a protocol was not yet published"
msgstr "ישיבות מהן טרם פורסם פרוטוקול"
-#: templates/committees/committee_detail.html:96
+#: templates/committees/committee_detail.html:88
msgid "Last Meetings"
msgstr "ישיבות אחרונות"
-<<<<<<< HEAD
-#: templates/committees/committee_detail.html:103
-#: templates/user/public_profile.html:63 templates/user/public_profile.html:81
-=======
#: templates/committees/committee_detail.html:95
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
msgid "more..."
msgstr "עוד..."
-#: templates/committees/committee_detail.html:108
+#: templates/committees/committee_detail.html:99
msgid "MMM Documents"
msgstr "מסמך ממ\"מ"
-<<<<<<< HEAD
-#: templates/committees/committee_detail.html:119
-#: templates/committees/committee_list.html:73
-#: templates/committees/committee_list.html:84
-=======
#: templates/committees/committee_detail.html:108
#: templates/committees/committee_list.html:71
#: templates/committees/committee_list.html:82
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
#: templates/committees/topic_list.html:8
msgid "Suggested Agenda Topics"
msgstr "הצעות לסדר יום"
-#: templates/committees/committee_detail.html:124
+#: templates/committees/committee_detail.html:113
msgid "Suggest Topic"
msgstr "הצעה לסדר"
-#: templates/committees/committee_detail.html:126
+#: templates/committees/committee_detail.html:115
msgid "to suggest a topic"
msgstr "להעלות הצעה לסדר"
-#: templates/committees/committee_detail.html:130
+#: templates/committees/committee_detail.html:119
msgid "Please login to suggest a topic"
msgstr "יש להזדהות כדי לפרסם הצעה לסדר"
-#: templates/committees/committee_detail.html:139
+#: templates/committees/committee_detail.html:127
msgid "Latest Annotations"
msgstr "הארות אחרונות"
-<<<<<<< HEAD
-#: templates/committees/committee_detail.html:155
-#: templates/user/annotated_items.html:20
-#: templates/user/public_profile.html:59
-=======
#: templates/committees/committee_detail.html:143
#: templates/user/annotated_items.html:29
#: templates/user/public_profile.html:54
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
msgid "No annotations yet..."
msgstr "אין עדיין הארות"
@@ -2607,112 +2459,6 @@ msgstr "מצטערים, רק עורכים יכולים למחוק הערות"
msgid "Please email editors if an annotation should be deleted"
msgstr "נא לשלוח דואל לעורכי האתר אם צריך למחוק את ההארה"
-<<<<<<< HEAD
-#: templates/committees/committeemeeting_detail.html:31
-msgid "Back to plenum"
-msgstr "חזרה למליאה"
-
-#: templates/committees/committeemeeting_detail.html:33
-msgid "Back to committee"
-msgstr "חזרה לוועדה"
-
-#: templates/committees/committeemeeting_detail.html:38
-msgid "MKs attended"
-msgstr \"כים נוכחים"
-
-#: templates/committees/committeemeeting_detail.html:40
-#: templates/laws/vote_detail.html:102 templates/laws/vote_detail.html:127
-msgid "Suggest an MK"
-msgstr "הוספת חבר כנסת"
-
-#: templates/committees/committeemeeting_detail.html:43
-msgid "Background Material"
-msgstr "חומר רקע"
-
-#: templates/committees/committeemeeting_detail.html:51
-msgid "Suggest a matching bill"
-msgstr "הוספת הצעת חוק מתאימה"
-
-#: templates/committees/committeemeeting_detail.html:70
-#: templates/committees/committeemeeting_detail.html:101
-#: templates/laws/bill_detail.html:523 templates/laws/vote_detail.html:31
-#: templates/laws/vote_detail.html.py:62
-msgid "No tags yet"
-msgstr "אין עדיין תגיות"
-
-#: templates/committees/committeemeeting_detail.html:74
-#: templates/laws/bill_detail.html:528 templates/laws/vote_detail.html:35
-msgid "Edit Tags"
-msgstr "עריכת תגיות"
-
-#: templates/committees/committeemeeting_detail.html:76
-msgid "Click here for tags related to this committee"
-msgstr "רשימת התגים הקשורים לוועדה זו"
-
-#: templates/committees/committeemeeting_detail.html:76
-msgid "Click here to see all available tags"
-msgstr "רשימת התגים המלאה"
-
-#: templates/committees/committeemeeting_detail.html:80
-#: templates/laws/bill_detail.html:534 templates/laws/vote_detail.html:41
-msgid "Create new tag"
-msgstr "יצירת תגית חדשה"
-
-#: templates/committees/committeemeeting_detail.html:85
-#: templates/laws/bill_detail.html:539 templates/laws/bill_detail.html:576
-#: templates/laws/vote_detail.html:46
-msgid "Send"
-msgstr "שליחה"
-
-#: templates/committees/committeemeeting_detail.html:88
-#: templates/laws/bill_detail.html:542 templates/laws/bill_detail.html:579
-#: templates/laws/vote_detail.html:49
-msgid " to create new tags"
-msgstr "כדי ליצור תגיות חדשות"
-
-#: templates/committees/committeemeeting_detail.html:104
-#: templates/laws/vote_detail.html:64
-msgid "Login to edit tags"
-msgstr "רוצה להציע תגית? לחץ/י כאן כדי להרשם"
-
-#: templates/committees/committeemeeting_detail.html:112
-msgid "Protocol"
-msgstr "פרוטוקול"
-
-#: templates/committees/committeemeeting_detail.html:125
-msgid "Please Mark Passage"
-msgstr "אנא סמנו קטע"
-
-#: templates/committees/committeemeeting_detail.html:128
-msgid "Beginning with"
-msgstr "מתחיל ב"
-
-#: templates/committees/committeemeeting_detail.html:130
-msgid "Ending with"
-msgstr "מסתיים ב"
-
-#: templates/committees/committeemeeting_detail.html:135
-msgid "Type your note"
-msgstr "סוג ההארה"
-
-#: templates/committees/committeemeeting_detail.html:138
-msgid "Color"
-msgstr "צבע"
-
-#: templates/committees/committeemeeting_detail.html:146
-msgid "Save note"
-msgstr "שמור"
-
-#: templates/committees/committeemeeting_detail.html:150
-msgid "Your note will be published under"
-msgstr "ההארה שלך תפורסם ברשיון"
-
-#: templates/committees/committeemeeting_detail.html:168
-msgid "View all"
-msgstr "הצגת כל ההערות"
-
-#: templates/committees/committeemeeting_detail.html:172
-=======
#: templates/committees/committeemeeting_detail.html:53
msgid "MKs attended"
msgstr \"כים נוכחים"
@@ -2767,7 +2513,6 @@ msgid "View all"
msgstr "הצגת כל ההערות"
#: templates/committees/committeemeeting_detail.html:165
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
msgid "Annotate"
msgstr "האירו"
@@ -2951,17 +2696,10 @@ msgstr "אתר"
msgid "none"
msgstr "אין"
-<<<<<<< HEAD
-#: templates/include/member_list.html:6 templates/include/party_detail.html:7
-#: templates/include/party_list.html:6 templates/include/vote_list.html:20
-#: templates/mks/member_list.html:21
-#: templates/mks/member_list_with_bars.html:40
-=======
#: templates/include/member_list.html:6
#: templates/include/party_detail.html:7
#: templates/include/party_list.html:6
#: templates/include/vote_list.html:20
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
#: templates/mks/member_select.html:18
msgid "Data base empty, no objects"
msgstr "המסד ריק, אין נתונים"
@@ -3433,25 +3171,6 @@ msgstr "סטטיסטיקה"
msgid "Average votes per MK"
msgstr "ממוצע הצבעות לח\"כ"
-<<<<<<< HEAD
-#: templates/mks/party_detail.html:92
-msgid "Factional discipline"
-msgstr "משמעת סיעתית"
-
-#: templates/mks/party_detail.html:99
-msgid "Coalition discipline"
-msgstr "משמעת קואליציה"
-
-#: templates/mks/party_detail.html:101
-msgid "Opposition discipline"
-msgstr "משמעת אופוזיציה"
-
-#: templates/mks/party_list.html:38
-msgid "Compare by"
-msgstr "השוואה לפי"
-
-=======
->>>>>>> fde4f850f93c2a00cdaecb0c7da8d698d322c4db
#: templates/mmm/committee_mmm_docs.html:5
#: templates/mmm/committee_mmm_docs.html:8
#, python-format
View
41 mmm/migrations/0001_initial.py
@@ -8,32 +8,31 @@
class Migration(SchemaMigration):
def forwards(self, orm):
- do='nothing'
# Adding model 'Document'
- #db.create_table('mmm_document', (
- #('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
- #('url', self.gf('django.db.models.fields.URLField')(unique=True, max_length=200)),
- #('title', self.gf('django.db.models.fields.CharField')(max_length=2000)),
- #('publication_date', self.gf('django.db.models.fields.DateField')(null=True, blank=True)),
- #('author_names', self.gf('django.db.models.fields.CharField')(max_length=500, blank=True)),
- #))
- #db.send_create_signal('mmm', ['Document'])
+ db.create_table('mmm_document', (
+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('url', self.gf('django.db.models.fields.URLField')(unique=True, max_length=200)),
+ ('title', self.gf('django.db.models.fields.CharField')(max_length=2000)),
+ ('publication_date', self.gf('django.db.models.fields.DateField')(null=True, blank=True)),
+ ('author_names', self.gf('django.db.models.fields.CharField')(max_length=500, blank=True)),
+ ))
+ db.send_create_signal('mmm', ['Document'])
# Adding M2M table for field req_committee on 'Document'
- #db.create_table('mmm_document_req_committee', (
- #('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
- #('document', models.ForeignKey(orm['mmm.document'], null=False)),
- #('committee', models.ForeignKey(orm['committees.committee'], null=False))
- #))
- #db.create_unique('mmm_document_req_committee', ['document_id', 'committee_id'])
+ db.create_table('mmm_document_req_committee', (
+ ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+ ('document', models.ForeignKey(orm['mmm.document'], null=False)),
+ ('committee', models.ForeignKey(orm['committees.committee'], null=False))
+ ))
+ db.create_unique('mmm_document_req_committee', ['document_id', 'committee_id'])
# Adding M2M table for field req_mks on 'Document'
- #db.create_table('mmm_document_req_mks', (
- #('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
- #('document', models.ForeignKey(orm['mmm.document'], null=False)),
- #('member', models.ForeignKey(orm['mks.member'], null=False))
- #))
- #db.create_unique('mmm_document_req_mks', ['document_id', 'member_id'])
+ db.create_table('mmm_document_req_mks', (
+ ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+ ('document', models.ForeignKey(orm['mmm.document'], null=False)),
+ ('member', models.ForeignKey(orm['mks.member'], null=False))
+ ))
+ db.create_unique('mmm_document_req_mks', ['document_id', 'member_id'])
def backwards(self, orm):
View
102 plenum/create_protocol_parts.py
@@ -0,0 +1,102 @@
+# encoding: utf-8
+
+import re,logging
+from xml.etree import ElementTree
+import committees.models
+
+logger = logging.getLogger("open-knesset.plenum.create_protocol_parts")
+
+def _plenum_parseParaElement(para):
+ isBold=False
+ if para.find('emphasis') is not None:
+ isBold=True
+ txt=''
+ for subtext in para.itertext():
+ txt+=subtext
+ return (isBold,txt)
+
+def _plenum_parseParaText(para,isBold):
+ t='text'
+ if isBold and re.search(r":[\s]*$",para) is not None:
+ # bold + ends with a colon
+ t='speaker'
+ elif isBold:
+ t='title'
+ return t
+
+def _plenum_parsePara(txt,t,titles):
+ if titles is None:
+ titles=[]
+ if t=='speaker':
+ titles.append({u't':u'',u'c':[
+ {u't':txt,u'c':[],u's':1}
+ ]})
+ elif t=='title':
+ titles.append({u't':txt,u'c':[]})
+ else:
+ titles.append({u't':'',u'c':[
+ {u't':txt,u's':0}
+ ]})
+ elif t=='title':
+ titles.append({u't':txt,u'c':[]})
+ else:
+ title=titles[len(titles)-1]
+ children=title['c']
+ if t=='speaker':
+ children.append({u't':txt,u'c':[],u's':1})
+ elif len(children)==0:
+ children.append({u't':txt,u's':0})
+ elif children[len(children)-1]['s']==1:
+ children[len(children)-1]['c'].append({u't':txt})
+ else:
+ children.append({u't':txt,u's':0})
+ return titles
+
+_parts=None
+
+def _savePart(meeting,header,body,type):
+ global _partsCounter
+ global _parts
+ _parts.append(
+ committees.models.ProtocolPart(meeting=meeting, order=len(_parts), header=header.strip(), body=body.strip(), type=type)
+ )
+
+def create_plenum_protocol_parts(meeting):
+ global _parts
+ _parts=[]
+ txt=meeting.protocol_text.encode('utf-8')
+ tree=ElementTree.fromstring(txt)
+ titles=None
+ for para in tree.iter('para'):
+ (isBold,txt)=_plenum_parseParaElement(para)
+ t=_plenum_parseParaText(txt,isBold)
+ titles=_plenum_parsePara(txt,t,titles)
+ for title in titles:
+ titleHeader=title['t'].strip()
+ titleBody=[]
+ #_savePart(meeting,'',t,'title')
+ for child in title['c']:
+ if child['s']==1:
+ # it's a speaker, save the aggregated title texts
+ if len(titleHeader)>0 or len(titleBody)>0:
+ _savePart(meeting,titleHeader,'\n\n'.join(titleBody),'title')
+ titleHeader=''
+ titleBody=[]
+ speakerHeader=child['t'].strip()
+ speakerText=[]
+ for schild in child['c']:
+ t=schild['t'].strip()
+ if len(t)>0:
+ speakerText.append(t)
+ _savePart(meeting,speakerHeader,'\n\n'.join(speakerText),'speaker')
+ else:
+ t=child['t'].strip()
+ if len(t)>0:
+ titleBody.append(t)
+ if len(titleHeader)>0 or len(titleBody)>0:
+ _savePart(meeting,titleHeader,'\n\n'.join(titleBody),'title')
+ if len(_parts)>0:
+ committees.models.ProtocolPart.objects.bulk_create(_parts)
+ logger.debug('wrote '+str(len(_parts))+' protocol parts')
+
+
View
20 requirements.txt
@@ -23,18 +23,18 @@ django-social-auth>=0.7.19
oauth==1.0.1
python-dateutil==1.5
python-memcached
--e git+http://github.com/openid/python-openid.git#egg=python-openid
+-e git://github.com/openid/python-openid.git#egg=python-openid
django-tastypie==0.9.11
django-ratings
--e git+http://github.com/thornomad/django-hitcount.git#egg=django-hitcount
--e git+http://github.com/hasadna/django-activity-stream.git#egg=django-activity-stream
--e git+http://github.com/hasadna/django-planet.git#egg=django-planet
--e git+http://github.com/hasadna/django-annotatetext.git#egg=django-annotatetext
--e git+http://github.com/pinax/django-mailer.git#egg=django-mailer
--e git+http://github.com/hasadna/django-avatar.git#egg=django-avatar
--e git+http://github.com/hasadna/django-backlinks.git#egg=django-backlinks
--e git+http://github.com/spreeker/django-voting2.git#egg=django-voting2
--e git+http://github.com/hasadna/django-piston.git#egg=django-piston
+-e git://github.com/thornomad/django-hitcount.git#egg=django-hitcount
+-e git://github.com/hasadna/django-activity-stream.git#egg=django-activity-stream
+-e git://github.com/hasadna/django-planet.git#egg=django-planet
+-e git://github.com/hasadna/django-annotatetext.git#egg=django-annotatetext
+-e git://github.com/pinax/django-mailer.git#egg=django-mailer
+-e git://github.com/hasadna/django-avatar.git#egg=django-avatar
+-e git://github.com/hasadna/django-backlinks.git#egg=django-backlinks
+-e git://github.com/spreeker/django-voting2.git#egg=django-voting2
+-e git://github.com/hasadna/django-piston.git#egg=django-piston
django-debug-toolbar>=0.8.3
nose
django-nose
View
2  simple/urls.py
@@ -6,4 +6,4 @@
(r'^hello/$', 'knesset.simple.views.hello_world'),
# Define other pages you want to create here
-)
+)
View
1  templates/committees/committeemeeting_detail.html
@@ -52,6 +52,7 @@
<div class="spacer fill">
<h2>{% trans "MKs attended" %}</h2>
{% include "committees/committee_member_photos.html" with members=object.mks_attended.all chairpersons=object.committee.chairpersons.all replacements=object.committee.replacements.all%}
+
{% if user.is_authenticated %}
<form method="post" action="." class="form-inline">{% csrf_token %}
<input type="hidden" name="user_input_type" value="mk">
View
7 templates/plenum/_meeting_li.html
@@ -1,7 +0,0 @@
-{% if add_li %}<li>{% endif %}
- <p class="item-title">
- <a href="{{ o.get_absolute_url }}">{{ o.date }}</a>
- </p>
-{% if add_li %}</li>{% endif %}
-
-
Please sign in to comment.
Something went wrong with that request. Please try again.