Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

added get_role property to MK

  • Loading branch information...
commit f3836ec16126ca9249a0d739fc2dae963fb7938b 1 parent 817b722
@ofri authored
View
BIN  locale/he/LC_MESSAGES/django.mo
Binary file not shown
View
180 locale/he/LC_MESSAGES/django.po
@@ -5,8 +5,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-17 19:59+0300\n"
-"PO-Revision-Date: 2010-08-20 19:49+0200\n"
+"POT-Creation-Date: 2010-08-21 10:25+0300\n"
+"PO-Revision-Date: 2010-08-21 10:27+0200\n"
"Last-Translator: Ofri Raviv <ofri.raviv@gmail.com>\n"
"Language-Team: Django-i18n <django-i18n@googlegroups.com>\n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"X-Poedit-Bookmarks: -1,988,-1,-1,-1,-1,-1,-1,-1,-1\n"
#: context.py:15
-#: mks/models.py:114
+#: mks/models.py:116
#: mks/views.py:62
#: mks/views.py:74
#: mks/views.py:86
@@ -126,11 +126,11 @@ msgstr "נוכח ולא הצביע"
msgid "N/A"
msgstr ""
-#: laws/models.py:193
+#: laws/models.py:195
msgid "Vote"
msgstr "הצבעה"
-#: laws/models.py:194
+#: laws/models.py:196
#: laws/urls.py:10
#: laws/urls.py:13
#: templates/include/member_detail.html:47
@@ -140,50 +140,50 @@ msgstr "הצבעה"
msgid "Votes"
msgstr "הצבעות"
-#: laws/models.py:351
+#: laws/models.py:353
#: mks/forms.py:6
msgid "Proposed"
msgstr "הצעה"
-#: laws/models.py:352
+#: laws/models.py:354
msgid "Pre-Approved"
msgstr "עברה קריאה טרומית"
-#: laws/models.py:353
+#: laws/models.py:355
msgid "Failed Pre-Approval"
msgstr "נפלה בקריאה טרומית"
-#: laws/models.py:354
+#: laws/models.py:356
msgid "In Committee"
msgstr "בוועדה"
-#: laws/models.py:355
+#: laws/models.py:357
#: templates/laws/bill_detail.html:208
msgid "First Vote"
msgstr "קריאה ראשונה"
-#: laws/models.py:356
+#: laws/models.py:358
msgid "Failed First Vote"
msgstr "נפלה בקריאה ראשונה"
-#: laws/models.py:357
+#: laws/models.py:359
msgid "Committee Corrections"
msgstr "בתיקונים בוועדה"
-#: laws/models.py:358
+#: laws/models.py:360
msgid "Approved"
msgstr "אושרה"
-#: laws/models.py:359
+#: laws/models.py:361
msgid "Failed Approval"
msgstr "נפלה בקריאה שלישית"
-#: laws/models.py:375
+#: laws/models.py:377
#: templates/laws/vote_detail.html:70
msgid "Bill"
msgstr "הצעת חוק"
-#: laws/models.py:376
+#: laws/models.py:378
#: laws/urls.py:11
#: laws/urls.py:12
#: templates/base.html:76
@@ -291,12 +291,12 @@ msgid "Against Party"
msgstr "הצבעות נגד המפלגה"
#: laws/views.py:198
-#: templates/mks/member_detail.html:78
+#: templates/mks/member_detail.html:77
#: templates/mks/party_detail.html:16
msgid "Number of votes"
msgstr "מספר הצבעות"
-#: laws/views.py:295
+#: laws/views.py:305
#, python-format
msgid "Votes tagged %(tag)s"
msgstr "הצבעות שתויגו %(tag)s"
@@ -306,9 +306,9 @@ msgstr "הצבעות שתויגו %(tag)s"
#: laws/templatetags/laws_extra.py:53
#: laws/templatetags/laws_extra.py:56
#: laws/templatetags/laws_extra.py:65
-#: templates/mks/member_detail.html:84
-#: templates/mks/member_detail.html:89
-#: templates/mks/member_detail.html:94
+#: templates/mks/member_detail.html:83
+#: templates/mks/member_detail.html:88
+#: templates/mks/member_detail.html:93
msgid "Not enough data"
msgstr "אין מספיק נתונים"
@@ -415,10 +415,34 @@ msgstr "מקום מגורים מדויק (למשל, כתובת)"
msgid "a general area of residence (for example, \"the negev\""
msgstr "אזור מגורים (למשל, \"נגב\")"
-#: mks/models.py:113
+#: mks/models.py:115
msgid "Member"
msgstr \"כ"
+#: mks/models.py:219
+msgid "Coalition Member (female)"
+msgstr "חברת כנסת בקואליציה"
+
+#: mks/models.py:221
+msgid "Opposition Member (female)"
+msgstr "חברת כנסת באופוזיציה"
+
+#: mks/models.py:224
+msgid "Coalition Member (male)"
+msgstr "חבר כנסת בקואליציה"
+
+#: mks/models.py:226
+msgid "Opposition Member (male)"
+msgstr "חבר כנסת באופוזיציה"
+
+#: mks/models.py:229
+msgid "Past Member (female)"
+msgstr "חברת כנסת לשעבר"
+
+#: mks/models.py:231
+msgid "Past Member (male)"
+msgstr "חבר כנסת לשעבר"
+
#: mks/views.py:51
msgid "By ABC"
msgstr "לפי א\"ב"
@@ -605,7 +629,7 @@ msgid "Choose a tab to start browsing"
msgstr "שלום! אנא בחר באחד מהקישורים למעלה"
#: templates/_main.html:3
-#: templates/mks/member_detail.html:22
+#: templates/mks/member_detail.html:21
msgid "or"
msgstr "או"
@@ -641,7 +665,7 @@ msgid "Logout"
msgstr "יציאה מהחשבון"
#: templates/base.html:65
-#: templates/mks/member_detail.html:21
+#: templates/mks/member_detail.html:20
#: templates/user/login.html:4
#: templates/user/login.html.py:17
msgid "login"
@@ -696,6 +720,18 @@ msgstr "קריאת את פרוטוקול הישיבה"
msgid "read post"
msgstr "קריאת מאמר"
+#: templates/activity/tag-voted/action.html:5
+msgid "voted up on tag"
+msgstr ""
+
+#: templates/activity/tag-voted/action.html:7
+msgid "voted down on tag"
+msgstr ""
+
+#: templates/activity/tag-voted/action.html:11
+msgid "of"
+msgstr ""
+
#: templates/activity/voted/action.html:8
msgid "present and didn't vote"
msgstr "נכח ולא הצביע"
@@ -717,7 +753,7 @@ msgid "Back to committee"
msgstr "חזרה לוועדה"
#: templates/committees/committeemeeting_detail.html:11
-#: templates/mks/member_detail.html:120
+#: templates/mks/member_detail.html:119
msgid "Topics"
msgstr "נושאים"
@@ -759,7 +795,6 @@ msgstr "אין עדיין תגובות"
#: templates/committees/committeemeeting_detail.html:43
#: templates/laws/vote_detail.html:147
-#: templates/mks/member_detail.html:20
msgid "Please"
msgstr "אנא"
@@ -783,37 +818,37 @@ msgid "party"
msgstr "מפלגה"
#: templates/include/member_detail.html:9
-#: templates/mks/member_detail.html:41
+#: templates/mks/member_detail.html:40
msgid "age"
msgstr "גיל"
#: templates/include/member_detail.html:14
-#: templates/mks/member_detail.html:46
+#: templates/mks/member_detail.html:45
msgid "year of aliyah"
msgstr "שנת עליה"
#: templates/include/member_detail.html:19
-#: templates/mks/member_detail.html:51
+#: templates/mks/member_detail.html:50
msgid "family status"
msgstr "מצב משפחתי"
#: templates/include/member_detail.html:23
-#: templates/mks/member_detail.html:55
+#: templates/mks/member_detail.html:54
msgid "place of birth"
msgstr "מקום לידה"
#: templates/include/member_detail.html:27
-#: templates/mks/member_detail.html:133
+#: templates/mks/member_detail.html:132
msgid "phone"
msgstr "טלפון"
#: templates/include/member_detail.html:31
-#: templates/mks/member_detail.html:138
+#: templates/mks/member_detail.html:137
msgid "fax"
msgstr "פקס"
#: templates/include/member_detail.html:35
-#: templates/mks/member_detail.html:143
+#: templates/mks/member_detail.html:142
msgid "e-mail address"
msgstr "כתובת דוא\"ל"
@@ -1104,7 +1139,7 @@ msgid "This vote is mentioned in the following committe meetings"
msgstr "הצבעה זו מוזכרת בישיבות הוועדות הבאות"
#: templates/laws/vote_detail.html:115
-#: templates/mks/member_detail.html:149
+#: templates/mks/member_detail.html:148
msgid "Links"
msgstr "קישורים"
@@ -1195,114 +1230,116 @@ msgstr "אין ח\"כים במעקב. אפשר להוסיף על ידי לחיצ
msgid "You have to be logged in to watch a user."
msgstr "כדי לעקוב אחר חבר כנסת צריך להכנס לחשבון."
-#: templates/mks/member_detail.html:23
+#: templates/mks/member_detail.html:22
#: templates/user/create_user.html:8
msgid "register"
msgstr "הרשמה"
-#: templates/mks/member_detail.html:29
+#: templates/mks/member_detail.html:28
msgid "All Members"
msgstr "כל הח\"כים"
-#: templates/mks/member_detail.html:31
+#: templates/mks/member_detail.html:30
#: templates/planet/blogs/list.html:32
#: templates/planet/feeds/list.html:24
msgid "feed"
msgstr "פיד"
-#: templates/mks/member_detail.html:38
+#: templates/mks/member_detail.html:37
msgid "Personal Information"
msgstr "מידע אישי"
-#: templates/mks/member_detail.html:59
+#: templates/mks/member_detail.html:58
msgid "place of residence"
msgstr "מקום מגורים"
-#: templates/mks/member_detail.html:63
+#: templates/mks/member_detail.html:62
msgid "residence centrality"
msgstr "מדד מרכזיות של מקום מגורים"
-#: templates/mks/member_detail.html:67
+#: templates/mks/member_detail.html:66
msgid "residence economy"
msgstr "מדד סוציואקונומי של מקום מגורים"
-#: templates/mks/member_detail.html:75
+#: templates/mks/member_detail.html:74
#: templates/mks/party_detail.html:12
msgid "Statistics"
msgstr "סטטיסטיקות"
-#: templates/mks/member_detail.html:80
-#: templates/mks/member_detail.html:85
-#: templates/mks/member_detail.html:90
+#: templates/mks/member_detail.html:79
+#: templates/mks/member_detail.html:84
+#: templates/mks/member_detail.html:89
msgid "Last 30 days"
msgstr "ב 30 הימים האחרונים"
-#: templates/mks/member_detail.html:83
+#: templates/mks/member_detail.html:82
#: templates/mks/party_detail.html:24
msgid "Factional discipline"
msgstr "משמעת סיעתית"
-#: templates/mks/member_detail.html:88
+#: templates/mks/member_detail.html:87
#: templates/mks/party_detail.html:28
msgid "Coalition discipline"
msgstr "משמעת קואליציה"
-#: templates/mks/member_detail.html:88
+#: templates/mks/member_detail.html:87
#: templates/mks/party_detail.html:28
msgid "Opposition discipline"
msgstr "משמעת אופוזיציה"
-#: templates/mks/member_detail.html:93
+#: templates/mks/member_detail.html:92
msgid "Average weekly hours"
msgstr "שעות שבועיות בממוצע"
-#: templates/mks/member_detail.html:97
+#: templates/mks/member_detail.html:96
msgid "Average number of committee meetings per month"
msgstr "ישיבות וועדות בחודש"
-#: templates/mks/member_detail.html:101
+#: templates/mks/member_detail.html:100
msgid "Number of bills proposed"
msgstr "מספר הצעות חוק שהוצעו"
-#: templates/mks/member_detail.html:105
+#: templates/mks/member_detail.html:104
msgid "Bills passed pre-vote"
msgstr "הצעות חוק שאושרו טרומית"
-#: templates/mks/member_detail.html:109
+#: templates/mks/member_detail.html:108
msgid "Bills passed first vote"
msgstr "הצעות חוק שאושרו בקריאה ראשונה"
-#: templates/mks/member_detail.html:113
+#: templates/mks/member_detail.html:112
msgid "Bills approved"
msgstr "הצעות חוק שאושרו סופית"
-#: templates/mks/member_detail.html:123
+#: templates/mks/member_detail.html:122
msgid "Proposed bills topics"
msgstr "נושאי הצעות חוק"
-#: templates/mks/member_detail.html:130
+#: templates/mks/member_detail.html:129
msgid "Contact Information"
msgstr "יצירת קשר"
-#: templates/mks/member_detail.html:158
+#: templates/mks/member_detail.html:157
msgid "Refresh"
msgstr "רענון"
-#: templates/mks/member_detail.html:164
+#: templates/mks/member_detail.html:163
+#: templates/user/public_profile.html:27
msgid "before"
msgstr "לפני"
-#: templates/mks/member_detail.html:171
+#: templates/mks/member_detail.html:170
+#: templates/user/public_profile.html:34
msgid "Sorry, no data is available, try selecting more actions and refresh"
msgstr "מצטערים, אין נתונים. אפשר לנסות לבחור יותר פעולות ולרענן."
-#: templates/mks/member_detail.html:182
-#: templates/mks/member_detail.html:213
+#: templates/mks/member_detail.html:181
+#: templates/mks/member_detail.html:212
msgid "Unwatch"
msgstr "הפסק מעקב"
-#: templates/mks/member_detail.html:185
-#: templates/mks/member_detail.html:196
+#: templates/mks/member_detail.html:184
+#: templates/mks/member_detail.html:195
msgid "Watch"
msgstr "מעקב"
@@ -1628,6 +1665,21 @@ msgstr "כתובת דוא\"ל:"
msgid "Reset my password"
msgstr "אפס את סיסמתי"
+#: templates/user/public_profile.html:13
+#, fuzzy
+msgid "Following Members"
+msgstr "חברי כנסת במעקב:"
+
+#: templates/user/public_profile.html:18
+#, fuzzy
+msgid "Not following any memebers."
+msgstr "חברי כנסת במעקב:"
+
+#: templates/user/public_profile.html:22
+#, fuzzy
+msgid "Activities"
+msgstr "פעיל"
+
#: user/forms.py:8
#: user/forms.py:24
msgid "Username"
@@ -2435,8 +2487,6 @@ msgstr "כתובת דוא\"ל"
#~ msgstr "מצב משפחתי"
#~ msgid "Designates whether the user can log into this admin site."
#~ msgstr "מציין האם המשתמש יכול להתחבר לאתר הניהול."
-#~ msgid "active"
-#~ msgstr "פעיל"
#~ msgid ""
#~ "Designates whether this user should be treated as active. Unselect this "
#~ "instead of deleting accounts."
View
23 src/knesset/mks/models.py
@@ -2,7 +2,7 @@
from datetime import date
from django.db import models
from django.db.models import Q
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import ugettext_lazy as _, ugettext
from django.contrib.auth.models import User
from planet.models import Blog
from knesset.utils import cannonize
@@ -209,6 +209,27 @@ def NameWithLink(self):
return '<a href="%s">%s</a>' %(self.get_absolute_url(),self.name)
NameWithLink.allow_tags = True
+ @property
+ def get_role(self):
+ if self.current_role_descriptions:
+ return self.current_role_descriptions
+ if self.is_current:
+ if self.is_female():
+ if self.current_party.is_coalition:
+ return ugettext('Coalition Member (female)')
+ else:
+ return ugettext('Opposition Member (female)')
+ else:
+ if self.current_party.is_coalition:
+ return ugettext('Coalition Member (male)')
+ else:
+ return ugettext('Opposition Member (male)')
+
+ if self.is_female():
+ return ugettext('Past Member (female)')
+ else:
+ return ugettext('Past Member (male)')
+
class WeeklyPresence(models.Model):
member = models.ForeignKey('Member')
date = models.DateField(blank=True, null=True) # contains the date of the begining of the relevant week (actually monday)
Please sign in to comment.
Something went wrong with that request. Please try again.