From 80320d88256f9cce58a7fe63594b236f273dd049 Mon Sep 17 00:00:00 2001 From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com> Date: Thu, 18 Nov 2021 13:29:17 -0600 Subject: [PATCH] "Search in $conversationName$" is now "Search chat" --- _locales/en/messages.json | 10 ++-------- ts/components/LeftPaneSearchInput.tsx | 8 +------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/_locales/en/messages.json b/_locales/en/messages.json index ef3113144ae..1a17a6a883c 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -770,14 +770,8 @@ "description": "Aria label for clear search button" }, "searchIn": { - "message": "Search in $conversationName$", - "description": "Shown in the search box before text is entered when searching in a specific conversation", - "placeholders": { - "conversationName": { - "content": "$1", - "example": "Friends" - } - } + "message": "Search chat", + "description": "Shown in the search box before text is entered when searching in a specific conversation" }, "noSearchResults": { "message": "No results for \"$searchTerm$\"", diff --git a/ts/components/LeftPaneSearchInput.tsx b/ts/components/LeftPaneSearchInput.tsx index 15a71f75ba6..c0fb9ac0604 100644 --- a/ts/components/LeftPaneSearchInput.tsx +++ b/ts/components/LeftPaneSearchInput.tsx @@ -37,13 +37,7 @@ export const LeftPaneSearchInput = forwardRef( const emptyOrClear = searchConversation && value ? () => onChangeValue('') : onClear; - const label = searchConversation - ? i18n('searchIn', [ - searchConversation.isMe - ? i18n('noteToSelf') - : searchConversation.title, - ]) - : i18n('search'); + const label = i18n(searchConversation ? 'searchIn' : 'search'); return (