Skip to content

Commit

Permalink
Validating community group role upon save to be from same community.
Browse files Browse the repository at this point in the history
Added member groups list display in admin.
  • Loading branch information
yaniv14 committed Jul 17, 2016
1 parent 0ddbdc5 commit 88e088e
Show file tree
Hide file tree
Showing 18 changed files with 174 additions and 139 deletions.
Binary file modified src/acl/locale/he/LC_MESSAGES/django.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion src/acl/locale/he/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-06-07 11:27+0300\n"
"POT-Creation-Date: 2016-07-17 11:37+0300\n"
"PO-Revision-Date: 2016-06-07 11:27+0300\n"
"Last-Translator: \n"
"Language-Team: \n"
Expand Down
Binary file modified src/communities/locale/he/LC_MESSAGES/django.mo
Binary file not shown.
152 changes: 80 additions & 72 deletions src/communities/locale/he/LC_MESSAGES/django.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Open Community\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-06-07 11:26+0300\n"
"PO-Revision-Date: 2016-06-05 14:45+0300\n"
"POT-Creation-Date: 2016-07-17 11:37+0300\n"
"PO-Revision-Date: 2016-07-17 11:39+0300\n"
"Last-Translator: Yaniv Mirel <[email protected]>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
Expand All @@ -22,7 +22,7 @@ msgstr ""
msgid "Communities & Committees"
msgstr "קהילות וועדות"

#: .\forms.py:35 .\models.py:619
#: .\forms.py:35 .\models.py:621
msgid "Title"
msgstr "כותרת"

Expand All @@ -44,213 +44,217 @@ msgstr "רקע"
msgid "Me only"
msgstr "רק לי (לבדיקה)"

#: .\models.py:32 .\models.py:39
#: .\models.py:33 .\models.py:40
msgid "Me only (review)"
msgstr "רק לי (לבדיקה)"

#: .\models.py:33
#: .\models.py:34
msgid "Only attendees"
msgstr "למשתתפים בפגישה בלבד"

#: .\models.py:34 .\models.py:40
#: .\models.py:35 .\models.py:41
msgid "The board"
msgstr "לועד בלבד"

#: .\models.py:35 .\models.py:41
#: .\models.py:36 .\models.py:42
msgid "All members"
msgstr "לכל חברי הקהילה"

#: .\models.py:47 .\models.py:144 .\models.py:607
#: .\templates\communities\participants_form.html:120
#: .\models.py:48 .\models.py:145 .\models.py:609
#: .\templates\communities\participants_form.html:70
msgid "Name"
msgstr "שם"

#: .\models.py:48 .\models.py:145
#: .\models.py:49 .\models.py:146
msgid "Friendly URL"
msgstr "URL ידידותי"

#: .\models.py:49 .\models.py:146
#: .\models.py:50 .\models.py:147
msgid "Public community"
msgstr "פתוחה לציבור"

#: .\models.py:51
#: .\models.py:52
msgid "Community logo"
msgstr "לוגו קהילה"

#: .\models.py:53
#: .\models.py:54
msgid "Community identifier"
msgstr "מזהה קהילה"

#: .\models.py:57 .\models.py:186
#: .\models.py:58 .\models.py:187
msgid "Straw voting enabled"
msgstr "אפשר הצבעת קש"

#: .\models.py:61 .\models.py:190
#: .\models.py:62 .\models.py:191
msgid "Issue ranking votes enabled"
msgstr "אפשר תיעדוף נושאים"

#: .\models.py:63 .\models.py:192
#: .\models.py:64 .\models.py:193
msgid "Straw Vote ends at"
msgstr "הצבעת שבשבת עד"

#: .\models.py:66 .\models.py:195
#: .\models.py:67 .\models.py:196
msgid "Referendum started"
msgstr "משאל התחיל"

#: .\models.py:69 .\models.py:198
#: .\models.py:70 .\models.py:199
msgid "Referendum started at"
msgstr "משאל התחיל ב"

#: .\models.py:72 .\models.py:201
#: .\models.py:73 .\models.py:202
msgid "Referendum ends at"
msgstr "משאל הסתיים ב"

#: .\models.py:75 .\models.py:204
#: .\models.py:76 .\models.py:205
msgid "Default quorum"
msgstr ""

#: .\models.py:79 .\models.py:208
#: .\models.py:80 .\models.py:209
msgid "Allow links inside emails"
msgstr "אפשר קישורים בתוך אימייל"

