From 4a6aae17e40d4e88ed8a154bc3a55e4b1ef2120d Mon Sep 17 00:00:00 2001 From: Dessalines Date: Thu, 29 Jun 2023 16:32:52 -0400 Subject: [PATCH 1/2] Dont prettier check instance stats. (#207) --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index acc6e06..b2682df 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -16,7 +16,7 @@ pipeline: prettier_markdown_check: image: tmknom/prettier commands: - - prettier -c . "!dist" "!lemmy-docs" "!lemmy-translations" "!joinlemmy-translations" "!lemmy-js-client" "!lemmy-stats-crawler" + - prettier -c . "!dist" "!lemmy-docs" "!lemmy-translations" "!joinlemmy-translations" "!lemmy-js-client" "!lemmy-stats-crawler" "!src/shared/instance_stats.ts" yarn: image: node:14-alpine From 3e23e6b8fa08bb4246e8e787e7d30328d184dc69 Mon Sep 17 00:00:00 2001 From: Nutomic Date: Thu, 29 Jun 2023 22:40:33 +0200 Subject: [PATCH 2/2] Change instance list buttons from "join" to "browse" (#202) * Change instance list buttons from "join" to "browse" This seems more inviting, as its not necessary to create an account before browsing the content * update translations * fix lint --- joinlemmy-translations | 2 +- lemmy-docs | 2 +- lemmy-js-client | 2 +- src/shared/components/instances.tsx | 15 +++------------ src/shared/components/link-line.tsx | 2 +- 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/joinlemmy-translations b/joinlemmy-translations index e010e82..1bc6986 160000 --- a/joinlemmy-translations +++ b/joinlemmy-translations @@ -1 +1 @@ -Subproject commit e010e8230daf4c75562001382173458c3f4b0154 +Subproject commit 1bc69869fda7ee144ddfbc4d9fb29af3a0d4619e diff --git a/lemmy-docs b/lemmy-docs index 14eef8c..0dc13b4 160000 --- a/lemmy-docs +++ b/lemmy-docs @@ -1 +1 @@ -Subproject commit 14eef8c998578f60c895a38f55f58c29691f7c23 +Subproject commit 0dc13b4ea11daaa07d964c17f7a622e3a222367a diff --git a/lemmy-js-client b/lemmy-js-client index 4553c74..2eac19b 160000 --- a/lemmy-js-client +++ b/lemmy-js-client @@ -1 +1 @@ -Subproject commit 4553c749cb0fb74d62fd156ebd119dc479693dfd +Subproject commit 2eac19b2a21d77d711b8a0b0a534affe0d4d6851 diff --git a/src/shared/components/instances.tsx b/src/shared/components/instances.tsx index 594dbfc..6c0b903 100644 --- a/src/shared/components/instances.tsx +++ b/src/shared/components/instances.tsx @@ -115,9 +115,6 @@ export class Instances extends Component { let domain = instance.domain; let description = instance.site_info.site_view.site.description; let icon = instance.site_info.site_view.site.icon; - let require_application = - instance.site_info.site_view.local_site.registration_mode == - "requireapplication"; return (
@@ -134,15 +131,9 @@ export class Instances extends Component {

{description}

); diff --git a/src/shared/components/link-line.tsx b/src/shared/components/link-line.tsx index f07a052..330765e 100644 --- a/src/shared/components/link-line.tsx +++ b/src/shared/components/link-line.tsx @@ -9,7 +9,7 @@ export class LinkLine extends Component { render() { return ( <> - {i18n.t("join")} + {i18n.t("join_a_server")} {i18n.t("news")} {i18n.t("apps")} {i18n.t("donate")}