wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-09-09 11:38:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into flag-username-reset

Browse Source
This commit is contained in:
Riley Davis
2017-03-20 07:24:13 -07:00
committed by gaba
parent 9b53930861 491694b9c1
commit 065ccfbfc4
41 changed files with 1502 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-plugin-flags/FlagComment.js
+2 -2
View File
@@ -23,14 +23,14 @@ const getPopupMenu = [
{val: 'This comment is offensive', text: lang.t('comment-offensive')},
{val: 'This looks like an ad/marketing', text: lang.t('marketing')},
{val: 'I don\'t agree with this comment', text: lang.t('no-agree-comment')},
{val: 'other', text: lang.t('other')}
{val: 'Other', text: lang.t('other')}
]
: [
{val: 'This username is offensive', text: lang.t('username-offensive')},
{val: 'I don\'t like this username', text: lang.t('no-like-username')},
{val: 'This user is impersonating', text: lang.t('user-impersonating')},
{val: 'This looks like an ad/marketing', text: lang.t('marketing')},
{val: 'other', text: lang.t('other')}
{val: 'Other', text: lang.t('other')}
];
return {
header: lang.t('step-2-header'),