From 0b7a2ac19b3db92cd208a70d4873825f76324999 Mon Sep 17 00:00:00 2001
From: Chewbacca <dice.warrant-02@icloud.com>
Date: Wed, 1 Mar 2023 10:39:33 -0500
Subject: [PATCH] Add support for i18n in Group Search

---
 .../group/components/group-header.tsx         |  4 +++-
 .../groups/components/discover/group.tsx      |  8 +++++++-
 .../discover/search/recent-searches.tsx       | 14 ++++++++++----
 .../components/discover/search/results.tsx    | 19 ++++++++++++++++---
 app/soapbox/locales/de.json                   |  4 ++--
 app/soapbox/locales/en.json                   |  4 ++--
 app/soapbox/locales/es.json                   |  4 ++--
 app/soapbox/locales/it.json                   |  4 ++--
 app/soapbox/locales/pl.json                   |  4 ++--
 app/soapbox/locales/zh-CN.json                |  4 ++--
 10 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/app/soapbox/features/group/components/group-header.tsx b/app/soapbox/features/group/components/group-header.tsx
index e341a28f2..0e9eb6548 100644
--- a/app/soapbox/features/group/components/group-header.tsx
+++ b/app/soapbox/features/group/components/group-header.tsx
@@ -117,7 +117,9 @@ const GroupHeader: React.FC<IGroupHeader> = ({ group }) => {
           theme='primary'
           onClick={onJoinGroup}
         >
-          {group.locked ? <FormattedMessage id='group.request_join' defaultMessage='Request to join group' /> : <FormattedMessage id='group.join' defaultMessage='Join group' />}
+          {group.locked
+            ? <FormattedMessage id='group.join.private' defaultMessage='Request to Join' />
+            : <FormattedMessage id='group.join.public' defaultMessage='Join Group' />}
         </Button>
       );
     }
diff --git a/app/soapbox/features/groups/components/discover/group.tsx b/app/soapbox/features/groups/components/discover/group.tsx
index b7df09b40..156605e71 100644
--- a/app/soapbox/features/groups/components/discover/group.tsx
+++ b/app/soapbox/features/groups/components/discover/group.tsx
@@ -67,7 +67,13 @@ const Group = forwardRef((props: IGroup, ref: React.ForwardedRef<HTMLDivElement>
                 <Text theme='inherit' tag='span' size='sm'>
                   {shortNumberFormat(group.members_count)}
                   {' '}
-                  members
+                  <FormattedMessage
+                    id='groups.discover.search.results.member_count'
+                    defaultMessage='{members, plural, one {member} other {members}}'
+                    values={{
+                      members: group.members_count,
+                    }}
+                  />
                 </Text>
               )}
             </HStack>
diff --git a/app/soapbox/features/groups/components/discover/search/recent-searches.tsx b/app/soapbox/features/groups/components/discover/search/recent-searches.tsx
index ca3c4168a..1fe5e1d2f 100644
--- a/app/soapbox/features/groups/components/discover/search/recent-searches.tsx
+++ b/app/soapbox/features/groups/components/discover/search/recent-searches.tsx
@@ -33,12 +33,18 @@ export default (props: Props) => {
             className='bg-white dark:bg-gray-900'
           >
             <Text theme='muted' weight='semibold' size='sm'>
-              Recent searches
+              <FormattedMessage
+                id='groups.discover.search.recent_searches.title'
+                defaultMessage='Recent searches'
+              />
             </Text>
 
             <button onClick={onClearRecentSearches} data-testid='clear-recent-searches'>
               <Text theme='primary' size='sm' className='hover:underline'>
-                Clear All
+                <FormattedMessage
+                  id='groups.discover.search.recent_searches.clear_all'
+                  defaultMessage='Clear all'
+                />
               </Text>
             </button>
           </HStack>
@@ -71,11 +77,11 @@ export default (props: Props) => {
       ) : (
         <Stack space={2} data-testid='recent-searches-blankslate'>
           <Text weight='bold' size='lg'>
-            <FormattedMessage id='groups.discover.search.blankslate.title' defaultMessage='No recent searches' />
+            <FormattedMessage id='groups.discover.search.recent_searches.blankslate.title' defaultMessage='No recent searches' />
           </Text>
 
           <Text theme='muted'>
-            <FormattedMessage id='groups.discover.search.blankslate.subtitle' defaultMessage='Search group names, topics or keywords' />
+            <FormattedMessage id='groups.discover.search.recent_searches.blankslate.subtitle' defaultMessage='Search group names, topics or keywords' />
           </Text>
         </Stack>
       )}
