From bede81a921c76385445748dca93976d44143e4f9 Mon Sep 17 00:00:00 2001
From: Bharat <bharatkalluri@protonmail.com>
Date: Thu, 1 Apr 2021 02:14:02 +0530
Subject: [PATCH] Merged changes from main and ran extract

---
 webapp/i18n/en.json                 |  8 ++++++++
 webapp/src/widgets/propertyMenu.tsx | 19 ++++++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 1e8e4d535..112dbd37f 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -39,6 +39,8 @@
   "Filter.not-includes": "doesn't include",
   "FilterComponent.add-filter": "+ Add filter",
   "FilterComponent.delete": "Delete",
+  "GalleryCard.delete": "Delete",
+  "GalleryCard.duplicate": "Duplicate",
   "KanbanCard.delete": "Delete",
   "KanbanCard.duplicate": "Duplicate",
   "KanbanCard.untitled": "Untitled",
@@ -52,6 +54,7 @@
   "PropertyType.Checkbox": "Checkbox",
   "PropertyType.CreatedBy": "Created By",
   "PropertyType.CreatedTime": "Created Time",
+  "PropertyType.Delete": "Delete",
   "PropertyType.Email": "Email",
   "PropertyType.File": "File or Media",
   "PropertyType.MultiSelect": "Multi Select",
@@ -123,9 +126,14 @@
   "TableHeaderMenu.sort-ascending": "Sort ascending",
   "TableHeaderMenu.sort-descending": "Sort descending",
   "TableRow.open": "Open",
+  "View.AddView": "Add View",
+  "View.Board": "Board",
+  "View.DeleteView": "Delete View",
+  "View.DuplicateView": "Duplicate View",
   "View.NewBoardTitle": "Board view",
   "View.NewGalleryTitle": "Gallery view",
   "View.NewTableTitle": "Table view",
+  "View.Table": "Table",
   "ViewHeader.add-template": "+ New template",
   "ViewHeader.delete-template": "Delete",
   "ViewHeader.edit-template": "Edit",
diff --git a/webapp/src/widgets/propertyMenu.tsx b/webapp/src/widgets/propertyMenu.tsx
index 29ceaebe6..8459ebe45 100644
--- a/webapp/src/widgets/propertyMenu.tsx
+++ b/webapp/src/widgets/propertyMenu.tsx
@@ -49,6 +49,11 @@ const PropertyMenu = React.memo((props: Props) => {
     const nameTextbox = useRef<HTMLInputElement>(null)
     const [name, setName] = useState(props.propertyName)
 
+    const deleteText = intl.formatMessage({
+        id: 'PropertyType.Delete',
+        defaultMessage: 'Delete',
+    })
+
     useEffect(() => {
         nameTextbox.current?.focus()
         nameTextbox.current?.setSelectionRange(0, name.length)
@@ -85,38 +90,38 @@ const PropertyMenu = React.memo((props: Props) => {
 
                 <Menu.Text
                     id='text'
-                    name='Text'
+                    name={typeDisplayName(intl, 'text')}
                     onClick={() => props.onTypeChanged('text')}
                 />
                 <Menu.Text
                     id='number'
-                    name='Number'
+                    name={typeDisplayName(intl, 'number')}
                     onClick={() => props.onTypeChanged('number')}
                 />
                 <Menu.Text
                     id='email'
-                    name='Email'
+                    name={typeDisplayName(intl, 'email')}
                     onClick={() => props.onTypeChanged('email')}
                 />
                 <Menu.Text
                     id='select'
-                    name='Select'
+                    name={typeDisplayName(intl, 'select')}
                     onClick={() => props.onTypeChanged('select')}
                 />
                 <Menu.Text
                     id='createdTime'
-                    name='Created Time'
+                    name={typeDisplayName(intl, 'createdTime')}
                     onClick={() => props.onTypeChanged('createdTime')}
                 />
                 <Menu.Text
                     id='updatedTime'
-                    name='Updated Time'
+                    name={typeDisplayName(intl, 'updatedTime')}
                     onClick={() => props.onTypeChanged('updatedTime')}
                 />
             </Menu.SubMenu>
             <Menu.Text
                 id='delete'
-                name='Delete'
+                name={deleteText}
                 onClick={() => props.onDelete(props.propertyId)}
             />
         </Menu>