Merge pull request #44 from Elthan/feature-29

Feature #29 (negative filters)

trix/trix_admin/locale/nb/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trix_admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-30 10:44+0200\n"
+"POT-Creation-Date: 2018-07-24 02:19+0200\n"
 "PO-Revision-Date: 2015-01-08 12:35+0100\n"
 "Last-Translator: Espen Angell Kristiansen <post@espenak.net>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -93,114 +93,121 @@ msgstr "Du må be en superbruker om å gjøre deg til superbruker."
 msgid "Aggregated statistics on how the assignments where solved"
 msgstr "Aggregert statistikk over hvordan oppgavene ble løst"
 
-#: trix/trix_admin/templates/trix_admin/statistics.django.html:46
+#: trix/trix_admin/templates/trix_admin/statistics.django.html:47
 msgid ""
-"The stats below show how many percentage of the total number of users that "
-"have completed the assignment by their own, with help or not completed it."
+"\n"
+"                    The stats below show how many percentage of the total "
+"number of users that\n"
+"                    have completed the assignment by their own, with help, "
+"or not completed it.\n"
+"                "
 msgstr ""
-"Statistikken nedenfor viser hvor many prosent av det totale antall studenter "
-"som har klart oppgaven på egenhånd, med hjelp eller ikke løst den."
+"\n"
+"                    Statistikken nedenfor viser hvor many prosent av det "
+"totale antall studenter som har\n"
+"                    klart oppgaven på egenhånd, med hjelp, eller ikke løst "
+"den."
 
-#: trix/trix_admin/templates/trix_admin/statistics.django.html:49
+#: trix/trix_admin/templates/trix_admin/statistics.django.html:54
 msgid "Number of users:"
 msgstr "Antall brukere:"
 
-#: trix/trix_admin/templates/trix_admin/statistics.django.html:50
+#: trix/trix_admin/templates/trix_admin/statistics.django.html:55
 msgid "Number of assignments:"
 msgstr "Antall oppgaver:"
 
-#: trix/trix_admin/templates/trix_admin/statistics.django.html:54
+#: trix/trix_admin/templates/trix_admin/statistics.django.html:59
 msgid "Download csv file"
 msgstr "Last ned csv fil"
 
-#: trix/trix_admin/templates/trix_admin/statistics.django.html:74
+#: trix/trix_admin/templates/trix_admin/statistics.django.html:79
 #: trix/trix_admin/views/statistics.py:136
 msgid "Completed by their own"
 msgstr "Løst på egenhånd"
 
-#: trix/trix_admin/templates/trix_admin/statistics.django.html:80
+#: trix/trix_admin/templates/trix_admin/statistics.django.html:85
 #: trix/trix_admin/views/statistics.py:141
 msgid "Completed with help"
 msgstr "Løst med hjelp"
 
-#: trix/trix_admin/templates/trix_admin/statistics.django.html:86
+#: trix/trix_admin/templates/trix_admin/statistics.django.html:91
 #: trix/trix_admin/views/statistics.py:145
 msgid "Not completed"
 msgstr "Ikke løst"
 
-#: trix/trix_admin/templates/trix_admin/statistics.django.html:91
+#: trix/trix_admin/templates/trix_admin/statistics.django.html:96
 msgid "There was no assignments matching the choosen tag"
 msgstr "Det fantes ingen oppgaver som er merket med valgte tag"
 
-#: trix/trix_admin/views/assignments.py:29
+#: trix/trix_admin/views/assignments.py:32
 msgid "Tags can only contain letters, numbers, underscore (_)and hyphen (-)."
 msgstr ""
 "Tags kan bare inneholde bokstaver, tall, understrek (_) og bindestrek (-)."
 
-#: trix/trix_admin/views/assignments.py:39
-#: trix/trix_admin/views/assignments.py:124
+#: trix/trix_admin/views/assignments.py:42
+#: trix/trix_admin/views/assignments.py:127
 #: trix/trix_admin/views/permalinks.py:28
 msgid "Edit"
 msgstr "Rediger"
 
-#: trix/trix_admin/views/assignments.py:42
+#: trix/trix_admin/views/assignments.py:45
 msgid "Preview"
 msgstr "Forhåndsvis"
 
-#: trix/trix_admin/views/assignments.py:45
+#: trix/trix_admin/views/assignments.py:48
 #: trix/trix_admin/views/permalinks.py:34
 msgid "Delete"
 msgstr "Slett"
 
-#: trix/trix_admin/views/assignments.py:60
+#: trix/trix_admin/views/assignments.py:63
 #: trix/trix_admin/views/permalinks.py:31
 msgid "View"
 msgstr "Vis"
 
