Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • AlekSIS/official/AlekSIS-App-Hjelp
  • sunweaver/AlekSIS-App-Hjelp
  • sggua/AlekSIS-App-Hjelp
  • quetialka/AlekSIS-App-Hjelp
  • nasolmemo/AlekSIS-App-Hjelp
5 results
Show changes
Commits on Source (15)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 544 additions and 1472 deletions
README.rst
View file @ 1e0df6f5
......@@ -18,7 +18,6 @@ Licence
Copyright © 2019, 2020 Julian Leucker <leuckeju@katharineum.de>
Copyright © 2019, 2020 Hangzhi Yu <yuha@katharineum.de>
Copyright © 2019 Silas Della Contrada <s.developer@4-dc.de>
Copyright © 2019 Frank Poetzsch-Heffter <p-h@katharineum.de>
Copyright © 2019 Jonathan Weth <wethjo@katharineum.de>
Copyright © 2020 Tom Teichler <tom.teichler@teckids.org>
......
aleksis/apps/hjelp/admin.py
View file @ 1e0df6f5
from django.contrib import admin
from .models import FAQQuestion, FAQSection, REBUSCategory
from django.db.models import Model
from django.utils.html import format_html
from django.utils.translation import ugettext_lazy as _
from .models import FAQQuestion, FAQSection, IssueCategory
MATERIAL_ICONS_CSS_URL = "/static/css/materialdesignicons-webfont/material-icons.css"
def icon_html(obj: Model) -> str:
return format_html('<i class="material-icons">{}<i/>', obj.icon)
class FAQSectionAdmin(admin.ModelAdmin):
""" ModelAdmin for FAQ sections """
list_display = ("name", "_icon")
class Media:
css = {"all": (MATERIAL_ICONS_CSS_URL,)}
_icon = icon_html
def show(modeladmin, request, queryset):
queryset.update(show=True)
......@@ -18,52 +38,29 @@ def hide(modeladmin, request, queryset):
hide.short_description = _("Unpublish selected questions")
class FAQSectionAdmin(admin.ModelAdmin):
list_display = ("name", "_icon")
class Media:
css = {
'all': ('/static/css/materialdesignicons-webfont/material-icons.css',)
}
def _icon(self, obj):
return format_html(u'<i style="color: {};" class="material-icons">{}<i/>', obj.icon_color, obj.icon)
class FAQQuestionAdmin(admin.ModelAdmin):
""" ModelAdmin for FAQ questions """
list_display = ("question_text", "section", "_icon", "show")
actions = [show, hide]
class Media:
css = {
'all': ('/static/css/materialdesignicons-webfont/material-icons.css',)
}
def _icon(self, obj):
return format_html(u'<i class="material-icons">{}<i/>', obj.icon)
css = {"all": (MATERIAL_ICONS_CSS_URL,)}
_icon = icon_html
class REBUSCategoryAdmin(admin.ModelAdmin):
list_display = ("name", "_icon", "_parent", "_placeholder", "_free_text")
class Media:
css = {
'all': ('/static/css/materialdesignicons-webfont/material-icons.css',)
}
def _icon(self, obj):
return format_html(u'<i class="material-icons">{}<i/>', obj.icon)
class IssueCategoryAdmin(admin.ModelAdmin):
""" ModelAdmin for issue categories """
def _parent(self, obj):
return obj.parent
list_display = ("name", "_icon", "parent", "placeholder", "free_text")
def _placeholder(self, obj):
return obj.placeholder
class Media:
css = {"all": (MATERIAL_ICONS_CSS_URL,)}
def _free_text(self, obj):
return obj.free_text
_icon = icon_html
admin.site.register(FAQQuestion, FAQQuestionAdmin)
admin.site.register(FAQSection, FAQSectionAdmin)
admin.site.register(REBUSCategory, REBUSCategoryAdmin)
admin.site.register(IssueCategory, IssueCategoryAdmin)
aleksis/apps/hjelp/apps.py
View file @ 1e0df6f5
......@@ -12,7 +12,6 @@ class HjelpConfig(AppConfig):
copyright = (
([2019, 2020], "Julian Leucker", "leuckeju@katharineum.de"),
([2019, 2020], "Hangzhi Yu", "yuha@katharineum.de"),
([2019], "Silas Della Contrada", "s.developer@4-dc.de"),
([2019], "Frank Poetzsch-Heffter", "p-h@katharineum.de"),
([2019], "Jonathan Weth", "wethjo@katharineum.de"),
([2020], "Tom Teichler", "tom.teichler@teckids.org"),
......
aleksis/apps/hjelp/forms.py
View file @ 1e0df6f5
......@@ -7,16 +7,20 @@ from .models import REBUSCategory
class FAQForm(forms.Form):
""" Form used to allow users to send in a question """
question = forms.CharField(
widget=forms.Textarea(), label=_("Your questions"), required=True
widget=forms.Textarea(), label=_("Your question"), required=True
)
class REBUSForm(forms.Form):
bug_category_1 = forms.ModelChoiceField(
label=_("Category A"),
class IssueForm(forms.Form):
""" Form used to allow users to report an issue """
category_1 = forms.ModelChoiceField(
label=_("Category 1"),
required=True,
queryset=REBUSCategory.objects.filter(parent=None),
queryset=IssueCategory.objects.filter(parent=None),
widget=ModelSelect2Widget(
search_fields=["name__icontains"],
attrs={
......@@ -26,36 +30,36 @@ class REBUSForm(forms.Form):
},
),
)
bug_category_2 = forms.ModelChoiceField(
label=_("Category B"),
category_2 = forms.ModelChoiceField(
label=_("Category 2"),
required=False,
queryset=REBUSCategory.objects.exclude(parent=None),
queryset=IssueCategory.objects.exclude(parent=None),
widget=ModelSelect2Widget(
dependent_fields={"bug_category_1": "parent"},
dependent_fields={"category_1": "parent"},
search_fields=["name__icontains"],
attrs={"data-minimum-input-length": 0, "class": "browser-default"},
),
)
bug_category_3 = forms.ModelChoiceField(
label=_("Category C"),
category_3 = forms.ModelChoiceField(
label=_("Category 3"),
required=False,
queryset=REBUSCategory.objects.exclude(parent=None),
queryset=IssueCategory.objects.exclude(parent=None),
widget=ModelSelect2Widget(
dependent_fields={"bug_category_2": "parent"},
dependent_fields={"category_2": "parent"},
search_fields=["name__icontains"],
attrs={"data-minimum-input-length": 0, "class": "browser-default"},
),
)
bug_category_free_text = forms.CharField(
label=_("Please specify the error according to the chosen category."),
label=_("Please specify the issue according to the chosen category."),
required=False,
)
short_description = forms.CharField(
label=_("Please describe the error in one sentence."), required=True
label=_("Please describe the issue in one sentence."), required=True
)
long_description = forms.CharField(
widget=forms.Textarea,
label=_("Please describe the error more detailed."),
label=_("Please describe the issue in more detail."),
required=False,
)
......@@ -78,7 +82,7 @@ class FeedbackForm(forms.Form):
)
usability_rating = forms.ChoiceField(
label=_("User friendlines"),
label=_("User friendliness"),
choices=ratings,
widget=forms.RadioSelect(attrs={"checked": "checked"}),
required=True,
......@@ -98,13 +102,13 @@ class FeedbackForm(forms.Form):
)
more = forms.CharField(
label=_("Do you want to tell us something else?"),
label=_("What else do you want to tell us?"),
required=False,
widget=forms.Textarea,
)
ideas = forms.CharField(
label=_("Do you have some Ideas what we could implement in AlekSIS?"),
label=_("What do you think should be added to AlekSIS?"),
required=False,
widget=forms.Textarea,
)
aleksis/apps/hjelp/locale/ar/LC_MESSAGES/django.po
View file @ 1e0df6f5
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-01 13:24+0200\n"
"POT-Creation-Date: 2020-04-28 13:31+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -16,8 +16,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
#: admin.py:11
msgid "Publish selected questions"
......@@ -27,55 +26,63 @@ msgstr ""
msgid "Unpublish selected questions"
msgstr ""
#: forms.py:7
#: forms.py:11
msgid "Your questions"
msgstr ""
#: forms.py:11
#: forms.py:17
msgid "Category A"
msgstr ""
#: forms.py:12
#: forms.py:25
msgid "Select a category"
msgstr ""
#: forms.py:30
msgid "Category B"
msgstr ""
#: forms.py:13
#: forms.py:40
msgid "Category C"
msgstr ""
#: forms.py:14
#: forms.py:50
msgid "Please specify the error according to the chosen category."
msgstr ""
#: forms.py:54
msgid "Please describe the error in one sentence."
msgstr ""
#: forms.py:15
#: forms.py:58
msgid "Please describe the error more detailed."
msgstr ""
#: forms.py:22
#: forms.py:67
msgid "Design of the user interface"
msgstr ""
#: forms.py:28
#: forms.py:74
msgid "Speed"
msgstr ""
#: forms.py:33
#: forms.py:81
msgid "User friendlines"
msgstr ""
#: forms.py:38
#: forms.py:88
msgid "AlekSIS in general"
msgstr ""
#: forms.py:44
#: forms.py:95
msgid "What do you like? What would you change?"
msgstr ""
#: forms.py:49
#: forms.py:101
msgid "Do you want to tell us something else?"
msgstr ""
#: forms.py:54
#: forms.py:107
msgid "Do you have some Ideas what we could implement in AlekSIS?"
msgstr ""
......@@ -95,67 +102,76 @@ msgstr ""
msgid "FAQ"
msgstr ""
#: models.py:13
#: models.py:15
msgid "Can use REBUS"
msgstr ""
#: models.py:14
#: models.py:16
msgid "Can send feedback"
msgstr ""
#: models.py:19
#: models.py:21
msgid "Name"
msgstr ""
#: models.py:22 models.py:36
#: models.py:24 models.py:38 models.py:60
msgid "Symbol"
msgstr ""
#: models.py:23
#: models.py:25
msgid "Symbol colour"
msgstr ""
#: models.py:29
#: models.py:31
msgid "FAQ section"
msgstr ""
#: models.py:30
#: models.py:32
msgid "FAQ sections"
msgstr ""
#: models.py:34
#: models.py:36
msgid "Question"
msgstr ""
#: models.py:38
#: models.py:40
msgid "Published"
msgstr ""
#: models.py:39
msgid ""
"Because of our CSS framework the HTML tag <strong>&lt;ul&gt;</strong> must "
"have the CSS class <em>browser-default</em>. In this case, please use the "
"manual editor mode."
#: models.py:41
msgid "Because of our CSS framework the HTML tag <strong>&lt;ul&gt;</strong> must have the CSS class <em>browser-default</em>. In this case, please use the manual editor mode."
msgstr ""
#: models.py:45
#: models.py:47
msgid "Section"
msgstr ""
#: models.py:51 models.py:52
#: models.py:53 models.py:54
msgid "FAQ questions"
msgstr ""
#: models.py:56
#: models.py:58
msgid "Category name"
msgstr ""
#: models.py:57
msgid "Icon"
#: models.py:62
msgid "Parent"
msgstr ""
#: models.py:60
msgid "Top-level select or optgroup"
#: models.py:63
msgid "Free text input allowed"
msgstr ""
#: models.py:64
msgid "Placeholder"
msgstr ""
#: models.py:75
msgid "Bug report category"
msgstr ""
#: models.py:76
msgid "Bug report categories"
msgstr ""
#: templates/hjelp/ask.html:6
......@@ -165,8 +181,7 @@ msgstr ""
#: templates/hjelp/ask.html:8
msgid ""
"\n"
" You have a question about AlekSIS and didn't find the answer to your "
"question in the FAQ? Then you can ask us your question here:\n"
" You have a question about AlekSIS and didn't find the answer to your question in the FAQ? Then you can ask us your question here:\n"
"\t"
msgstr ""
......@@ -187,19 +202,21 @@ msgstr ""
#: templates/hjelp/faq.html:52
msgid ""
"\n"
" If you have a question please ask one of you site "
"administrators:\n"
" If you have a question please ask one of you site administrators:\n"
" "
msgstr ""
#: templates/hjelp/feedback.html:9
msgid ""
"\n"
" Please give us detailed and honest feedback so that we can make "
"AlekSIS even better!\n"
" Please give us detailed and honest feedback so that we can make AlekSIS even better!\n"
"\t"
msgstr ""
#: templates/hjelp/feedback.html:100
msgid "Send feedback"
msgstr ""
#: templates/hjelp/feedback_submitted.html:7
msgid ""
"\n"
......@@ -218,8 +235,7 @@ msgstr ""
#, python-format
msgid ""
"\n"
" Ratings: %(design)s/5 (Design), %(performance)s/5 (Performance), "
"%(usability)s/5\n"
" Ratings: %(design)s/5 (Design), %(performance)s/5 (Performance), %(usability)s/5\n"
" (Usability)\n"
"\n"
" Rating (all in all): %(overall)s/10\n"
......@@ -230,8 +246,7 @@ msgid ""
"\n"
" Others: %(more)s\n"
"\n"
" <p>Submitted from %(user.get_full_name)s (%(user.username)s)</"
"p>\n"
" <p>Submitted from %(user.get_full_name)s (%(user.username)s)</p>\n"
" "
msgstr ""
......@@ -260,29 +275,26 @@ msgid ""
"\t"
msgstr ""
#: templates/hjelp/rebus.html:6
msgid "Report a bug – REBUS – REport-A-Bug-System"
#: templates/hjelp/rebus.html:11
msgid "Report an issue"
msgstr ""
#: templates/hjelp/rebus.html:22
msgid "Please describe your issue in<strong>one</strong> sentence"
#: templates/hjelp/rebus.html:64
msgid "Please describe your issue in <strong>one</strong> sentence"
msgstr ""
#: templates/hjelp/rebus.html:34
msgid ""
"Please describe your issue\n"
" <strong>more detailed</strong> (optional)"
#: templates/hjelp/rebus.html:73
msgid "Please describe your issue <strong>more detailed</strong> (optional)"
msgstr ""
#: templates/hjelp/rebus.html:41
#: templates/hjelp/rebus.html:78
msgid "Submit bugreport"
msgstr ""
#: templates/hjelp/rebus_submitted.html:8
msgid ""
"\n"
"\t We've received your bug report and will be look at it as soon a "
"possbible. Thank you for your report.\n"
"\t We've received your bug report and will be look at it as soon a possbible. Thank you for your report.\n"
"\t"
msgstr ""
......@@ -293,22 +305,22 @@ msgid ""
"\t"
msgstr ""
#: views.py:38
#: views.py:35
msgid "You have submitted a question."
msgstr ""
#: views.py:76
#: views.py:100
msgid "You reported a problem."
msgstr ""
#: views.py:116
#: views.py:157
msgid "You submitted feedback."
msgstr ""
#: views.py:117
#: views.py:158
msgid "You rated AlekSIS with {} from 5 stars."
msgstr ""
#: views.py:133
#: views.py:178
msgid "Feedback from {}"
msgstr ""
aleksis/apps/hjelp/locale/de_DE/LC_MESSAGES/django.po
View file @ 1e0df6f5
......@@ -7,11 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-01 13:24+0200\n"
"POT-Creation-Date: 2020-04-28 13:31+0000\n"
"PO-Revision-Date: 2020-04-19 18:26+0000\n"
"Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
"Language-Team: German <https://translate.edugit.org/projects/aleksis/"
"aleksis-app-hjelp/de/>\n"
"Language-Team: German <https://translate.edugit.org/projects/aleksis/aleksis-app-hjelp/de/>\n"
"Language: de_DE\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -27,55 +26,65 @@ msgstr "Ausgewählte Fragen veröffentlichen"
msgid "Unpublish selected questions"
msgstr "Veröffentlichung der ausgewählten Fragen rückgängig machen"
#: forms.py:7
#: forms.py:11
msgid "Your questions"
msgstr "Ihre Fragen"
#: forms.py:11
#: forms.py:17
msgid "Category A"
msgstr "Kategorie A"
#: forms.py:12
#: forms.py:25
msgid "Select a category"
msgstr ""
#: forms.py:30
msgid "Category B"
msgstr "Kategorie B"
#: forms.py:13
#: forms.py:40
msgid "Category C"
msgstr "Kategorie C"
#: forms.py:14
#: forms.py:50
#, fuzzy
#| msgid "Please describe the error in one sentence."
msgid "Please specify the error according to the chosen category."
msgstr "Bitte beschreiben Sie das Problem in einem Satz."
#: forms.py:54
msgid "Please describe the error in one sentence."
msgstr "Bitte beschreiben Sie das Problem in einem Satz."
#: forms.py:15
#: forms.py:58
msgid "Please describe the error more detailed."
msgstr "Bitte beschreiben Sie das Problem detaillierter."
#: forms.py:22
#: forms.py:67
msgid "Design of the user interface"
msgstr "Design der Nutzeroberfläche"
#: forms.py:28
#: forms.py:74
msgid "Speed"
msgstr "Geschwindigkeit"
#: forms.py:33
#: forms.py:81
msgid "User friendlines"
msgstr "Benutzerfreundlichkeit"
#: forms.py:38
#: forms.py:88
msgid "AlekSIS in general"
msgstr "AlekSIS allgemein"
#: forms.py:44
#: forms.py:95
msgid "What do you like? What would you change?"
msgstr "Was finden Sie gut? Was würden Sie ändern?"
#: forms.py:49
#: forms.py:101
msgid "Do you want to tell us something else?"
msgstr "Wollen Sie uns sonst noch etwas mitteilen?"
#: forms.py:54
#: forms.py:107
msgid "Do you have some Ideas what we could implement in AlekSIS?"
msgstr "Haben Sie Ideen, was wir noch in AlekSIS umsetzen könnten?"
......@@ -95,67 +104,76 @@ msgstr "Feedback"
msgid "FAQ"
msgstr "FAQ"
#: models.py:13
#: models.py:15
msgid "Can use REBUS"
msgstr "Kann REBUS nutzen"
#: models.py:14
#: models.py:16
msgid "Can send feedback"
msgstr "Kann Feedback senden"
#: models.py:19
#: models.py:21
msgid "Name"
msgstr "Name"
#: models.py:22 models.py:36
#: models.py:24 models.py:38 models.py:60
msgid "Symbol"
msgstr ""
#: models.py:23
#: models.py:25
msgid "Symbol colour"
msgstr ""
#: models.py:29
#: models.py:31
msgid "FAQ section"
msgstr ""
#: models.py:30
#: models.py:32
msgid "FAQ sections"
msgstr ""
#: models.py:34
#: models.py:36
msgid "Question"
msgstr ""
#: models.py:38
#: models.py:40
msgid "Published"
msgstr ""
#: models.py:39
msgid ""
"Because of our CSS framework the HTML tag <strong>&lt;ul&gt;</strong> must "
"have the CSS class <em>browser-default</em>. In this case, please use the "
"manual editor mode."
#: models.py:41
msgid "Because of our CSS framework the HTML tag <strong>&lt;ul&gt;</strong> must have the CSS class <em>browser-default</em>. In this case, please use the manual editor mode."
msgstr ""
#: models.py:45
#: models.py:47
msgid "Section"
msgstr ""
#: models.py:51 models.py:52
#: models.py:53 models.py:54
msgid "FAQ questions"
msgstr ""
#: models.py:56
#: models.py:58
msgid "Category name"
msgstr ""
#: models.py:57
msgid "Icon"
msgstr "Icon"
#: models.py:62
msgid "Parent"
msgstr ""
#: models.py:63
msgid "Free text input allowed"
msgstr ""
#: models.py:64
msgid "Placeholder"
msgstr ""
#: models.py:75
msgid "Bug report category"
msgstr ""
#: models.py:60
msgid "Top-level select or optgroup"
#: models.py:76
msgid "Bug report categories"
msgstr ""
#: templates/hjelp/ask.html:6
......@@ -165,8 +183,7 @@ msgstr ""
#: templates/hjelp/ask.html:8
msgid ""
"\n"
" You have a question about AlekSIS and didn't find the answer to your "
"question in the FAQ? Then you can ask us your question here:\n"
" You have a question about AlekSIS and didn't find the answer to your question in the FAQ? Then you can ask us your question here:\n"
"\t"
msgstr ""
......@@ -187,19 +204,23 @@ msgstr ""
#: templates/hjelp/faq.html:52
msgid ""
"\n"
" If you have a question please ask one of you site "
"administrators:\n"
" If you have a question please ask one of you site administrators:\n"
" "
msgstr ""
#: templates/hjelp/feedback.html:9
msgid ""
"\n"
" Please give us detailed and honest feedback so that we can make "
"AlekSIS even better!\n"
" Please give us detailed and honest feedback so that we can make AlekSIS even better!\n"
"\t"
msgstr ""
#: templates/hjelp/feedback.html:100
#, fuzzy
#| msgid "Can send feedback"
msgid "Send feedback"
msgstr "Kann Feedback senden"
#: templates/hjelp/feedback_submitted.html:7
msgid ""
"\n"
......@@ -218,8 +239,7 @@ msgstr ""
#, python-format
msgid ""
"\n"
" Ratings: %(design)s/5 (Design), %(performance)s/5 (Performance), "
"%(usability)s/5\n"
" Ratings: %(design)s/5 (Design), %(performance)s/5 (Performance), %(usability)s/5\n"
" (Usability)\n"
"\n"
" Rating (all in all): %(overall)s/10\n"
......@@ -230,8 +250,7 @@ msgid ""
"\n"
" Others: %(more)s\n"
"\n"
" <p>Submitted from %(user.get_full_name)s (%(user.username)s)</"
"p>\n"
" <p>Submitted from %(user.get_full_name)s (%(user.username)s)</p>\n"
" "
msgstr ""
......@@ -260,29 +279,32 @@ msgid ""
"\t"
msgstr ""
#: templates/hjelp/rebus.html:6
msgid "Report a bug – REBUS – REport-A-Bug-System"
msgstr ""
#: templates/hjelp/rebus.html:11
#, fuzzy
#| msgid "Report a Bug"
msgid "Report an issue"
msgstr "Einen Fehler melden"
#: templates/hjelp/rebus.html:22
msgid "Please describe your issue in<strong>one</strong> sentence"
msgstr ""
#: templates/hjelp/rebus.html:64
#, fuzzy
#| msgid "Please describe the error in one sentence."
msgid "Please describe your issue in <strong>one</strong> sentence"
msgstr "Bitte beschreiben Sie das Problem in einem Satz."
#: templates/hjelp/rebus.html:34
msgid ""
"Please describe your issue\n"
" <strong>more detailed</strong> (optional)"
msgstr ""
#: templates/hjelp/rebus.html:73
#, fuzzy
#| msgid "Please describe the error more detailed."
msgid "Please describe your issue <strong>more detailed</strong> (optional)"
msgstr "Bitte beschreiben Sie das Problem detaillierter."
#: templates/hjelp/rebus.html:41
#: templates/hjelp/rebus.html:78
msgid "Submit bugreport"
msgstr ""
#: templates/hjelp/rebus_submitted.html:8
msgid ""
"\n"
"\t We've received your bug report and will be look at it as soon a "
"possbible. Thank you for your report.\n"
"\t We've received your bug report and will be look at it as soon a possbible. Thank you for your report.\n"
"\t"
msgstr ""
......@@ -293,22 +315,25 @@ msgid ""
"\t"
msgstr ""
#: views.py:38
#: views.py:35
msgid "You have submitted a question."
msgstr ""
#: views.py:76
#: views.py:100
msgid "You reported a problem."
msgstr ""
#: views.py:116
#: views.py:157
msgid "You submitted feedback."
msgstr ""
#: views.py:117
#: views.py:158
msgid "You rated AlekSIS with {} from 5 stars."
msgstr ""
#: views.py:133
#: views.py:178
msgid "Feedback from {}"
msgstr ""
#~ msgid "Icon"
#~ msgstr "Icon"
aleksis/apps/hjelp/locale/fr/LC_MESSAGES/django.po
View file @ 1e0df6f5
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-01 13:24+0200\n"
"POT-Creation-Date: 2020-04-28 13:31+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -26,55 +26,63 @@ msgstr ""
msgid "Unpublish selected questions"
msgstr ""
#: forms.py:7
#: forms.py:11
msgid "Your questions"
msgstr ""
#: forms.py:11
#: forms.py:17
msgid "Category A"
msgstr ""
#: forms.py:12
#: forms.py:25
msgid "Select a category"
msgstr ""
#: forms.py:30
msgid "Category B"
msgstr ""
#: forms.py:13
#: forms.py:40
msgid "Category C"
msgstr ""
#: forms.py:14
#: forms.py:50
msgid "Please specify the error according to the chosen category."
msgstr ""
#: forms.py:54
msgid "Please describe the error in one sentence."
msgstr ""
#: forms.py:15
#: forms.py:58
msgid "Please describe the error more detailed."
msgstr ""
#: forms.py:22
#: forms.py:67
msgid "Design of the user interface"
msgstr ""
#: forms.py:28
#: forms.py:74
msgid "Speed"
msgstr ""
#: forms.py:33
#: forms.py:81
msgid "User friendlines"
msgstr ""
#: forms.py:38
#: forms.py:88
msgid "AlekSIS in general"
msgstr ""
#: forms.py:44
#: forms.py:95
msgid "What do you like? What would you change?"
msgstr ""
#: forms.py:49
#: forms.py:101
msgid "Do you want to tell us something else?"
msgstr ""
#: forms.py:54
#: forms.py:107
msgid "Do you have some Ideas what we could implement in AlekSIS?"
msgstr ""
......@@ -94,67 +102,76 @@ msgstr ""
msgid "FAQ"
msgstr ""
#: models.py:13
#: models.py:15
msgid "Can use REBUS"
msgstr ""
#: models.py:14
#: models.py:16
msgid "Can send feedback"
msgstr ""
#: models.py:19
#: models.py:21
msgid "Name"
msgstr ""
#: models.py:22 models.py:36
#: models.py:24 models.py:38 models.py:60
msgid "Symbol"
msgstr ""
#: models.py:23
#: models.py:25
msgid "Symbol colour"
msgstr ""
#: models.py:29
#: models.py:31
msgid "FAQ section"
msgstr ""
#: models.py:30
#: models.py:32
msgid "FAQ sections"
msgstr ""
#: models.py:34
#: models.py:36
msgid "Question"
msgstr ""
#: models.py:38
#: models.py:40
msgid "Published"
msgstr ""
#: models.py:39
msgid ""
"Because of our CSS framework the HTML tag <strong>&lt;ul&gt;</strong> must "
"have the CSS class <em>browser-default</em>. In this case, please use the "
"manual editor mode."
#: models.py:41
msgid "Because of our CSS framework the HTML tag <strong>&lt;ul&gt;</strong> must have the CSS class <em>browser-default</em>. In this case, please use the manual editor mode."
msgstr ""
#: models.py:45
#: models.py:47
msgid "Section"
msgstr ""
#: models.py:51 models.py:52
#: models.py:53 models.py:54
msgid "FAQ questions"
msgstr ""
#: models.py:56
#: models.py:58
msgid "Category name"
msgstr ""
#: models.py:57
msgid "Icon"
#: models.py:62
msgid "Parent"
msgstr ""
#: models.py:60
msgid "Top-level select or optgroup"
#: models.py:63
msgid "Free text input allowed"
msgstr ""
#: models.py:64
msgid "Placeholder"
msgstr ""
#: models.py:75
msgid "Bug report category"
msgstr ""
#: models.py:76
msgid "Bug report categories"
msgstr ""
#: templates/hjelp/ask.html:6
......@@ -164,8 +181,7 @@ msgstr ""
#: templates/hjelp/ask.html:8
msgid ""
"\n"
" You have a question about AlekSIS and didn't find the answer to your "
"question in the FAQ? Then you can ask us your question here:\n"
" You have a question about AlekSIS and didn't find the answer to your question in the FAQ? Then you can ask us your question here:\n"
"\t"
msgstr ""
......@@ -186,19 +202,21 @@ msgstr ""
#: templates/hjelp/faq.html:52
msgid ""
"\n"
" If you have a question please ask one of you site "
"administrators:\n"
" If you have a question please ask one of you site administrators:\n"
" "
msgstr ""
#: templates/hjelp/feedback.html:9
msgid ""
"\n"
" Please give us detailed and honest feedback so that we can make "
"AlekSIS even better!\n"
" Please give us detailed and honest feedback so that we can make AlekSIS even better!\n"
"\t"
msgstr ""
#: templates/hjelp/feedback.html:100
msgid "Send feedback"
msgstr ""
#: templates/hjelp/feedback_submitted.html:7
msgid ""
"\n"
......@@ -217,8 +235,7 @@ msgstr ""
#, python-format
msgid ""
"\n"
" Ratings: %(design)s/5 (Design), %(performance)s/5 (Performance), "
"%(usability)s/5\n"
" Ratings: %(design)s/5 (Design), %(performance)s/5 (Performance), %(usability)s/5\n"
" (Usability)\n"
"\n"
" Rating (all in all): %(overall)s/10\n"
......@@ -229,8 +246,7 @@ msgid ""
"\n"
" Others: %(more)s\n"
"\n"
" <p>Submitted from %(user.get_full_name)s (%(user.username)s)</"
"p>\n"
" <p>Submitted from %(user.get_full_name)s (%(user.username)s)</p>\n"
" "
msgstr ""
......@@ -259,29 +275,26 @@ msgid ""
"\t"
msgstr ""
#: templates/hjelp/rebus.html:6
msgid "Report a bug – REBUS – REport-A-Bug-System"
#: templates/hjelp/rebus.html:11
msgid "Report an issue"
msgstr ""
#: templates/hjelp/rebus.html:22
msgid "Please describe your issue in<strong>one</strong> sentence"
#: templates/hjelp/rebus.html:64
msgid "Please describe your issue in <strong>one</strong> sentence"
msgstr ""
#: templates/hjelp/rebus.html:34
msgid ""
"Please describe your issue\n"
" <strong>more detailed</strong> (optional)"
#: templates/hjelp/rebus.html:73
msgid "Please describe your issue <strong>more detailed</strong> (optional)"
msgstr ""
#: templates/hjelp/rebus.html:41
#: templates/hjelp/rebus.html:78
msgid "Submit bugreport"
msgstr ""
#: templates/hjelp/rebus_submitted.html:8
msgid ""
"\n"
"\t We've received your bug report and will be look at it as soon a "
"possbible. Thank you for your report.\n"
"\t We've received your bug report and will be look at it as soon a possbible. Thank you for your report.\n"
"\t"
msgstr ""
......@@ -292,22 +305,22 @@ msgid ""
"\t"
msgstr ""
#: views.py:38
#: views.py:35
msgid "You have submitted a question."
msgstr ""
#: views.py:76
#: views.py:100
msgid "You reported a problem."
msgstr ""
#: views.py:116
#: views.py:157
msgid "You submitted feedback."
msgstr ""
#: views.py:117
#: views.py:158
msgid "You rated AlekSIS with {} from 5 stars."
msgstr ""
#: views.py:133
#: views.py:178
msgid "Feedback from {}"
msgstr ""
aleksis/apps/hjelp/locale/la/LC_MESSAGES/django.po
View file @ 1e0df6f5
......@@ -7,11 +7,10 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-01 13:24+0200\n"
"POT-Creation-Date: 2020-04-28 13:31+0000\n"
"PO-Revision-Date: 2020-04-19 18:26+0000\n"
"Last-Translator: Jonathan Weth <teckids@jonathanweth.de>\n"
"Language-Team: Latin <https://translate.edugit.org/projects/aleksis/"
"aleksis-app-hjelp/la/>\n"
"Language-Team: Latin <https://translate.edugit.org/projects/aleksis/aleksis-app-hjelp/la/>\n"
"Language: la\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -27,55 +26,63 @@ msgstr ""
msgid "Unpublish selected questions"
msgstr ""
#: forms.py:7
#: forms.py:11
msgid "Your questions"
msgstr ""
#: forms.py:11
#: forms.py:17
msgid "Category A"
msgstr ""
#: forms.py:12
#: forms.py:25
msgid "Select a category"
msgstr ""
#: forms.py:30
msgid "Category B"
msgstr ""
#: forms.py:13
#: forms.py:40
msgid "Category C"
msgstr ""
#: forms.py:14
#: forms.py:50
msgid "Please specify the error according to the chosen category."
msgstr ""
#: forms.py:54
msgid "Please describe the error in one sentence."
msgstr ""
#: forms.py:15
#: forms.py:58
msgid "Please describe the error more detailed."
msgstr ""
#: forms.py:22
#: forms.py:67
msgid "Design of the user interface"
msgstr ""
#: forms.py:28
#: forms.py:74
msgid "Speed"
msgstr ""
#: forms.py:33
#: forms.py:81
msgid "User friendlines"
msgstr ""
#: forms.py:38
#: forms.py:88
msgid "AlekSIS in general"
msgstr ""
#: forms.py:44
#: forms.py:95
msgid "What do you like? What would you change?"
msgstr ""
#: forms.py:49
#: forms.py:101
msgid "Do you want to tell us something else?"
msgstr ""
#: forms.py:54
#: forms.py:107
msgid "Do you have some Ideas what we could implement in AlekSIS?"
msgstr ""
......@@ -95,67 +102,76 @@ msgstr ""
msgid "FAQ"
msgstr ""
#: models.py:13
#: models.py:15
msgid "Can use REBUS"
msgstr ""
#: models.py:14
#: models.py:16
msgid "Can send feedback"
msgstr ""
#: models.py:19
#: models.py:21
msgid "Name"
msgstr "Nomen"
#: models.py:22 models.py:36
#: models.py:24 models.py:38 models.py:60
msgid "Symbol"
msgstr ""
#: models.py:23
#: models.py:25
msgid "Symbol colour"
msgstr ""
#: models.py:29
#: models.py:31
msgid "FAQ section"
msgstr ""
#: models.py:30
#: models.py:32
msgid "FAQ sections"
msgstr ""
#: models.py:34
#: models.py:36
msgid "Question"
msgstr ""
#: models.py:38
#: models.py:40
msgid "Published"
msgstr ""
#: models.py:39
msgid ""
"Because of our CSS framework the HTML tag <strong>&lt;ul&gt;</strong> must "
"have the CSS class <em>browser-default</em>. In this case, please use the "
"manual editor mode."
#: models.py:41
msgid "Because of our CSS framework the HTML tag <strong>&lt;ul&gt;</strong> must have the CSS class <em>browser-default</em>. In this case, please use the manual editor mode."
msgstr ""
#: models.py:45
#: models.py:47
msgid "Section"
msgstr ""
#: models.py:51 models.py:52
#: models.py:53 models.py:54
msgid "FAQ questions"
msgstr ""
#: models.py:56
#: models.py:58
msgid "Category name"
msgstr ""
#: models.py:57
msgid "Icon"
#: models.py:62
msgid "Parent"
msgstr ""
#: models.py:60
msgid "Top-level select or optgroup"
#: models.py:63
msgid "Free text input allowed"
msgstr ""
#: models.py:64
msgid "Placeholder"
msgstr ""
#: models.py:75
msgid "Bug report category"
msgstr ""
#: models.py:76
msgid "Bug report categories"
msgstr ""
#: templates/hjelp/ask.html:6
......@@ -165,8 +181,7 @@ msgstr ""
#: templates/hjelp/ask.html:8
msgid ""
"\n"
" You have a question about AlekSIS and didn't find the answer to your "
"question in the FAQ? Then you can ask us your question here:\n"
" You have a question about AlekSIS and didn't find the answer to your question in the FAQ? Then you can ask us your question here:\n"
"\t"
msgstr ""
......@@ -187,19 +202,21 @@ msgstr ""
#: templates/hjelp/faq.html:52
msgid ""
"\n"
" If you have a question please ask one of you site "
"administrators:\n"
" If you have a question please ask one of you site administrators:\n"
" "
msgstr ""
#: templates/hjelp/feedback.html:9
msgid ""
"\n"
" Please give us detailed and honest feedback so that we can make "
"AlekSIS even better!\n"
" Please give us detailed and honest feedback so that we can make AlekSIS even better!\n"
"\t"
msgstr ""
#: templates/hjelp/feedback.html:100
msgid "Send feedback"
msgstr ""
#: templates/hjelp/feedback_submitted.html:7
msgid ""
"\n"
......@@ -218,8 +235,7 @@ msgstr ""
#, python-format
msgid ""
"\n"
" Ratings: %(design)s/5 (Design), %(performance)s/5 (Performance), "
"%(usability)s/5\n"
" Ratings: %(design)s/5 (Design), %(performance)s/5 (Performance), %(usability)s/5\n"
" (Usability)\n"
"\n"
" Rating (all in all): %(overall)s/10\n"
......@@ -230,8 +246,7 @@ msgid ""
"\n"
" Others: %(more)s\n"
"\n"
" <p>Submitted from %(user.get_full_name)s (%(user.username)s)</"
"p>\n"
" <p>Submitted from %(user.get_full_name)s (%(user.username)s)</p>\n"
" "
msgstr ""
......@@ -260,29 +275,26 @@ msgid ""
"\t"
msgstr ""
#: templates/hjelp/rebus.html:6
msgid "Report a bug – REBUS – REport-A-Bug-System"
#: templates/hjelp/rebus.html:11
msgid "Report an issue"
msgstr ""
#: templates/hjelp/rebus.html:22
msgid "Please describe your issue in<strong>one</strong> sentence"
#: templates/hjelp/rebus.html:64
msgid "Please describe your issue in <strong>one</strong> sentence"
msgstr ""
#: templates/hjelp/rebus.html:34
msgid ""
"Please describe your issue\n"
" <strong>more detailed</strong> (optional)"
#: templates/hjelp/rebus.html:73
msgid "Please describe your issue <strong>more detailed</strong> (optional)"
msgstr ""
#: templates/hjelp/rebus.html:41
#: templates/hjelp/rebus.html:78
msgid "Submit bugreport"
msgstr ""
#: templates/hjelp/rebus_submitted.html:8
msgid ""
"\n"
"\t We've received your bug report and will be look at it as soon a "
"possbible. Thank you for your report.\n"
"\t We've received your bug report and will be look at it as soon a possbible. Thank you for your report.\n"
"\t"
msgstr ""
......@@ -293,22 +305,22 @@ msgid ""
"\t"
msgstr ""
#: views.py:38
#: views.py:35
msgid "You have submitted a question."
msgstr ""
#: views.py:76
#: views.py:100
msgid "You reported a problem."
msgstr ""
#: views.py:116
#: views.py:157
msgid "You submitted feedback."
msgstr ""
#: views.py:117
#: views.py:158
msgid "You rated AlekSIS with {} from 5 stars."
msgstr ""
#: views.py:133
#: views.py:178
msgid "Feedback from {}"
msgstr ""
aleksis/apps/hjelp/locale/nb_NO/LC_MESSAGES/django.po
View file @ 1e0df6f5
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-01 13:24+0200\n"
"POT-Creation-Date: 2020-04-28 13:31+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -25,55 +25,63 @@ msgstr ""
msgid "Unpublish selected questions"
msgstr ""
#: forms.py:7
#: forms.py:11
msgid "Your questions"
msgstr ""
#: forms.py:11
#: forms.py:17
msgid "Category A"
msgstr ""
#: forms.py:12
#: forms.py:25
msgid "Select a category"
msgstr ""
#: forms.py:30
msgid "Category B"
msgstr ""
#: forms.py:13
#: forms.py:40
msgid "Category C"
msgstr ""
#: forms.py:14
#: forms.py:50
msgid "Please specify the error according to the chosen category."
msgstr ""
#: forms.py:54
msgid "Please describe the error in one sentence."
msgstr ""
#: forms.py:15
#: forms.py:58
msgid "Please describe the error more detailed."
msgstr ""
#: forms.py:22
#: forms.py:67
msgid "Design of the user interface"
msgstr ""
#: forms.py:28
#: forms.py:74
msgid "Speed"
msgstr ""
#: forms.py:33
#: forms.py:81
msgid "User friendlines"
msgstr ""
#: forms.py:38
#: forms.py:88
msgid "AlekSIS in general"
msgstr ""
#: forms.py:44
#: forms.py:95
msgid "What do you like? What would you change?"
msgstr ""
#: forms.py:49
#: forms.py:101
msgid "Do you want to tell us something else?"
msgstr ""
#: forms.py:54
#: forms.py:107
msgid "Do you have some Ideas what we could implement in AlekSIS?"
msgstr ""
......@@ -93,67 +101,76 @@ msgstr ""
msgid "FAQ"
msgstr ""
#: models.py:13
#: models.py:15
msgid "Can use REBUS"
msgstr ""
#: models.py:14
#: models.py:16
msgid "Can send feedback"
msgstr ""
#: models.py:19
#: models.py:21
msgid "Name"
msgstr ""
#: models.py:22 models.py:36
#: models.py:24 models.py:38 models.py:60
msgid "Symbol"
msgstr ""
#: models.py:23
#: models.py:25
msgid "Symbol colour"
msgstr ""
#: models.py:29
#: models.py:31
msgid "FAQ section"
msgstr ""
#: models.py:30
#: models.py:32
msgid "FAQ sections"
msgstr ""
#: models.py:34
#: models.py:36
msgid "Question"
msgstr ""
#: models.py:38
#: models.py:40
msgid "Published"
msgstr ""
#: models.py:39
msgid ""
"Because of our CSS framework the HTML tag <strong>&lt;ul&gt;</strong> must "
"have the CSS class <em>browser-default</em>. In this case, please use the "
"manual editor mode."
#: models.py:41
msgid "Because of our CSS framework the HTML tag <strong>&lt;ul&gt;</strong> must have the CSS class <em>browser-default</em>. In this case, please use the manual editor mode."
msgstr ""
#: models.py:45
#: models.py:47
msgid "Section"
msgstr ""
#: models.py:51 models.py:52
#: models.py:53 models.py:54
msgid "FAQ questions"
msgstr ""
#: models.py:56
#: models.py:58
msgid "Category name"
msgstr ""
#: models.py:57
msgid "Icon"
#: models.py:62
msgid "Parent"
msgstr ""
#: models.py:60
msgid "Top-level select or optgroup"
#: models.py:63
msgid "Free text input allowed"
msgstr ""
#: models.py:64
msgid "Placeholder"
msgstr ""
#: models.py:75
msgid "Bug report category"
msgstr ""
#: models.py:76
msgid "Bug report categories"
msgstr ""
#: templates/hjelp/ask.html:6
......@@ -163,8 +180,7 @@ msgstr ""
#: templates/hjelp/ask.html:8
msgid ""
"\n"
" You have a question about AlekSIS and didn't find the answer to your "
"question in the FAQ? Then you can ask us your question here:\n"
" You have a question about AlekSIS and didn't find the answer to your question in the FAQ? Then you can ask us your question here:\n"
"\t"
msgstr ""
......@@ -185,19 +201,21 @@ msgstr ""
#: templates/hjelp/faq.html:52
msgid ""
"\n"
" If you have a question please ask one of you site "
"administrators:\n"
" If you have a question please ask one of you site administrators:\n"
" "
msgstr ""
#: templates/hjelp/feedback.html:9
msgid ""
"\n"
" Please give us detailed and honest feedback so that we can make "
"AlekSIS even better!\n"
" Please give us detailed and honest feedback so that we can make AlekSIS even better!\n"
"\t"
msgstr ""
#: templates/hjelp/feedback.html:100
msgid "Send feedback"
msgstr ""
#: templates/hjelp/feedback_submitted.html:7
msgid ""
"\n"
......@@ -216,8 +234,7 @@ msgstr ""
#, python-format
msgid ""
"\n"
" Ratings: %(design)s/5 (Design), %(performance)s/5 (Performance), "
"%(usability)s/5\n"
" Ratings: %(design)s/5 (Design), %(performance)s/5 (Performance), %(usability)s/5\n"
" (Usability)\n"
"\n"
" Rating (all in all): %(overall)s/10\n"
......@@ -228,8 +245,7 @@ msgid ""
"\n"
" Others: %(more)s\n"
"\n"
" <p>Submitted from %(user.get_full_name)s (%(user.username)s)</"
"p>\n"
" <p>Submitted from %(user.get_full_name)s (%(user.username)s)</p>\n"
" "
msgstr ""
......@@ -258,29 +274,26 @@ msgid ""
"\t"
msgstr ""
#: templates/hjelp/rebus.html:6
msgid "Report a bug – REBUS – REport-A-Bug-System"
#: templates/hjelp/rebus.html:11
msgid "Report an issue"
msgstr ""
#: templates/hjelp/rebus.html:22
msgid "Please describe your issue in<strong>one</strong> sentence"
#: templates/hjelp/rebus.html:64
msgid "Please describe your issue in <strong>one</strong> sentence"
msgstr ""
#: templates/hjelp/rebus.html:34
msgid ""
"Please describe your issue\n"
" <strong>more detailed</strong> (optional)"
#: templates/hjelp/rebus.html:73
msgid "Please describe your issue <strong>more detailed</strong> (optional)"
msgstr ""
#: templates/hjelp/rebus.html:41
#: templates/hjelp/rebus.html:78
msgid "Submit bugreport"
msgstr ""
#: templates/hjelp/rebus_submitted.html:8
msgid ""
"\n"
"\t We've received your bug report and will be look at it as soon a "
"possbible. Thank you for your report.\n"
"\t We've received your bug report and will be look at it as soon a possbible. Thank you for your report.\n"
"\t"
msgstr ""
......@@ -291,22 +304,22 @@ msgid ""
"\t"
msgstr ""
#: views.py:38
#: views.py:35
msgid "You have submitted a question."
msgstr ""
#: views.py:76
#: views.py:100
msgid "You reported a problem."
msgstr ""
#: views.py:116
#: views.py:157
msgid "You submitted feedback."
msgstr ""
#: views.py:117
#: views.py:158
msgid "You rated AlekSIS with {} from 5 stars."
msgstr ""
#: views.py:133
#: views.py:178
msgid "Feedback from {}"
msgstr ""
aleksis/apps/hjelp/locale/tr_TR/LC_MESSAGES/django.po
View file @ 1e0df6f5
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-01 13:24+0200\n"
"POT-Creation-Date: 2020-04-28 13:31+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -25,55 +25,63 @@ msgstr ""
msgid "Unpublish selected questions"
msgstr ""
#: forms.py:7
#: forms.py:11
msgid "Your questions"
msgstr ""
#: forms.py:11
#: forms.py:17
msgid "Category A"
msgstr ""
#: forms.py:12
#: forms.py:25
msgid "Select a category"
msgstr ""
#: forms.py:30
msgid "Category B"
msgstr ""
#: forms.py:13
#: forms.py:40
msgid "Category C"
msgstr ""
#: forms.py:14
#: forms.py:50
msgid "Please specify the error according to the chosen category."
msgstr ""
#: forms.py:54
msgid "Please describe the error in one sentence."
msgstr ""
#: forms.py:15
#: forms.py:58
msgid "Please describe the error more detailed."
msgstr ""
#: forms.py:22
#: forms.py:67
msgid "Design of the user interface"
msgstr ""
#: forms.py:28
#: forms.py:74
msgid "Speed"
msgstr ""
#: forms.py:33
#: forms.py:81
msgid "User friendlines"
msgstr ""
#: forms.py:38
#: forms.py:88
msgid "AlekSIS in general"
msgstr ""
#: forms.py:44
#: forms.py:95
msgid "What do you like? What would you change?"
msgstr ""
#: forms.py:49
#: forms.py:101
msgid "Do you want to tell us something else?"
msgstr ""
#: forms.py:54
#: forms.py:107
msgid "Do you have some Ideas what we could implement in AlekSIS?"
msgstr ""
......@@ -93,67 +101,76 @@ msgstr ""
msgid "FAQ"
msgstr ""
#: models.py:13
#: models.py:15
msgid "Can use REBUS"
msgstr ""
#: models.py:14
#: models.py:16
msgid "Can send feedback"
msgstr ""
#: models.py:19
#: models.py:21
msgid "Name"
msgstr ""
#: models.py:22 models.py:36
#: models.py:24 models.py:38 models.py:60
msgid "Symbol"
msgstr ""
#: models.py:23
#: models.py:25
msgid "Symbol colour"
msgstr ""
#: models.py:29
#: models.py:31
msgid "FAQ section"
msgstr ""
#: models.py:30
#: models.py:32
msgid "FAQ sections"
msgstr ""
#: models.py:34
#: models.py:36
msgid "Question"
msgstr ""
#: models.py:38
#: models.py:40
msgid "Published"
msgstr ""
#: models.py:39
msgid ""
"Because of our CSS framework the HTML tag <strong>&lt;ul&gt;</strong> must "
"have the CSS class <em>browser-default</em>. In this case, please use the "
"manual editor mode."
#: models.py:41
msgid "Because of our CSS framework the HTML tag <strong>&lt;ul&gt;</strong> must have the CSS class <em>browser-default</em>. In this case, please use the manual editor mode."
msgstr ""
#: models.py:45
#: models.py:47
msgid "Section"
msgstr ""
#: models.py:51 models.py:52
#: models.py:53 models.py:54
msgid "FAQ questions"
msgstr ""
#: models.py:56
#: models.py:58
msgid "Category name"
msgstr ""
#: models.py:57
msgid "Icon"
#: models.py:62
msgid "Parent"
msgstr ""
#: models.py:60
msgid "Top-level select or optgroup"
#: models.py:63
msgid "Free text input allowed"
msgstr ""
#: models.py:64
msgid "Placeholder"
msgstr ""
#: models.py:75
msgid "Bug report category"
msgstr ""
#: models.py:76
msgid "Bug report categories"
msgstr ""
#: templates/hjelp/ask.html:6
......@@ -163,8 +180,7 @@ msgstr ""
#: templates/hjelp/ask.html:8
msgid ""
"\n"
" You have a question about AlekSIS and didn't find the answer to your "
"question in the FAQ? Then you can ask us your question here:\n"
" You have a question about AlekSIS and didn't find the answer to your question in the FAQ? Then you can ask us your question here:\n"
"\t"
msgstr ""
......@@ -185,19 +201,21 @@ msgstr ""
#: templates/hjelp/faq.html:52
msgid ""
"\n"
" If you have a question please ask one of you site "
"administrators:\n"
" If you have a question please ask one of you site administrators:\n"
" "
msgstr ""
#: templates/hjelp/feedback.html:9
msgid ""
"\n"
" Please give us detailed and honest feedback so that we can make "
"AlekSIS even better!\n"
" Please give us detailed and honest feedback so that we can make AlekSIS even better!\n"
"\t"
msgstr ""
#: templates/hjelp/feedback.html:100
msgid "Send feedback"
msgstr ""
#: templates/hjelp/feedback_submitted.html:7
msgid ""
"\n"
......@@ -216,8 +234,7 @@ msgstr ""
#, python-format
msgid ""
"\n"
" Ratings: %(design)s/5 (Design), %(performance)s/5 (Performance), "
"%(usability)s/5\n"
" Ratings: %(design)s/5 (Design), %(performance)s/5 (Performance), %(usability)s/5\n"
" (Usability)\n"
"\n"
" Rating (all in all): %(overall)s/10\n"
......@@ -228,8 +245,7 @@ msgid ""
"\n"
" Others: %(more)s\n"
"\n"
" <p>Submitted from %(user.get_full_name)s (%(user.username)s)</"
"p>\n"
" <p>Submitted from %(user.get_full_name)s (%(user.username)s)</p>\n"
" "
msgstr ""
......@@ -258,29 +274,26 @@ msgid ""
"\t"
msgstr ""
#: templates/hjelp/rebus.html:6
msgid "Report a bug – REBUS – REport-A-Bug-System"
#: templates/hjelp/rebus.html:11
msgid "Report an issue"
msgstr ""
#: templates/hjelp/rebus.html:22
msgid "Please describe your issue in<strong>one</strong> sentence"
#: templates/hjelp/rebus.html:64
msgid "Please describe your issue in <strong>one</strong> sentence"
msgstr ""
#: templates/hjelp/rebus.html:34
msgid ""
"Please describe your issue\n"
" <strong>more detailed</strong> (optional)"
#: templates/hjelp/rebus.html:73
msgid "Please describe your issue <strong>more detailed</strong> (optional)"
msgstr ""
#: templates/hjelp/rebus.html:41
#: templates/hjelp/rebus.html:78
msgid "Submit bugreport"
msgstr ""
#: templates/hjelp/rebus_submitted.html:8
msgid ""
"\n"
"\t We've received your bug report and will be look at it as soon a "
"possbible. Thank you for your report.\n"
"\t We've received your bug report and will be look at it as soon a possbible. Thank you for your report.\n"
"\t"
msgstr ""
......@@ -291,22 +304,22 @@ msgid ""
"\t"
msgstr ""
#: views.py:38
#: views.py:35
msgid "You have submitted a question."
msgstr ""
#: views.py:76
#: views.py:100
msgid "You reported a problem."
msgstr ""
#: views.py:116
#: views.py:157
msgid "You submitted feedback."
msgstr ""
#: views.py:117
#: views.py:158
msgid "You rated AlekSIS with {} from 5 stars."
msgstr ""
#: views.py:133
#: views.py:178
msgid "Feedback from {}"
msgstr ""
aleksis/apps/hjelp/mailer.py deleted 100755 → 0
View file @ 920fe05e
from django.core.mail import send_mail
from django.template.loader import render_to_string
from aleksis.core.settings import DEFAULT_FROM_EMAIL
SENDER_EMAIL = DEFAULT_FROM_EMAIL
def send_mail_with_template(title, receivers, plain_template, html_template, context={}, sender_email=SENDER_EMAIL):
msg_plain = render_to_string(plain_template, context)
msg_html = render_to_string(html_template, context)
try:
send_mail(
title,
msg_plain,
sender_email,
receivers,
html_message=msg_html,
)
except Exception as e:
print("[EMAIL PROBLEM] ", e)
aleksis/apps/hjelp/menus.py
View file @ 1e0df6f5
......@@ -7,28 +7,23 @@ MENUS = {
"url": "#",
"icon": "help_circle",
"root": True,
"validators": [
"menu_generator.validators.is_authenticated",
"aleksis.core.util.core_helpers.has_person",
],
"submenu": [
{
"name": _("Report a Bug"),
"url": "rebus",
"name": _("Report an issue"),
"url": "report_issue",
"icon": "bug_report",
"validators": ["menu_generator.validators.is_authenticated"],
"validators": ["menu_generator.validators.is_authenticated", "aleksis.core.util.core_helpers.has_person"],
},
{
"name": _("Feedback"),
"name": _("Give feedback"),
"url": "feedback",
"icon": "message_alert",
"validators": ["menu_generator.validators.is_authenticated"],
"validators": ["menu_generator.validators.is_authenticated", "aleksis.core.util.core_helpers.has_person"],
},
{
"name": _("FAQ"),
"url": "faq",
"icon": "question_answer",
"validators": ["menu_generator.validators.is_superuser"],
},
],
}
......
aleksis/apps/hjelp/model_helper.py deleted 100644 → 0
View file @ 920fe05e
This diff is collapsed.
aleksis/apps/hjelp/models.py
View file @ 1e0df6f5
......@@ -4,15 +4,16 @@ from django.utils.translation import ugettext_lazy as _
from aleksis.core.mixins import ExtensibleModel
from .model_helper import COLORS, ICONS
from aleksis.core.util.model_helpers import COLOURS, ICONS
from ckeditor.fields import RichTextField
class Support(ExtensibleModel):
class Meta:
managed = False
permissions = (
("use_rebus", _("Can use REBUS")),
("report_issue", _("Can report issues")),
("send_feedback", _("Can send feedback"))
)
......@@ -21,8 +22,7 @@ class FAQSection(ExtensibleModel):
name = models.CharField(max_length=200, verbose_name=_("Name"))
icon = models.CharField(max_length=50, blank=True, default="question_answer", choices=ICONS,
verbose_name=_("Symbol"))
icon_color = models.CharField(max_length=20, default="black", choices=COLORS, verbose_name=_("Symbol colour"))
verbose_name=_("Icon"))
def __str__(self):
return self.name
......@@ -35,31 +35,31 @@ class FAQSection(ExtensibleModel):
class FAQQuestion(ExtensibleModel):
question_text = models.TextField(verbose_name=_("Question"))
icon = models.CharField(max_length=50, blank=True, default="question_answer", choices=ICONS,
verbose_name=_("Symbol"))
verbose_name=_("Icon"))
show = models.BooleanField(verbose_name=_("Published"), default=False)
answer_text = RichTextField(help_text=_("Because of our CSS framework the HTML tag "
show = models.BooleanField(verbose_name=_("Show"), default=False)
answer_text = RichTextField(verbose_name=_("Answer"), help_text=_("Because of our CSS framework the HTML tag "
"<strong>&lt;ul&gt;</strong> must have the CSS "
"class <em>browser-default</em>. In this case, please "
"use the manual editor mode."))
section = models.ForeignKey(FAQSection, on_delete=models.CASCADE, blank=True, related_name="questions",
verbose_name=_("Section"))
verbose_name=_("FAQ Section"))
def __str__(self):
return self.question_text
class Meta:
verbose_name = _("FAQ questions")
verbose_name = _("FAQ question")
verbose_name_plural = _("FAQ questions")
class REBUSCategory(ExtensibleModel):
name = models.CharField(max_length=40, verbose_name=_("Category name"))
class IssueCategory(ExtensibleModel):
name = models.CharField(max_length=40, verbose_name=_("Name"))
icon = models.CharField(max_length=50, blank=True, default="bug_report", choices=ICONS,
verbose_name=_("Symbol"))
verbose_name=_("Icon"))
parent = models.ForeignKey("self", related_name="children", on_delete=models.CASCADE, blank=True,
null=True, verbose_name=_("Parent"))
null=True, verbose_name=_("Parent category"))
free_text = models.BooleanField(verbose_name=_("Free text input allowed"), default=False)
placeholder = models.CharField(max_length=100, verbose_name=_("Placeholder"), blank=True, null=True)
......@@ -68,8 +68,8 @@ class REBUSCategory(ExtensibleModel):
def save(self, *args, **kwargs):
if self.free_text:
REBUSCategory.objects.filter(parent=self).delete()
super(REBUSCategory, self).save(*args, **kwargs)
IssueCategory.objects.filter(parent=self).delete()
super(IssueCategory, self).save(*args, **kwargs)
class Meta:
verbose_name = _("Bug report category")
......
aleksis/apps/hjelp/parseIconNames.py deleted 100644 → 0
View file @ 920fe05e
import requests
from django.utils.html import format_html
def parse():
icons_raw = requests.get("https://raw.githubusercontent.com/google/material-design-icons/master/iconfont/codepoints").text
icons_raw = icons_raw.splitlines()
icons = [(i.split()[0], format_html('<i class="material-icons">{}</i>', i.split()[0])) for i in icons_raw]
print(icons)
aleksis/apps/hjelp/parse_icon_names.py deleted 100644 → 0
View file @ 920fe05e
import json
def parse_icon_names():
icons = []
with open('icons_meta.json') as json_file:
data = json.load(json_file)
for obj in data:
name = obj["name"]
icons.append((name, name))
return icons
if __name__ == "__main__":
print(parse_icon_names())
aleksis/apps/hjelp/templates/hjelp/feedback.html
View file @ 1e0df6f5
......@@ -97,7 +97,7 @@
{ endform %} -->
<button type="submit" name="go" class="btn waves-effect waves-light green">
Feedback senden
{% blocktrans %}Send feedback{% endblocktrans %}
<i class="material-icons right">send</i>
</button>
</form>
......
aleksis/apps/hjelp/templates/hjelp/rebus.html
View file @ 1e0df6f5
......@@ -8,7 +8,7 @@
{% endblock %}
{% block content %}
<h5>{% blocktrans %}Report a bug – REBUS – REport-A-Bug-System{% endblocktrans %}</h5>
<h4>{% blocktrans %}Report an issue{% endblocktrans %}</h4>
<form method="post" id="rebus-form">
{% csrf_token %}
......
aleksis/apps/hjelp/tests.py deleted 100644 → 0
View file @ 920fe05e
from django.test import TestCase
# Create your tests here.
aleksis/apps/hjelp/urls.py
View file @ 1e0df6f5
......@@ -3,9 +3,9 @@ from django.urls import path
from . import views
urlpatterns = [
path("rebus/", views.rebus, name="rebus"),
path("issues/report/", views.report_issue, name="report_issue"),
path("feedback/", views.feedback, name="feedback"),
path("faq/", views.faq, name="faq"),
path("faq/ask/", views.ask, name="ask-faq"),
path("ajax/rebus_get_next_properties/", views.rebus_get_next_properties, name="rebus-get-next-properties"),
path("faq/ask/", views.ask_faq, name="ask_faq"),
path("issues/get_next_properties/", views.issues_get_next_properties, name="issues_get_next_properties"),
]