From 90a9f728177f9fac27a38892a26159d7cd391fbe Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Tue, 23 May 2023 22:16:54 +0200 Subject: [PATCH 1/3] Changes to language tag - Dont use bright white color because its not that important - Hide tag in case of undetermined (doesnt add any information) --- lemmy-translations | 2 +- src/shared/components/comment/comment-node.tsx | 16 +++++++++------- src/shared/components/post/post-listing.tsx | 16 +++++++++------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/lemmy-translations b/lemmy-translations index a1fff8b4..007e5368 160000 --- a/lemmy-translations +++ b/lemmy-translations @@ -1 +1 @@ -Subproject commit a1fff8b481f4b02327e4ee04088606af627628f2 +Subproject commit 007e53683768aeba63e9e4c179c1d240217bcee2 diff --git a/src/shared/components/comment/comment-node.tsx b/src/shared/components/comment/comment-node.tsx index d2dee1e8..83477864 100644 --- a/src/shared/components/comment/comment-node.tsx +++ b/src/shared/components/comment/comment-node.tsx @@ -283,13 +283,15 @@ export class CommentNode extends Component { )} {this.linkBtn(true)} - - { - this.props.allLanguages.find( - lang => lang.id === cv.comment.language_id - )?.name - } - + {cv.comment.language_id != 0 && ( + + { + this.props.allLanguages.find( + lang => lang.id === cv.comment.language_id + )?.name + } + + )} {/* This is an expanding spacer for mobile */}
{showScores() && ( diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx index fd9b883e..916c8c93 100644 --- a/src/shared/components/post/post-listing.tsx +++ b/src/shared/components/post/post-listing.tsx @@ -344,13 +344,15 @@ export class PostListing extends Component { )} - - { - this.props.allLanguages.find( - lang => lang.id === post_view.post.language_id - )?.name - } - + {post_view.post.language_id != 0 && ( + + { + this.props.allLanguages.find( + lang => lang.id === post_view.post.language_id + )?.name + } + + )}
  • {url && !(hostname(url) === getExternalHost()) && ( <> From 15f75a26e950a6d846551dd0a128727caa9ab58a Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Wed, 24 May 2023 12:22:24 +0200 Subject: [PATCH 2/3] use badge-muted --- .../components/comment/comment-node.tsx | 26 +++++++++---------- src/shared/components/post/post-listing.tsx | 10 +++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/shared/components/comment/comment-node.tsx b/src/shared/components/comment/comment-node.tsx index 83477864..fae636e9 100644 --- a/src/shared/components/comment/comment-node.tsx +++ b/src/shared/components/comment/comment-node.tsx @@ -240,23 +240,23 @@ export class CommentNode extends Component { {cv.comment.distinguished && ( )} - {isMod_ && ( -
    - {i18n.t("mod")} -
    - )} - {isAdmin_ && ( -
    - {i18n.t("admin")} -
    - )} {this.isPostCreator && (
    {i18n.t("creator")}
    )} + {isMod_ && ( +
    + {i18n.t("mod")} +
    + )} + {isAdmin_ && ( +
    + {i18n.t("admin")} +
    + )} {cv.creator.bot_account && ( -
    +
    {i18n.t("bot_account").toLowerCase()}
    )} @@ -283,8 +283,8 @@ export class CommentNode extends Component { )} {this.linkBtn(true)} - {cv.comment.language_id != 0 && ( - + {cv.comment.language_id !== 0 && ( + { this.props.allLanguages.find( lang => lang.id === cv.comment.language_id diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx index 916c8c93..137ded9e 100644 --- a/src/shared/components/post/post-listing.tsx +++ b/src/shared/components/post/post-listing.tsx @@ -327,13 +327,13 @@ export class PostListing extends Component { {this.creatorIsMod_ && ( - {i18n.t("mod")} + {i18n.t("mod")} )} {this.creatorIsAdmin_ && ( - {i18n.t("admin")} + {i18n.t("admin")} )} {post_view.creator.bot_account && ( - + {i18n.t("bot_account").toLowerCase()} )} @@ -344,8 +344,8 @@ export class PostListing extends Component { )} - {post_view.post.language_id != 0 && ( - + {post_view.post.language_id !== 0 && ( + { this.props.allLanguages.find( lang => lang.id === post_view.post.language_id From 8837cf568e63a034bbb32708768fb21f7e02fccc Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Thu, 25 May 2023 10:52:00 +0200 Subject: [PATCH 3/3] remove badge-muted --- src/shared/components/comment/comment-node.tsx | 8 ++++---- src/shared/components/post/post-listing.tsx | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/shared/components/comment/comment-node.tsx b/src/shared/components/comment/comment-node.tsx index fae636e9..7ed5e8f4 100644 --- a/src/shared/components/comment/comment-node.tsx +++ b/src/shared/components/comment/comment-node.tsx @@ -246,17 +246,17 @@ export class CommentNode extends Component {
    )} {isMod_ && ( -
    +
    {i18n.t("mod")}
    )} {isAdmin_ && ( -
    +
    {i18n.t("admin")}
    )} {cv.creator.bot_account && ( -
    +
    {i18n.t("bot_account").toLowerCase()}
    )} @@ -284,7 +284,7 @@ export class CommentNode extends Component { {this.linkBtn(true)} {cv.comment.language_id !== 0 && ( - + { this.props.allLanguages.find( lang => lang.id === cv.comment.language_id diff --git a/src/shared/components/post/post-listing.tsx b/src/shared/components/post/post-listing.tsx index 137ded9e..4d8e1094 100644 --- a/src/shared/components/post/post-listing.tsx +++ b/src/shared/components/post/post-listing.tsx @@ -327,13 +327,13 @@ export class PostListing extends Component { {this.creatorIsMod_ && ( - {i18n.t("mod")} + {i18n.t("mod")} )} {this.creatorIsAdmin_ && ( - {i18n.t("admin")} + {i18n.t("admin")} )} {post_view.creator.bot_account && ( - + {i18n.t("bot_account").toLowerCase()} )} @@ -345,7 +345,7 @@ export class PostListing extends Component { )} {post_view.post.language_id !== 0 && ( - + { this.props.allLanguages.find( lang => lang.id === post_view.post.language_id