#: .\models.py:81 .\models.py:210
#: .\models.py:82 .\models.py:211
msgid "Send mails to invitees"
msgstr "שלח מייל למוזמנים"

#: .\models.py:85 .\models.py:214
#: .\models.py:86 .\models.py:215
msgid "Register missing board members"
msgstr "רישום חברי ועד חסרים"

#: .\models.py:88 .\models.py:217
#: .\models.py:89 .\models.py:218
msgid "Inform System Manager"
msgstr "להודיע למנהל המערכת"

#: .\models.py:91
#: .\models.py:92
msgid "Community without meetings?"
msgstr "קהילות ללא פגישות?"

#: .\models.py:94 .\models.py:142 .\models.py:618
#: .\models.py:95 .\models.py:143 .\models.py:620
msgid "Community"
msgstr "קהילה"

#: .\models.py:95
#: .\models.py:96
msgid "Communities"
msgstr "קהילות"

#: .\models.py:148
#: .\models.py:149
msgid "Committee logo"
msgstr "לוגו ועדה"

#: .\models.py:150
#: .\models.py:151
msgid "Committee identifier"
msgstr "מזהה ועדה"

#: .\models.py:154
#: .\models.py:155
msgid "Meeting started"
msgstr "הפגישה התחילה"

#: .\models.py:156
#: .\models.py:157
msgid "Upcoming meeting title"
msgstr "כותרת הפגישה הקרובה"

#: .\models.py:160
#: .\models.py:161
msgid "Upcoming meeting scheduled at"
msgstr "מועד הפגישה הקרובה"

#: .\models.py:162
#: .\models.py:163
msgid "Upcoming meeting location"
msgstr "מיקום הפגישה הקרובה"

#: .\models.py:163
#: .\models.py:164
msgid "Upcoming meeting background"
msgstr "רקע לפגישה הקרובה"

#: .\models.py:168
#: .\models.py:169
msgid "Participants in upcoming meeting"
msgstr "משתתפים בפגישה הקרובה"

#: .\models.py:171
#: .\models.py:172
msgid "Guests in upcoming meeting"
msgstr "אורחים בפגישה הקרובה"

#: .\models.py:172
#: .\models.py:173
msgid "Enter each guest in a separate line"
msgstr "נא לרשום כל שם בשורה נפרדת"

#: .\models.py:175
#: .\models.py:176
msgid "Upcoming meeting version"
msgstr "מספר גרסת נתוני הפגישה הקרובה"

#: .\models.py:178
#: .\models.py:179
msgid "Upcoming meeting is published"
msgstr "האם הפגישה הקרובה פורסמה?"

#: .\models.py:181
#: .\models.py:182
msgid "Upcoming meeting published at"
msgstr "מועד פרסום הפגישה הקרובה"

#: .\models.py:183
#: .\models.py:184
msgid "Upcoming meeting summary"
msgstr "סיכום הפגישה הקרובה"

#: .\models.py:220
#: .\models.py:221
msgid "Committee without meetings?"
msgstr "ועדה ללא פגישות?"

#: .\models.py:223 .\models.py:642
#: .\models.py:224 .\models.py:644
#: .\templates\communities\communitygrouprole_list.html:14
msgid "Committee"
msgstr "ועדה"

#: .\models.py:224 .\templates\_committee_panel.html:6
#: .\models.py:225 .\templates\_committee_panel.html:6
#: .\templates\_community_panel.html:13
#: .\templates\communities\communitygroup_list.html:31
msgid "Committees"
msgstr "ועדות"

#: .\models.py:595
#: .\models.py:597
msgid "Confidential Reason"
msgstr "סיבה עבור נושא חסוי"

#: .\models.py:596
#: .\models.py:598
msgid "Confidential Reasons"
msgstr "סיבות עבור נושאים חסויים"

#: .\models.py:603
#: .\models.py:605
msgid ""
"A reason that can be used for marking items as confidential in your "
"community."
msgstr "הגדרת סיבה עבור נושאים חסויים"

#: .\models.py:609
#: .\models.py:611
msgid "The title to give this reason."
msgstr "כותרת עבור סיבה זו"

#: .\models.py:622 .\models.py:639
#: .\models.py:624 .\models.py:641
#: .\templates\communities\communitygrouprole_list.html:15
msgid "Group"
msgstr "קבוצה"

#: .\models.py:623 .\templates\communities\communitygroup_detail.html:4
#: .\models.py:625 .\templates\communities\communitygroup_detail.html:4
#: .\templates\communities\communitygroup_list.html:10
#: .\templates\communities\communitygroup_list.html:45
#: .\templates\communities\communitygrouprole_list.html:4
msgid "Groups"
msgstr "קבוצות"

