diff --git a/img/icons/hacker/scope_question.png b/img/icons/hacker/scope_question.png new file mode 100644 index 000000000..9750db486 Binary files /dev/null and b/img/icons/hacker/scope_question.png differ diff --git a/img/icons/light/scope_question.png b/img/icons/light/scope_question.png new file mode 100644 index 000000000..f4b5f78ff Binary files /dev/null and b/img/icons/light/scope_question.png differ diff --git a/img/icons/purple/scope_question.png b/img/icons/purple/scope_question.png new file mode 100644 index 000000000..e2ea19e29 Binary files /dev/null and b/img/icons/purple/scope_question.png differ diff --git a/img/icons/scope_question.png b/img/icons/scope_question.png new file mode 100644 index 000000000..f4b5f78ff Binary files /dev/null and b/img/icons/scope_question.png differ diff --git a/translations/ar.json b/translations/ar.json index 3bebcc779..c8643c313 100644 --- a/translations/ar.json +++ b/translations/ar.json @@ -186,5 +186,9 @@ "Light": "Light", "Purple": "Purple", "Hacker": "Hacker", - "HighVis": "HighVis" + "HighVis": "HighVis", + "Question": "Question", + "Enter your question": "Enter your question", + "Enter the choices for your question below.": "Enter the choices for your question below.", + "Ask a question": "Ask a question" } diff --git a/translations/ca.json b/translations/ca.json index 9dc9cc91d..5a6307d82 100644 --- a/translations/ca.json +++ b/translations/ca.json @@ -186,5 +186,9 @@ "Light": "Light", "Purple": "Purple", "Hacker": "Hacker", - "HighVis": "HighVis" + "HighVis": "HighVis", + "Question": "Question", + "Enter your question": "Enter your question", + "Enter the choices for your question below.": "Enter the choices for your question below.", + "Ask a question": "Ask a question" } diff --git a/translations/cy.json b/translations/cy.json index 0b8192473..e081cb6d4 100644 --- a/translations/cy.json +++ b/translations/cy.json @@ -186,5 +186,9 @@ "Light": "Light", "Purple": "Purple", "Hacker": "Hacker", - "HighVis": "HighVis" + "HighVis": "HighVis", + "Question": "Question", + "Enter your question": "Enter your question", + "Enter the choices for your question below.": "Enter the choices for your question below.", + "Ask a question": "Ask a question" } diff --git a/translations/de.json b/translations/de.json index 15044e449..eae58694c 100644 --- a/translations/de.json +++ b/translations/de.json @@ -186,5 +186,9 @@ "Light": "Light", "Purple": "Purple", "Hacker": "Hacker", - "HighVis": "HighVis" + "HighVis": "HighVis", + "Question": "Question", + "Enter your question": "Enter your question", + "Enter the choices for your question below.": "Enter the choices for your question below.", + "Ask a question": "Ask a question" } diff --git a/translations/en.json b/translations/en.json index c8841ba7b..8fe64a6aa 100644 --- a/translations/en.json +++ b/translations/en.json @@ -186,5 +186,9 @@ "Light": "Light", "Purple": "Purple", "Hacker": "Hacker", - "HighVis": "HighVis" + "HighVis": "HighVis", + "Question": "Question", + "Enter your question": "Enter your question", + "Enter the choices for your question below.": "Enter the choices for your question below.", + "Ask a question": "Ask a question" } diff --git a/translations/es.json b/translations/es.json index 070cdd8c5..40dc02f93 100644 --- a/translations/es.json +++ b/translations/es.json @@ -186,5 +186,9 @@ "Light": "Light", "Purple": "Purple", "Hacker": "Hacker", - "HighVis": "HighVis" + "HighVis": "HighVis", + "Question": "Question", + "Enter your question": "Enter your question", + "Enter the choices for your question below.": "Enter the choices for your question below.", + "Ask a question": "Ask a question" } diff --git a/translations/fr.json b/translations/fr.json index 04a2244ee..130f00ea4 100644 --- a/translations/fr.json +++ b/translations/fr.json @@ -186,5 +186,9 @@ "Light": "Light", "Purple": "Purple", "Hacker": "Hacker", - "HighVis": "HighVis" + "HighVis": "HighVis", + "Question": "Question", + "Enter your question": "Enter your question", + "Enter the choices for your question below.": "Enter the choices for your question below.", + "Ask a question": "Ask a question" } diff --git a/translations/ga.json b/translations/ga.json index f4a674910..8c7c8f04e 100644 --- a/translations/ga.json +++ b/translations/ga.json @@ -186,5 +186,9 @@ "Light": "Light", "Purple": "Purple", "Hacker": "Hacker", - "HighVis": "HighVis" + "HighVis": "HighVis", + "Question": "Question", + "Enter your question": "Enter your question", + "Enter the choices for your question below.": "Enter the choices for your question below.", + "Ask a question": "Ask a question" } diff --git a/translations/hi.json b/translations/hi.json index a67d4f8a6..da30a65ab 100644 --- a/translations/hi.json +++ b/translations/hi.json @@ -186,5 +186,9 @@ "Light": "Light", "Purple": "Purple", "Hacker": "Hacker", - "HighVis": "HighVis" + "HighVis": "HighVis", + "Question": "Question", + "Enter your question": "Enter your question", + "Enter the choices for your question below.": "Enter the choices for your question below.", + "Ask a question": "Ask a question" } diff --git a/translations/it.json b/translations/it.json index a9f72f8f9..d0f81b8ee 100644 --- a/translations/it.json +++ b/translations/it.json @@ -186,5 +186,9 @@ "Light": "Light", "Purple": "Purple", "Hacker": "Hacker", - "HighVis": "HighVis" + "HighVis": "HighVis", + "Question": "Question", + "Enter your question": "Enter your question", + "Enter the choices for your question below.": "Enter the choices for your question below.", + "Ask a question": "Ask a question" } diff --git a/translations/ja.json b/translations/ja.json index 715d988ec..84b0b1df7 100644 --- a/translations/ja.json +++ b/translations/ja.json @@ -186,5 +186,9 @@ "Light": "Light", "Purple": "Purple", "Hacker": "Hacker", - "HighVis": "HighVis" + "HighVis": "HighVis", + "Question": "Question", + "Enter your question": "Enter your question", + "Enter the choices for your question below.": "Enter the choices for your question below.", + "Ask a question": "Ask a question" } diff --git a/translations/oc.json b/translations/oc.json index 30b230389..2c2b2abe0 100644 --- a/translations/oc.json +++ b/translations/oc.json @@ -182,5 +182,9 @@ "Light": "Light", "Purple": "Purple", "Hacker": "Hacker", - "HighVis": "HighVis" + "HighVis": "HighVis", + "Question": "Question", + "Enter your question": "Enter your question", + "Enter the choices for your question below.": "Enter the choices for your question below.", + "Ask a question": "Ask a question" } diff --git a/translations/pt.json b/translations/pt.json index 17f308cb5..bc3ddcdd0 100644 --- a/translations/pt.json +++ b/translations/pt.json @@ -186,5 +186,9 @@ "Light": "Light", "Purple": "Purple", "Hacker": "Hacker", - "HighVis": "HighVis" + "HighVis": "HighVis", + "Question": "Question", + "Enter your question": "Enter your question", + "Enter the choices for your question below.": "Enter the choices for your question below.", + "Ask a question": "Ask a question" } diff --git a/translations/ru.json b/translations/ru.json index c2c9dfb9c..c88257f43 100644 --- a/translations/ru.json +++ b/translations/ru.json @@ -186,5 +186,9 @@ "Light": "Light", "Purple": "Purple", "Hacker": "Hacker", - "HighVis": "HighVis" + "HighVis": "HighVis", + "Question": "Question", + "Enter your question": "Enter your question", + "Enter the choices for your question below.": "Enter the choices for your question below.", + "Ask a question": "Ask a question" } diff --git a/translations/zh.json b/translations/zh.json index d73bafad7..bfc08250d 100644 --- a/translations/zh.json +++ b/translations/zh.json @@ -186,5 +186,9 @@ "Light": "Light", "Purple": "Purple", "Hacker": "Hacker", - "HighVis": "HighVis" + "HighVis": "HighVis", + "Question": "Question", + "Enter your question": "Enter your question", + "Enter the choices for your question below.": "Enter the choices for your question below.", + "Ask a question": "Ask a question" } diff --git a/webinterface.py b/webinterface.py index cffd18b8a..acdbde918 100644 --- a/webinterface.py +++ b/webinterface.py @@ -934,7 +934,10 @@ def htmlNewPost(translate: {},baseDir: str, \ newPostText+='

'+translate['This message only goes to moderators, even if it mentions other fediverse addresses.']+'

'+translate['Also see']+' '+translate['Terms of Service']+'

' else: newPostText='

'+translate['Enter the details for your shared item below.']+'

' - + + if not path.endswith('/newquestion'): + newPostText='

'+translate['Enter the choices for your question below.']+'

' + if os.path.isfile(baseDir+'/accounts/newpost.txt'): with open(baseDir+'/accounts/newpost.txt', 'r') as file: newPostText = '

'+file.read()+'

' @@ -971,6 +974,16 @@ def htmlNewPost(translate: {},baseDir: str, \ scopeIcon='scope_report.png' scopeDescription=translate['Report'] endpoint='newreport' + if path.endswith('/newquestion'): + scopeIcon='scope_question.png' + scopeDescription=translate['Question'] + placeholderMessage=translate['Enter your question']+'...' + endpoint='newquestion' + extraFields='
' + for questionCtr in range(6): + extraFields+=' ' + extraFields+=' ' + extraFields+='
' if path.endswith('/newshare'): scopeIcon='scope_share.png' scopeDescription=translate['Shared Item'] @@ -999,8 +1012,10 @@ def htmlNewPost(translate: {},baseDir: str, \ # only show the share option if this is not a reply shareOptionOnDropdown='' + questionOptionOnDropdown='' if not replyStr: - shareOptionOnDropdown='Share
'+translate['Describe a shared item']+'
' + shareOptionOnDropdown=''+translate['Shares']+'
'+translate['Describe a shared item']+'
' + questionOptionOnDropdown=''+translate['Question']+'
'+translate['Ask a question']+'
' mentionsStr='' for m in mentions: @@ -1049,7 +1064,7 @@ def htmlNewPost(translate: {},baseDir: str, \ dropDownContent+=' '+translate['Followers']+'
'+translate['Only to followers']+'
' dropDownContent+=' '+translate['DM']+'
'+translate['Only to mentioned people']+'
' dropDownContent+=' '+translate['Report']+'
'+translate['Send to moderators']+'
' - dropDownContent+=shareOptionOnDropdown + dropDownContent+=questionOptionOnDropdown+shareOptionOnDropdown dropDownContent+=' ' else: mentionsStr='Re: '+reportUrl+'\n\n'+mentionsStr