-#: trix/trix_admin/views/assignments.py:115
+#: trix/trix_admin/views/assignments.py:118
 #: trix/trix_admin/views/permalinks.py:73
 msgid "Create"
 msgstr "Opprett"
 
-#: trix/trix_admin/views/assignments.py:117
+#: trix/trix_admin/views/assignments.py:120
 msgid "Show on website"
 msgstr "Vis på nettsiden"
 
-#: trix/trix_admin/views/assignments.py:128
-#: trix/trix_admin/views/assignments.py:285
+#: trix/trix_admin/views/assignments.py:131
+#: trix/trix_admin/views/assignments.py:304
 msgid "Add tag"
 msgstr "Legg til tag"
 
-#: trix/trix_admin/views/assignments.py:132
+#: trix/trix_admin/views/assignments.py:135
 msgid "Remove tag"
 msgstr "Fjern tag"
 
-#: trix/trix_admin/views/assignments.py:209
+#: trix/trix_admin/views/assignments.py:228
 msgid "Assignment YAML"
 msgstr "Oppgaver YAML"
 
-#: trix/trix_admin/views/assignments.py:245
+#: trix/trix_admin/views/assignments.py:264
 msgid "Save"
 msgstr "Lagre"
 
-#: trix/trix_admin/views/assignments.py:258
+#: trix/trix_admin/views/assignments.py:277
 msgid "Tag"
 msgstr "Tag"
 
-#: trix/trix_admin/views/assignments.py:281
-#: trix/trix_admin/views/assignments.py:317
+#: trix/trix_admin/views/assignments.py:300
+#: trix/trix_admin/views/assignments.py:336
 msgid "tags on selected assignments"
 msgstr "tags på valgte oppgaver"
 
-#: trix/trix_admin/views/assignments.py:291
+#: trix/trix_admin/views/assignments.py:310
 msgid "Type in the tag you want to add to the selected assignments"
 msgstr "Skriv inn taggen du vil legge til på valgte oppgaver"
 
-#: trix/trix_admin/views/assignments.py:321
+#: trix/trix_admin/views/assignments.py:340
 msgid "Delete tag"
 msgstr "Slett tag"
 
-#: trix/trix_admin/views/assignments.py:327
+#: trix/trix_admin/views/assignments.py:346
 msgid "Type in the tag you want to remove from the selected assignments"
 msgstr "Skriv inn taggen du vil fjerne fra valgte oppgaver"
 

trix/trix_core/locale/nb/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: trix_core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-30 10:44+0200\n"
+"POT-Creation-Date: 2018-07-24 02:19+0200\n"
 "PO-Revision-Date: 2014-12-21 22:43+0100\n"
 "Last-Translator: Tor Ivar Johansen <tor@appresso.no>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,31 +18,31 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.6.11\n"
 
-#: trix/trix_core/admin.py:13
+#: trix/trix_core/admin.py:14
 msgid "Give admin access to the selected users"
 msgstr "Gi administratortilgang til valgte brukere"
 
-#: trix/trix_core/admin.py:20
+#: trix/trix_core/admin.py:21
 msgid "Remove admin access from the selected users"
 msgstr "Fjern administratortilgang til valgte brukere"
 
-#: trix/trix_core/admin.py:71
+#: trix/trix_core/admin.py:72
 msgid "tag is in use"
 msgstr "tag er i bruk"
 
-#: trix/trix_core/admin.py:76 trix/trix_core/models.py:266
+#: trix/trix_core/admin.py:77 trix/trix_core/models.py:270
 msgid "Yes"
 msgstr "Ja"
 
-#: trix/trix_core/admin.py:77 trix/trix_core/models.py:266
+#: trix/trix_core/admin.py:78 trix/trix_core/models.py:270
 msgid "No"
 msgstr "Nei"
 
-#: trix/trix_core/admin.py:114
+#: trix/trix_core/admin.py:124
 msgid "Number of assignments"
 msgstr "Antall oppgaver"
 
-#: trix/trix_core/admin.py:119
+#: trix/trix_core/admin.py:129
 msgid "Is in use"
 msgstr "Er i bruk"
 
@@ -78,8 +78,8 @@ msgstr "Brukere"
 msgid "No category"
 msgstr "Ingen kategori"
 
-#: trix/trix_core/models.py:149 trix/trix_core/models.py:213
-#: trix/trix_core/models.py:326
+#: trix/trix_core/models.py:149 trix/trix_core/models.py:217
+#: trix/trix_core/models.py:330
 msgid "Course"
 msgstr "Kurs"
 
