Merge branch 'main' into build-filter-instances

.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

joinlemmy-translations

@@ -1 +1 @@
-Subproject commit e010e8230daf4c75562001382173458c3f4b0154
+Subproject commit 1bc69869fda7ee144ddfbc4d9fb29af3a0d4619e

lemmy-docs

@@ -1 +1 @@
-Subproject commit 892abc1ef57966c8945f165a67eb11e83623706b
+Subproject commit 0dc13b4ea11daaa07d964c17f7a622e3a222367a

src/shared/components/instances.tsx

@@ -103,9 +103,6 @@ export class Instances extends Component<any, any> {
             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 (
               <div class="card col-6">
                 <header>
@@ -122,15 +119,9 @@ export class Instances extends Component<any, any> {
                 <br />
                 <p class="join-desc">{description}</p>
                 <footer>
-                  {require_application ? (
-                    <a class="button primary" href={`https://${domain}`}>
-                      {i18n.t("apply_to_join")}
-                    </a>
-                  ) : (
-                    <a class="button primary" href={`https://${domain}`}>
-                      {i18n.t("join")}
-                    </a>
-                  )}
+                  <a class="button primary" href={`https://${domain}`}>
+                    {i18n.t("browse_instance")}
+                  </a>
                 </footer>
               </div>
             );

src/shared/components/link-line.tsx

@@ -9,7 +9,7 @@ export class LinkLine extends Component<any, any> {
   render() {
     return (
       <>
-        <Link to="/instances">{i18n.t("join")}</Link>
+        <Link to="/instances">{i18n.t("join_a_server")}</Link>
         <Link to="/news">{i18n.t("news")}</Link>
         <Link to="/apps">{i18n.t("apps")}</Link>
         <Link to="/donate">{i18n.t("donate")}</Link>