From 93db6d7024653772a4a3ad1ab2ca62ce0ca15f63 Mon Sep 17 00:00:00 2001
From: Jorge Maldonado Ventura <jorgesumle@freakspot.net>
Date: Fri, 9 Jun 2023 11:49:31 +0200
Subject: [PATCH 1/3] Fix title not being translated (#166)

---
 src/shared/components/apps.tsx      | 3 +--
 src/shared/components/contact.tsx   | 3 +--
 src/shared/components/donate.tsx    | 2 +-
 src/shared/components/instances.tsx | 4 ++--
 src/shared/components/main.tsx      | 3 +--
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/shared/components/apps.tsx b/src/shared/components/apps.tsx
index e79eacd..3e6dc7c 100644
--- a/src/shared/components/apps.tsx
+++ b/src/shared/components/apps.tsx
@@ -3,8 +3,6 @@ import { AppDetails } from "./app-details";
 import { Helmet } from "inferno-helmet";
 import { i18n } from "../i18next";
 
-const title = i18n.t("apps_title");
-
 export class Apps extends Component<any, any> {
   constructor(props: any, context: any) {
     super(props, context);
@@ -15,6 +13,7 @@ export class Apps extends Component<any, any> {
   }
 
   render() {
+    const title = i18n.t("apps_title");
     return (
       <div>
         <Helmet title={title}>
diff --git a/src/shared/components/contact.tsx b/src/shared/components/contact.tsx
index e8326e5..9460215 100644
--- a/src/shared/components/contact.tsx
+++ b/src/shared/components/contact.tsx
@@ -2,13 +2,12 @@ import { Component } from "inferno";
 import { Helmet } from "inferno-helmet";
 import { i18n } from "../i18next";
 
-const title = i18n.t("contact_title");
-
 export class Contact extends Component<any, any> {
   constructor(props: any, context: any) {
     super(props, context);
   }
   render() {
+    const title = i18n.t("contact_title");
     return (
       <div>
         <Helmet title={title}>
diff --git a/src/shared/components/donate.tsx b/src/shared/components/donate.tsx
index d6be79d..199eff2 100644
--- a/src/shared/components/donate.tsx
+++ b/src/shared/components/donate.tsx
@@ -7,7 +7,6 @@ import { translators } from "../translations/translators";
 import { languagesAll, countries } from "countries-list";
 import { isBrowser } from "../utils";
 
-const title = i18n.t("support_title");
 const avatarSize = 40;
 const bannerWidth = 240;
 const bannerHeight = 101;
@@ -92,6 +91,7 @@ export class Donate extends Component<any, any> {
   }
 
   render() {
+    const title = i18n.t("support_title");
     return (
       <div>
         <Helmet title={title}>
diff --git a/src/shared/components/instances.tsx b/src/shared/components/instances.tsx
index 1ead966..40dcf75 100644
--- a/src/shared/components/instances.tsx
+++ b/src/shared/components/instances.tsx
@@ -4,14 +4,14 @@ import { i18n } from "../i18next";
 import { instance_stats } from "../instance_stats";
 import { numToSI } from "../utils";
 
-const title = i18n.t("join_title");
-
 export class Instances extends Component<any, any> {
   constructor(props: any, context: any) {
     super(props, context);
   }
 
   render() {
+    const title = i18n.t("join_title");
+
     var recommended_instances = instance_stats.recommended[i18n.language];
     if (!recommended_instances) {
       recommended_instances = instance_stats.recommended["en"];
diff --git a/src/shared/components/main.tsx b/src/shared/components/main.tsx
index e313c2e..d1413b2 100644
--- a/src/shared/components/main.tsx
+++ b/src/shared/components/main.tsx
@@ -6,8 +6,6 @@ import { i18n } from "../i18next";
 import { T } from "inferno-i18next";
 import { getDocsLanguage, isBrowser } from "../utils";
 
-const title = i18n.t("lemmy_title");
-
 export class Main extends Component<any, any> {
   constructor(props: any, context: any) {
     super(props, context);
@@ -40,6 +38,7 @@ export class Main extends Component<any, any> {
   }
 
   render() {
+    const title = i18n.t("lemmy_title");
     return (
       <div>
         <Helmet title={title}>

From df33518b1e00c14a3bd8c3db6410d7f81a2a23f9 Mon Sep 17 00:00:00 2001
From: zinklog2 <110323644+zinklog2@users.noreply.github.com>
Date: Fri, 9 Jun 2023 15:23:17 +0530
Subject: [PATCH 2/3] Update recommended-instances.json (#168)

Added lemmy.fmht.ml in recommended instances
---
 recommended-instances.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recommended-instances.json b/recommended-instances.json
index 68382b5..e594d25 100644
--- a/recommended-instances.json
+++ b/recommended-instances.json
@@ -1,5 +1,5 @@
 {
-  "en": ["sopuli.xyz", "lemmy.world", "sh.itjust.works"],
+  "en": ["sopuli.xyz", "lemmy.world", "sh.itjust.works", "lemmy.fmhy.ml"],
   "fr": ["sh.itjust.works"],
   "da": ["feddit.dk"],
   "de": ["feddit.de", "discuss.tchncs.de"],

From 83b3ae696ace5c176e10f34939fe5c21aae2b1a0 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Fri, 9 Jun 2023 15:05:44 +0200
Subject: [PATCH 3/3] Add vlemmy.net, discuss.tchncs.de as English recs

---
 joinlemmy-translations     | 2 +-
 recommended-instances.json | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/joinlemmy-translations b/joinlemmy-translations
index 47430c9..df26dfc 160000
--- a/joinlemmy-translations
+++ b/joinlemmy-translations
@@ -1 +1 @@
-Subproject commit 47430c9a9b52e917830901506d16ae6cd6a3f05e
+Subproject commit df26dfce6f71539be86635495aad8d4c95a746a6
diff --git a/recommended-instances.json b/recommended-instances.json
index e594d25..4efc4fa 100644
--- a/recommended-instances.json
+++ b/recommended-instances.json
@@ -1,5 +1,12 @@
 {
-  "en": ["sopuli.xyz", "lemmy.world", "sh.itjust.works", "lemmy.fmhy.ml"],
+  "en": [
+    "sopuli.xyz",
+    "lemmy.world",
+    "sh.itjust.works",
+    "lemmy.fmhy.ml",
+    "vlemmy.net",
+    "discuss.tchncs.de"
+  ],
   "fr": ["sh.itjust.works"],
   "da": ["feddit.dk"],
   "de": ["feddit.de", "discuss.tchncs.de"],