@@ -91,93 +91,93 @@ msgstr "Semester"
 msgid "Tag"
 msgstr "Tag"
 
-#: trix/trix_core/models.py:156 trix/trix_core/models.py:251
-#: trix/trix_core/models.py:330
+#: trix/trix_core/models.py:156 trix/trix_core/models.py:255
+#: trix/trix_core/models.py:334
 msgid "Tags"
 msgstr "Tags"
 
-#: trix/trix_core/models.py:193 trix/trix_core/models.py:338
+#: trix/trix_core/models.py:193 trix/trix_core/models.py:342
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: trix/trix_core/models.py:214
+#: trix/trix_core/models.py:218
 msgid "Courses"
 msgstr "Kurs"
 
-#: trix/trix_core/models.py:248 trix/trix_core/models.py:332
+#: trix/trix_core/models.py:252 trix/trix_core/models.py:336
 msgid "Title"
 msgstr "Tittel"
 
-#: trix/trix_core/models.py:253
+#: trix/trix_core/models.py:257
 msgid "Assignment text"
 msgstr "Oppgavetekst"
 
-#: trix/trix_core/models.py:254
+#: trix/trix_core/models.py:258
 msgid "Write the assignment here."
 msgstr "Skriv oppgaven her."
 
-#: trix/trix_core/models.py:257
+#: trix/trix_core/models.py:261
 msgid "Solution"
 msgstr "Løsning"
 
-#: trix/trix_core/models.py:258
+#: trix/trix_core/models.py:262
 msgid ""
 "If you want your students to be able to view a suggested solution, write the "
 "solution here."
 msgstr ""
 "Hvis du vil at studentene skal kunne se et løsningsforslag, skriv løsningen "
 "her."
 
-#: trix/trix_core/models.py:261
+#: trix/trix_core/models.py:265
 msgid "Created"
 msgstr "Opprettet"
 
-#: trix/trix_core/models.py:264
+#: trix/trix_core/models.py:268
 msgid "Last changed"
 msgstr "Sist modifisert"
 
-#: trix/trix_core/models.py:270
+#: trix/trix_core/models.py:274
 msgid "Hide assignment from students"
 msgstr "Skjul oppgaven for studenter"
 
-#: trix/trix_core/models.py:275
+#: trix/trix_core/models.py:279
 msgid "Assignment"
 msgstr "Oppgave"
 
-#: trix/trix_core/models.py:276
+#: trix/trix_core/models.py:280
 msgid "Assignments"
 msgstr "Oppgaver"
 
-#: trix/trix_core/models.py:311
+#: trix/trix_core/models.py:315
 msgid "Solved by myself"
 msgstr "Løste på egen hånd"
 
-#: trix/trix_core/models.py:312
+#: trix/trix_core/models.py:316
 msgid "Solved with help"
 msgstr "Løste med hjelp"
 
-#: trix/trix_core/models.py:344
+#: trix/trix_core/models.py:348
 msgid "Permalink"
 msgstr "Permalink"
 
-#: trix/trix_core/models.py:345
+#: trix/trix_core/models.py:349
 msgid "Permalinks"
 msgstr "Permalinker"
 
-#: trix/trix_core/multiassignment_serialize.py:147
+#: trix/trix_core/multiassignment_serialize.py:148
 msgid "Invalid value. Must be a list."
 msgstr "Ugyldig verdi. Må være en liste"
 
-#: trix/trix_core/multiassignment_serialize.py:150
+#: trix/trix_core/multiassignment_serialize.py:151
 msgid "Invalid value in list. Must be a list of strings."
 msgstr "Ugyldig verdi i liste. Må være en liste av strenger"
 
-#: trix/trix_core/multiassignment_serialize.py:189
+#: trix/trix_core/multiassignment_serialize.py:190
 #, python-format
 msgid "More than one assignment with \"id=%(id)s\"."
 msgstr "Flere enn en oppgave med \"id=%(id)s\"."
 
-#: trix/trix_core/multiassignment_serialize.py:203
+#: trix/trix_core/multiassignment_serialize.py:204
 #, python-format
 msgid ""
 "One or more of the given IDs was not found among the assignments accessible "

trix/trix_core/models.py

@@ -168,7 +168,7 @@ def normalize_tag(cls, tag):
             - Replace all whitespace with a single space.
             - Strip all whitespace at both ends.
         """
-        return re.sub(r'\s+', ' ', tag.strip().lower())
+        return re.sub(r'\s+', ' ', tag.strip().lower().lstrip('-'))
 
     @classmethod
     def split_commaseparated_tags(cls, commaseparatedtags):