Skip to content

armgit / fider

Public Imported from GitHub
0

Open platform to collect and prioritize feedback

UI tweaks and translation improvements.

Matt Robertsa1997cfe3dcc
diff --git a/locale/en/client.json b/locale/en/client.json
index 78258cf3d..9d869229d 100644
--- a/locale/en/client.json
+++ b/locale/en/client.json
@@ -219,12 +219,12 @@
"showpost.moderation.admin.title": "Post Moderation",
"showpost.moderation.approved": "Post approved successfully",
"showpost.moderation.approveerror": "Failed to approve post",
- "showpost.moderation.awaiting": "This post is awaiting moderation by an administrator before being visible to other users.",
+ "showpost.moderation.awaiting": "Awaiting moderation.",
"showpost.moderation.comment.admin.description": "This comment is awaiting your approval to be visible to all users.",
"showpost.moderation.comment.admin.title": "Comment Moderation",
"showpost.moderation.comment.approved": "Comment approved successfully",
"showpost.moderation.comment.approveerror": "Failed to approve comment",
- "showpost.moderation.comment.awaiting": "This comment is awaiting moderation by an administrator before being visible to other users.",
+ "showpost.moderation.comment.awaiting": "Awaiting moderation.",
"showpost.moderation.comment.declined": "Comment declined successfully",
"showpost.moderation.comment.declineerror": "Failed to decline comment",
"showpost.moderation.commentsuccess": "Your comment has been submitted and is awaiting moderation 📝",
diff --git a/public/pages/Home/components/ShareFeedback.tsx b/public/pages/Home/components/ShareFeedback.tsx
index f064027a9..960050907 100644
--- a/public/pages/Home/components/ShareFeedback.tsx
+++ b/public/pages/Home/components/ShareFeedback.tsx
@@ -212,6 +212,8 @@ export const ShareFeedback: React.FC<ShareFeedbackProps> = (props) => {
// We don't need to do anything special here
}
+ const showSubmitButton = title.replace(/\s+/g, " ").trim().length > 9
+
return (
<Modal.Window className="c-share-feedback" isOpen={isOpen} onClose={handleClose} size="fullscreen" center={false}>
<Modal.Header>
@@ -265,14 +267,14 @@ export const ShareFeedback: React.FC<ShareFeedbackProps> = (props) => {
</div>
</div>
)}
- </Form>
- {fider.session.isModerationRequired && (
- <div className="c-form-field">
- <div className="text-muted text-sm p-2 bg-gray-100 rounded border-l-4 border-yellow-500">
- <Trans id="newpost.moderation.notice">Your post will be reviewed by an administrator before being visible to other users.</Trans>
+ {fider.session.isModerationRequired && showSubmitButton && (
+ <div className="c-form-field">
+ <div className="text-muted text-sm p-2 bg-gray-100 rounded border-l-4 border-yellow-500">
+ <Trans id="newpost.moderation.notice">Your post will be reviewed by an administrator before being visible to other users.</Trans>
+ </div>
</div>
- </div>
- )}
+ )}
+ </Form>
</div>
</div>
{/* For unauthenticated users, always show the sign-in control */}
@@ -293,7 +295,7 @@ export const ShareFeedback: React.FC<ShareFeedbackProps> = (props) => {
</div>
) : (
/* For authenticated users, only show the submit button container when title is long enough */
- title.replace(/\s+/g, " ").trim().length > 9 && (
+ showSubmitButton && (
<div className="c-share-feedback__content animate-fade-in">
<div className="c-share-feedback-signin">
<div className="flex justify-center">
diff --git a/public/pages/ShowPost/ShowPost.page.tsx b/public/pages/ShowPost/ShowPost.page.tsx
index 56260bf9a..66b73153b 100644
--- a/public/pages/ShowPost/ShowPost.page.tsx
+++ b/public/pages/ShowPost/ShowPost.page.tsx
@@ -256,9 +256,7 @@ export default function ShowPostPage(props: ShowPostPageProps) {
<div className="mt-4">
{fider.session.isAuthenticated && fider.session.user.id === props.post.user.id && (
<div className="text-muted text-sm p-3 bg-yellow-50 rounded border-l-4 border-yellow-500">
- <Trans id="showpost.moderation.awaiting">
- This post is awaiting moderation by an administrator before being visible to other users.
- </Trans>
+ <Trans id="showpost.moderation.awaiting">Awaiting moderation.</Trans>
</div>
)}
diff --git a/public/pages/ShowPost/components/ShowComment.tsx b/public/pages/ShowPost/components/ShowComment.tsx
index 8f50b0d95..1a557b8db 100644
--- a/public/pages/ShowPost/components/ShowComment.tsx
+++ b/public/pages/ShowPost/components/ShowComment.tsx
@@ -251,9 +251,7 @@ export const ShowComment = (props: ShowCommentProps) => {
<div className="mt-3">
{fider.session.isAuthenticated && fider.session.user.id === comment.user.id && (
<div className="text-muted text-xs p-2 bg-yellow-50 rounded border-l-4 border-yellow-500">
- <Trans id="showpost.moderation.comment.awaiting">
- This comment is awaiting moderation by an administrator before being visible to other users.
- </Trans>
+ <Trans id="showpost.moderation.comment.awaiting">Awaiting moderation.</Trans>
</div>
)}