diff --git a/app/soapbox/features/groups/components/discover/search/results.tsx b/app/soapbox/features/groups/components/discover/search/results.tsx
index b51552f3d..59af5aebc 100644
--- a/app/soapbox/features/groups/components/discover/search/results.tsx
+++ b/app/soapbox/features/groups/components/discover/search/results.tsx
@@ -80,7 +80,13 @@ export default (props: Props) => {
                 <Text theme='inherit' tag='span' size='sm' weight='medium'>
                   {shortNumberFormat(group.members_count)}
                   {' '}
-                  members
+                  <FormattedMessage
+                    id='groups.discover.search.results.member_count'
+                    defaultMessage='{members, plural, one {member} other {members}}'
+                    values={{
+                      members: group.members_count,
+                    }}
+                  />
                 </Text>
               </>
             )}
@@ -89,7 +95,9 @@ export default (props: Props) => {
       </HStack>
 
       <Button theme='primary'>
-        {group.locked ? 'Request to Join' : 'Join Group'}
+        {group.locked
+          ? <FormattedMessage id='group.join.private' defaultMessage='Request to Join' />
+          : <FormattedMessage id='group.join.public' defaultMessage='Join Group' />}
       </Button>
     </HStack>
   ), []);
@@ -103,7 +111,12 @@ export default (props: Props) => {
   return (
     <Stack space={4} data-testid='results'>
       <HStack alignItems='center' justifyContent='between'>
-        <Text weight='semibold'>Groups</Text>
+        <Text weight='semibold'>
+          <FormattedMessage
+            id='groups.discover.search.results.groups'
+            defaultMessage='Groups'
+          />
+        </Text>
 
         <HStack alignItems='center'>
           <button onClick={() => setLayout(Layout.LIST)}>
diff --git a/app/soapbox/locales/de.json b/app/soapbox/locales/de.json
index 7ca8d5846..912aaaa27 100644
--- a/app/soapbox/locales/de.json
+++ b/app/soapbox/locales/de.json
@@ -737,7 +737,7 @@
   "group.group_mod_unblock": "Entblocken",
   "group.group_mod_unblock.success": "@{name} in der Gruppe entblockt",
   "group.header.alt": "Gruppentitel",
-  "group.join": "Gruppe beitreten",
+  "group.join.public": "Gruppe beitreten",
   "group.join.request_success": "Mitgliedschaft in der Gruppe angefragt",
   "group.join.success": "Gruppe beigetreten",
   "group.leave": "Gruppe verlassen",
@@ -746,7 +746,7 @@
   "group.moderator_subheading": "Moderator:innen der Gruppe",
   "group.privacy.locked": "Privat",
   "group.privacy.public": "Öffentlich",
-  "group.request_join": "Mitgliedschaft in der Gruppe anfragen",
+  "group.join.private": "Mitgliedschaft in der Gruppe anfragen",
   "group.role.admin": "Administrator:in",
   "group.role.moderator": "Moderator:in",
   "group.tabs.all": "Alle",
diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json
index f9b638009..7e1ac03e2 100644
--- a/app/soapbox/locales/en.json
+++ b/app/soapbox/locales/en.json
@@ -763,7 +763,8 @@
   "group.group_mod_unblock": "Unblock",
   "group.group_mod_unblock.success": "Unblocked @{name} from group",
   "group.header.alt": "Group header",
-  "group.join": "Join group",
+  "group.join.private": "Request to Join",
+  "group.join.public": "Join Group",
   "group.join.request_success": "Requested to join the group",
   "group.join.success": "Joined the group",
   "group.leave": "Leave group",
@@ -772,7 +773,6 @@
   "group.moderator_subheading": "Group moderators",
   "group.privacy.locked": "Private",
   "group.privacy.public": "Public",
-  "group.request_join": "Request to join group",
   "group.role.admin": "Admin",
   "group.role.moderator": "Moderator",
   "group.tabs.all": "All",
diff --git a/app/soapbox/locales/es.json b/app/soapbox/locales/es.json
index 703c3117e..8dd75f64e 100644
--- a/app/soapbox/locales/es.json
+++ b/app/soapbox/locales/es.json
@@ -738,7 +738,7 @@
   "group.group_mod_unblock": "Desbloquear",
   "group.group_mod_unblock.success": "Desbloquear a @{name} del grupo",
   "group.header.alt": "Encabezado del grupo",
-  "group.join": "Unirse al grupo",
+  "group.join.public": "Unirse al grupo",
   "group.join.request_success": "Solicitud de unión al grupo",
   "group.join.success": "Se unió al grupo",
   "group.leave": "Dejar el grupo",
@@ -747,7 +747,7 @@
   "group.moderator_subheading": "Moderadores del grupo",
   "group.privacy.locked": "Privado",
   "group.privacy.public": "Público",
-  "group.request_join": "Solicitud de ingreso en el grupo",
+  "group.join.private": "Solicitud de ingreso en el grupo",
   "group.role.admin": "Administrador",
   "group.role.moderator": "Moderador",
   "group.tabs.all": "Todos",
diff --git a/app/soapbox/locales/it.json b/app/soapbox/locales/it.json
index e46960f5a..e691a61c4 100644
--- a/app/soapbox/locales/it.json
+++ b/app/soapbox/locales/it.json
@@ -738,7 +738,7 @@
   "group.group_mod_unblock": "Sblocca",
   "group.group_mod_unblock.success": "Hai sbloccato @{name} dal gruppo",
   "group.header.alt": "Testata del gruppo",
-  "group.join": "Entra nel gruppo",
+  "group.join.public": "Entra nel gruppo",
   "group.join.request_success": "Richiesta di partecipazione",
   "group.join.success": "Partecipazione nel gruppo",
   "group.leave": "Abbandona il gruppo",
@@ -747,7 +747,7 @@
   "group.moderator_subheading": "Moderazione del gruppo",
   "group.privacy.locked": "Privato",
   "group.privacy.public": "Pubblico",
-  "group.request_join": "Richiesta di partecipazione",
+  "group.join.private": "Richiesta di partecipazione",
   "group.role.admin": "Amministrazione",
   "group.role.moderator": "Moderazione",
   "group.tabs.all": "Tutto",
diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json
index 2b32f88dc..49634bdaf 100644
--- a/app/soapbox/locales/pl.json
+++ b/app/soapbox/locales/pl.json
@@ -591,13 +591,13 @@
   "getting_started.open_source_notice": "{code_name} jest oprogramowaniem o otwartym źródle. Możesz pomóc w rozwoju lub zgłaszać błędy na GitLabie tutaj: {code_link} (v{code_version}).",
   "group.admin_subheading": "Administratorzy grupy",
   "group.header.alt": "Nagłówek grupy",
-  "group.join": "Dołącz do grupy",
+  "group.join.public": "Dołącz do grupy",
   "group.leave": "Opuść grupę",
   "group.manage": "Edytuj grupę",
   "group.moderator_subheading": "Moderatorzy grupy",
   "group.privacy.locked": "Prywatna",
   "group.privacy.public": "Publiczna",
-  "group.request_join": "Poproś o dołączenie do grupy",
+  "group.join.private": "Poproś o dołączenie do grupy",
   "group.role.admin": "Administrator",
   "group.role.moderator": "Moderator",
   "group.tabs.all": "Wszystko",
diff --git a/app/soapbox/locales/zh-CN.json b/app/soapbox/locales/zh-CN.json
index 0fa22a73c..625789351 100644
--- a/app/soapbox/locales/zh-CN.json
+++ b/app/soapbox/locales/zh-CN.json
@@ -738,7 +738,7 @@
   "group.group_mod_unblock": "解除屏蔽",
   "group.group_mod_unblock.success": "已从群组中解除屏蔽 @{name}",
   "group.header.alt": "群组标题",
-  "group.join": "加入群组",
+  "group.join.public": "加入群组",
   "group.join.request_success": "已请求加入群组",
   "group.join.success": "已加入群组",
   "group.leave": "离开群组",
@@ -747,7 +747,7 @@
   "group.moderator_subheading": "群组监察员",
   "group.privacy.locked": "私有",
   "group.privacy.public": "公开",
-  "group.request_join": "请求加入群组",
+  "group.join.private": "请求加入群组",
   "group.role.admin": "管理员",
   "group.role.moderator": "监察员",
   "group.tabs.all": "全部",