#: .\models.py:640 .\templates\communities\communitygrouprole_list.html:16
#: .\models.py:642 .\templates\communities\communitygrouprole_list.html:16
msgid "Role"
msgstr "הרשאות"

#: .\models.py:645
#: .\models.py:647
msgid "Group Role"
msgstr "קבוצת Role"

#: .\models.py:646
#: .\models.py:648
msgid "Group Roles"
msgstr "קבוצות Role"

#: .\models.py:664
msgid "Group, Role & Committee need to be from same community"
msgstr "קבוצות, הרשאות וועדות צריכים להיות מאותה קהילה"

#: .\models.py:678
#: .\south_migrations\0011_auto__add_field_community_register_missing_board_members__chg_field_co.py:17
msgid "Board"
msgstr "ועד"
Expand Down Expand Up @@ -292,7 +296,6 @@ msgid "History"
msgstr "היסטוריה"

#: .\templates\_community_panel.html:35
#: .\templates\communities\participants_form.html:193
msgid "Members"
msgstr "חברים"

Expand Down Expand Up @@ -662,39 +665,47 @@ msgstr "רשימה"
msgid "List of participants"
msgstr "רשימת משתתפים בפגישה"

#: .\templates\communities\participants_form.html:39
#: .\templates\communities\participants_form.html:205
#: .\templates\communities\participants_form.html:31
#: .\templates\communities\participants_form.html:137
#: .\templates\emails\_protocol.html:65
msgid "Guests"
msgstr "אורחים"

#: .\templates\communities\participants_form.html:113
#: .\templates\communities\participants_form.html:49
msgid "No members"
msgstr "אין חברים"

#: .\templates\communities\participants_form.html:63
msgid "Delete"
msgstr "מחק"

#: .\templates\communities\participants_form.html:129
#: .\templates\communities\participants_form.html:79
msgid "Email"
msgstr "אימייל"

#: .\templates\communities\participants_form.html:136
#: .\templates\communities\participants_form.html:157
#: .\templates\communities\participants_form.html:86
#: .\templates\communities\participants_form.html:107
#: .\templates\communities\upcoming.html:182
msgid "Add"
msgstr "הוסף"

#: .\templates\communities\participants_form.html:147
#: .\templates\communities\participants_form.html:97
msgid "Previous participants"
msgstr "משתתפים מפגישות קודמות"

#: .\templates\communities\participants_form.html:171
#: .\templates\communities\participants_form.html:121
msgid "Please select participants for upcoming meeting"
msgstr "בחר משתתפים לפגישה הקרובה"

#: .\templates\communities\participants_form.html:222
#: .\templates\communities\participants_form.html:125
msgid "Committee members"
msgstr "חברי ועדה"

#: .\templates\communities\participants_form.html:154
msgid "Cancel"
msgstr "ביטול"

#: .\templates\communities\participants_form.html:223
#: .\templates\communities\participants_form.html:155
#: .\templates\communities\upcoming.html:276
msgid "Save"
msgstr "שמירה"
Expand Down Expand Up @@ -949,24 +960,24 @@ msgstr "הצבעה פעילה"
msgid "Published"
msgstr "פורסם"

#: .\views.py:273
#: .\views.py:279
#, python-format
msgid "Sending to %d users"
msgstr "שולח ל-%d משתמשים"

#: .\views.py:371
#: .\views.py:377
msgid "Not a valid number for page."
msgstr "מספר עמוד לא תקין"

#: .\views.py:374
#: .\views.py:380
msgid "Pages should be 1 or greater."
msgstr "מספר עמוד צריך להיות 1 או יותר."

#: .\views.py:383
#: .\views.py:389
msgid "No such page!"
msgstr "דף לא קיים!"

#: .\views.py:456 .\views.py:503
#: .\views.py:462 .\views.py:509
msgid "Group already exists"
msgstr "קבוצה בשם זה כבר קיימת"

Expand Down Expand Up @@ -1113,6 +1124,3 @@ msgstr "קבוצה בשם זה כבר קיימת"

#~ msgid "Is Secretary"
#~ msgstr "מזכיר"

#~ msgid "Community Members"
#~ msgstr "חברי קהילה"
Binary file modified src/communities/locale/he/LC_MESSAGES/djangojs.mo
Binary file not shown.
Loading

0 comments on commit 88e088e

Please sign in to comment.