IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename report reason category names to have '_' instead '-'

Browse Source
This commit is contained in:
Wolfgang Huß 2019-10-14 16:12:21 +02:00
parent 2cf2f2b011
commit c7849cedd8
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/seed/seed-db.js
View File

@ -673,7 +673,7 @@ import { gql } from '../jest/helpers'
mutation: reportMutation, mutation: reportMutation,
variables: { variables: {
resourceId: 'p1', resourceId: 'p1',
reasonCategory: 'discrimination-etc', reasonCategory: 'discrimination_etc',
reasonDescription: 'This post is bigoted', reasonDescription: 'This post is bigoted',
}, },
}), }),

2
cypress/integration/moderation/ReportContent.feature
View File

@ -51,7 +51,7 @@ Feature: Report and Moderate
Scenario: Review reported content Scenario: Review reported content
Given somebody reported the following posts: Given somebody reported the following posts:
| submitterEmail | resourceId | reasonCategory | reasonDescription | | submitterEmail | resourceId | reasonCategory | reasonDescription |
| p1.submitter@example.org | p1 | discrimination-etc | Offensive content | | p1.submitter@example.org | p1 | discrimination_etc | Offensive content |
And I am logged in with a "moderator" role And I am logged in with a "moderator" role
When I click on the avatar menu in the top right corner When I click on the avatar menu in the top right corner
And I click on "Moderation" And I click on "Moderation"

12
shared/moderation/report.js
View File

@ -1,12 +1,12 @@
export const reportReasonCategoriesDatabaseList = () => { export const reportReasonCategoriesDatabaseList = () => {
return [ return [
'other', // element # zero, because it is the nutral one 'other', // element # zero, because it is the nutral one
'discrimination-etc', 'discrimination_etc',
'pornographic-content-links', 'pornographic_content_links',
'glorific-trivia-of-cruel-inhuman-acts', 'glorific_trivia_of_cruel_inhuman_acts',
'doxing', 'doxing',
'intentional-intimidation-stalking-persecution', 'intentional_intimidation_stalking_persecution',
'advert-products-services-commercial', 'advert_products_services_commercial',
'criminal-behavior-violation-german-law', 'criminal_behavior_violation_german_law',
] ]
} }

12
webapp/locales/de.json
View File

@ -498,13 +498,13 @@
"label": "Wähle eine Kategorie:", "label": "Wähle eine Kategorie:",
"placeholder": "Kategorie …", "placeholder": "Kategorie …",
"options": { "options": {
"discrimination-etc": "Diskriminierende Beiträge, Kommentare, Äußerungen oder Beleidigungen.", "discrimination_etc": "Diskriminierende Beiträge, Kommentare, Äußerungen oder Beleidigungen.",
"pornographic-content-links": "Das Posten oder Verlinken eindeutig pornografischen Materials.", "pornographic_content_links": "Das Posten oder Verlinken eindeutig pornografischen Materials.",
"glorific-trivia-of-cruel-inhuman-acts": "Verherrlichung oder Verharmlosung grausamer oder unmenschlicher Gewalttätigkeiten.", "glorific_trivia_of_cruel_inhuman_acts": "Verherrlichung oder Verharmlosung grausamer oder unmenschlicher Gewalttätigkeiten.",
"doxing": "Das Veröffentlichen von personenbezogenen Daten anderer ohne deren Einverständnis oder das Androhen dessen (\"Doxing\").", "doxing": "Das Veröffentlichen von personenbezogenen Daten anderer ohne deren Einverständnis oder das Androhen dessen (\"Doxing\").",
"intentional-intimidation-stalking-persecution": "Absichtliche Einschüchterung, Stalking oder Verfolgung.", "intentional_intimidation_stalking_persecution": "Absichtliche Einschüchterung, Stalking oder Verfolgung.",
"advert-products-services-commercial": "Bewerben von Produkten und Dienstleistungen mit kommerzieller Absicht.", "advert_products_services_commercial": "Bewerben von Produkten und Dienstleistungen mit kommerzieller Absicht.",
"criminal-behavior-violation-german-law": "Strafbares Verhalten bzw. Verstoß gegen deutsches Recht.", "criminal_behavior_violation_german_law": "Strafbares Verhalten bzw. Verstoß gegen deutsches Recht.",
"other": "Andere …" "other": "Andere …"
} }
}, },

12
webapp/locales/en.json
View File

@ -499,13 +499,13 @@
"label": "Select a category:", "label": "Select a category:",
"placeholder": "Category …", "placeholder": "Category …",
"options": { "options": {
"discrimination-etc": "Discriminatory posts, comments, utterances or insults.", "discrimination_etc": "Discriminatory posts, comments, utterances or insults.",
"pornographic-content-links": "Posting or linking of clearly pornographic material.", "pornographic_content_links": "Posting or linking of clearly pornographic material.",
"glorific-trivia-of-cruel-inhuman-acts": "Glorification or trivialization of cruel or inhuman acts of violence.", "glorific_trivia_of_cruel_inhuman_acts": "Glorification or trivialization of cruel or inhuman acts of violence.",
"doxing": "The disclosure of others' personal information without their consent or threat there of (\"doxing\").", "doxing": "The disclosure of others' personal information without their consent or threat there of (\"doxing\").",
"intentional-intimidation-stalking-persecution": "Intentional intimidation, stalking or persecution.", "intentional_intimidation_stalking_persecution": "Intentional intimidation, stalking or persecution.",
"advert-products-services-commercial": "Advertising products and services with commercial intent.", "advert_products_services_commercial": "Advertising products and services with commercial intent.",
"criminal-behavior-violation-german-law": "Criminal behavior or violation of German law.", "criminal_behavior_violation_german_law": "Criminal behavior or violation of German law.",
"other": "Other …" "other": "Other …"
} }
}, },