From 348b8ea777ed7695f50db430fbff6a1c59938c54 Mon Sep 17 00:00:00 2001
From: Jamie Guthrie <jamie.guthrie@gmail.com>
Date: Wed, 16 Aug 2023 18:58:41 +0200
Subject: Localization falls back to 'en' if translation cannot be found

---
 modern/src/common/components/LocalizationProvider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modern')

diff --git a/modern/src/common/components/LocalizationProvider.js b/modern/src/common/components/LocalizationProvider.js
index 6bc64831..9c51841c 100644
--- a/modern/src/common/components/LocalizationProvider.js
+++ b/modern/src/common/components/LocalizationProvider.js
@@ -178,7 +178,7 @@ export const useLocalization = () => useContext(LocalizationContext);
 export const useTranslation = () => {
   const context = useContext(LocalizationContext);
   const { data } = context.languages[context.language];
-  return useMemo(() => (key) => data[key], [data]);
+  return useMemo(() => (key) => (data[key] ? data[key] : context.languages.en.data[key]), [data]);
 };
 
 export const useTranslationKeys = (predicate) => {
-- 
cgit v1.2.3


From 62ae7d516525bba2c2d053832ece7d613be86dc9 Mon Sep 17 00:00:00 2001
From: Jamie Guthrie <jamie.guthrie@gmail.com>
Date: Wed, 16 Aug 2023 18:58:52 +0200
Subject: Add tooltips

---
 modern/src/other/GeofencesList.js                  |  4 +++-
 modern/src/other/GeofencesPage.js                  |  5 +++-
 modern/src/resources/l10n/en.json                  |  3 +++
 modern/src/settings/CalendarsPage.js               |  2 +-
 modern/src/settings/CommandsPage.js                |  2 +-
 modern/src/settings/ComputedAttributesPage.js      |  2 +-
 modern/src/settings/DevicesPage.js                 |  2 ++
 modern/src/settings/DriversPage.js                 |  2 +-
 modern/src/settings/GroupsPage.js                  |  7 ++++++
 modern/src/settings/MaintenancesPage.js            |  2 +-
 modern/src/settings/NotificationsPage.js           |  2 +-
 modern/src/settings/UsersPage.js                   |  3 +++
 .../src/settings/components/CollectionActions.js   | 27 ++++++++++++++--------
 13 files changed, 45 insertions(+), 18 deletions(-)

(limited to 'modern')

diff --git a/modern/src/other/GeofencesList.js b/modern/src/other/GeofencesList.js
index d26eff09..a7858ce5 100644
--- a/modern/src/other/GeofencesList.js
+++ b/modern/src/other/GeofencesList.js
@@ -8,6 +8,7 @@ import {
 import { geofencesActions } from '../store';
 import CollectionActions from '../settings/components/CollectionActions';
 import { useCatchCallback } from '../reactHelper';
+import { useTranslation } from '../common/components/LocalizationProvider';
 
 const useStyles = makeStyles(() => ({
   list: {
@@ -24,6 +25,7 @@ const useStyles = makeStyles(() => ({
 const GeofencesList = ({ onGeofenceSelected }) => {
   const classes = useStyles();
   const dispatch = useDispatch();
+  const t = useTranslation();
 
   const items = useSelector((state) => state.geofences.items);
 
@@ -42,7 +44,7 @@ const GeofencesList = ({ onGeofenceSelected }) => {
         <Fragment key={item.id}>
           <ListItemButton key={item.id} onClick={() => onGeofenceSelected(item.id)}>
             <ListItemText primary={item.name} />
-            <CollectionActions itemId={item.id} editPath="/settings/geofence" endpoint="geofences" setTimestamp={refreshGeofences} />
+            <CollectionActions itemId={item.id} editPath="/settings/geofence" endpoint="geofences" collectionTitle={t('sharedGeofence')} setTimestamp={refreshGeofences} />
           </ListItemButton>
           {index < list.length - 1 ? <Divider /> : null}
         </Fragment>
diff --git a/modern/src/other/GeofencesPage.js b/modern/src/other/GeofencesPage.js
index 6ce7ae8e..cbbf3d40 100644
--- a/modern/src/other/GeofencesPage.js
+++ b/modern/src/other/GeofencesPage.js
@@ -3,6 +3,7 @@ import { useDispatch } from 'react-redux';
 import {
   Divider, Typography, IconButton, useMediaQuery, Toolbar,
 } from '@mui/material';
+import Tooltip from '@mui/material/Tooltip';
 import makeStyles from '@mui/styles/makeStyles';
 import { useTheme } from '@mui/material/styles';
 import Drawer from '@mui/material/Drawer';
@@ -117,7 +118,9 @@ const GeofencesPage = () => {
             <label htmlFor="upload-gpx">
               <input accept=".gpx" id="upload-gpx" type="file" className={classes.fileInput} onChange={handleFile} />
               <IconButton edge="end" component="span" onClick={() => {}}>
-                <UploadFileIcon />
+                <Tooltip title={t('sharedUploadGeofence')} enterDelay={500} enterNextDelay={500}>
+                  <UploadFileIcon />
+                </Tooltip>
               </IconButton>
             </label>
           </Toolbar>
diff --git a/modern/src/resources/l10n/en.json b/modern/src/resources/l10n/en.json
index d30cad7e..384e31e3 100644
--- a/modern/src/resources/l10n/en.json
+++ b/modern/src/resources/l10n/en.json
@@ -8,6 +8,8 @@
     "sharedEdit": "Edit",
     "sharedRemove": "Remove",
     "sharedRemoveConfirm": "Remove item?",
+    "sharedPublish": "Publish",
+    "sharedLink": "Link",
     "sharedNoData": "No data",
     "sharedYes": "Yes",
     "sharedNo": "No",
@@ -35,6 +37,7 @@
     "sharedGeofence": "Geofence",
     "sharedGeofences": "Geofences",
     "sharedCreateGeofence": "Create Geofence",
+    "sharedUploadGeofence": "Upload Geofence",
     "sharedNotifications": "Notifications",
     "sharedNotification": "Notification",
     "sharedAttributes": "Attributes",
diff --git a/modern/src/settings/CalendarsPage.js b/modern/src/settings/CalendarsPage.js
index de27a451..e0b957e4 100644
--- a/modern/src/settings/CalendarsPage.js
+++ b/modern/src/settings/CalendarsPage.js
@@ -50,7 +50,7 @@ const CalendarsPage = () => {
             <TableRow key={item.id}>
               <TableCell>{item.name}</TableCell>
               <TableCell className={classes.columnAction} padding="none">
-                <CollectionActions itemId={item.id} editPath="/settings/calendar" endpoint="calendars" setTimestamp={setTimestamp} />
+                <CollectionActions itemId={item.id} editPath="/settings/calendar" endpoint="calendars" collectionTitle={t('sharedCalendar')} setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
           )) : (<TableShimmer columns={2} endAction />)}
diff --git a/modern/src/settings/CommandsPage.js b/modern/src/settings/CommandsPage.js
index 1b893831..7a330874 100644
--- a/modern/src/settings/CommandsPage.js
+++ b/modern/src/settings/CommandsPage.js
@@ -59,7 +59,7 @@ const CommandsPage = () => {
               <TableCell>{formatBoolean(item.textChannel, t)}</TableCell>
               {!limitCommands && (
                 <TableCell className={classes.columnAction} padding="none">
-                  <CollectionActions itemId={item.id} editPath="/settings/command" endpoint="commands" setTimestamp={setTimestamp} />
+                  <CollectionActions itemId={item.id} editPath="/settings/command" endpoint="commands" collectionTitle={t('sharedSavedCommand')} setTimestamp={setTimestamp} />
                 </TableCell>
               )}
             </TableRow>
diff --git a/modern/src/settings/ComputedAttributesPage.js b/modern/src/settings/ComputedAttributesPage.js
index 6d098547..d252bc4d 100644
--- a/modern/src/settings/ComputedAttributesPage.js
+++ b/modern/src/settings/ComputedAttributesPage.js
@@ -59,7 +59,7 @@ const ComputedAttributesPage = () => {
               <TableCell>{item.type}</TableCell>
               {administrator && (
                 <TableCell className={classes.columnAction} padding="none">
-                  <CollectionActions itemId={item.id} editPath="/settings/attribute" endpoint="attributes/computed" setTimestamp={setTimestamp} />
+                  <CollectionActions itemId={item.id} editPath="/settings/attribute" endpoint="attributes/computed" collectionTitle={t('sharedComputedAttribute')} setTimestamp={setTimestamp} />
                 </TableCell>
               )}
             </TableRow>
diff --git a/modern/src/settings/DevicesPage.js b/modern/src/settings/DevicesPage.js
index 5ef5aae5..6a285429 100644
--- a/modern/src/settings/DevicesPage.js
+++ b/modern/src/settings/DevicesPage.js
@@ -51,6 +51,7 @@ const DevicesPage = () => {
   const actionConnections = {
     key: 'connections',
     title: t('sharedConnections'),
+    tooltip: t('sharedLink').concat(' ').concat(t('reportDevice')),
     icon: <LinkIcon fontSize="small" />,
     handler: (deviceId) => navigate(`/settings/device/${deviceId}/connections`),
   };
@@ -86,6 +87,7 @@ const DevicesPage = () => {
                   itemId={item.id}
                   editPath="/settings/device"
                   endpoint="devices"
+                  collectionTitle={t('reportDevice')}
                   setTimestamp={setTimestamp}
                   customActions={[actionConnections]}
                   readonly={deviceReadonly}
diff --git a/modern/src/settings/DriversPage.js b/modern/src/settings/DriversPage.js
index 72834860..dcd3f9fb 100644
--- a/modern/src/settings/DriversPage.js
+++ b/modern/src/settings/DriversPage.js
@@ -52,7 +52,7 @@ const DriversPage = () => {
               <TableCell>{item.name}</TableCell>
               <TableCell>{item.uniqueId}</TableCell>
               <TableCell className={classes.columnAction} padding="none">
-                <CollectionActions itemId={item.id} editPath="/settings/driver" endpoint="drivers" setTimestamp={setTimestamp} />
+                <CollectionActions itemId={item.id} editPath="/settings/driver" endpoint="drivers" collectionTitle={t('sharedDriver')} setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
           )) : (<TableShimmer columns={3} endAction />)}
diff --git a/modern/src/settings/GroupsPage.js b/modern/src/settings/GroupsPage.js
index baba7f72..e009b06b 100644
--- a/modern/src/settings/GroupsPage.js
+++ b/modern/src/settings/GroupsPage.js
@@ -45,6 +45,11 @@ const GroupsPage = () => {
   const actionCommand = {
     key: 'command',
     title: t('deviceCommand'),
+    tooltip: t('commandSend')
+      .concat(' ')
+      .concat(t('reportGroup'))
+      .concat(' ')
+      .concat(t('commandTitle')),
     icon: <PublishIcon fontSize="small" />,
     handler: (groupId) => navigate(`/settings/group/${groupId}/command`),
   };
@@ -52,6 +57,7 @@ const GroupsPage = () => {
   const actionConnections = {
     key: 'connections',
     title: t('sharedConnections'),
+    tooltip: t('sharedLink').concat(' ').concat(t('reportGroup')),
     icon: <LinkIcon fontSize="small" />,
     handler: (groupId) => navigate(`/settings/group/${groupId}/connections`),
   };
@@ -75,6 +81,7 @@ const GroupsPage = () => {
                   itemId={item.id}
                   editPath="/settings/group"
                   endpoint="groups"
+                  collectionTitle={t('reportGroup')}
                   setTimestamp={setTimestamp}
                   customActions={limitCommands ? [actionConnections] : [actionConnections, actionCommand]}
                 />
diff --git a/modern/src/settings/MaintenancesPage.js b/modern/src/settings/MaintenancesPage.js
index 2a66590c..4776deb6 100644
--- a/modern/src/settings/MaintenancesPage.js
+++ b/modern/src/settings/MaintenancesPage.js
@@ -79,7 +79,7 @@ const MaintenacesPage = () => {
               <TableCell>{convertAttribute(item.type, item.start)}</TableCell>
               <TableCell>{convertAttribute(item.type, item.period)}</TableCell>
               <TableCell className={classes.columnAction} padding="none">
-                <CollectionActions itemId={item.id} editPath="/settings/maintenance" endpoint="maintenance" setTimestamp={setTimestamp} />
+                <CollectionActions itemId={item.id} editPath="/settings/maintenance" endpoint="maintenance" collectionTitle={t('sharedMaintenance')} setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
           )) : (<TableShimmer columns={5} endAction />)}
diff --git a/modern/src/settings/NotificationsPage.js b/modern/src/settings/NotificationsPage.js
index f1e70a85..7d6197c0 100644
--- a/modern/src/settings/NotificationsPage.js
+++ b/modern/src/settings/NotificationsPage.js
@@ -69,7 +69,7 @@ const NotificationsPage = () => {
               <TableCell>{formatList('alarm', item.attributes.alarms)}</TableCell>
               <TableCell>{formatList('notificator', item.notificators)}</TableCell>
               <TableCell className={classes.columnAction} padding="none">
-                <CollectionActions itemId={item.id} editPath="/settings/notification" endpoint="notifications" setTimestamp={setTimestamp} />
+                <CollectionActions itemId={item.id} editPath="/settings/notification" endpoint="notifications" collectionTitle={t('sharedNotification')} setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
           )) : (<TableShimmer columns={5} endAction />)}
diff --git a/modern/src/settings/UsersPage.js b/modern/src/settings/UsersPage.js
index d04f2a2b..b4176763 100644
--- a/modern/src/settings/UsersPage.js
+++ b/modern/src/settings/UsersPage.js
@@ -44,6 +44,7 @@ const UsersPage = () => {
   const actionLogin = {
     key: 'login',
     title: t('loginLogin'),
+    tooltip: t('settingsUser').concat(' ').concat(t('loginTitle')),
     icon: <LoginIcon fontSize="small" />,
     handler: handleLogin,
   };
@@ -51,6 +52,7 @@ const UsersPage = () => {
   const actionConnections = {
     key: 'connections',
     title: t('sharedConnections'),
+    tooltip: t('sharedLink').concat(' ').concat(t('settingsUser')),
     icon: <LinkIcon fontSize="small" />,
     handler: (userId) => navigate(`/settings/user/${userId}/connections`),
   };
@@ -96,6 +98,7 @@ const UsersPage = () => {
                   itemId={item.id}
                   editPath="/settings/user"
                   endpoint="users"
+                  collectionTitle={t('settingsUser')}
                   setTimestamp={setTimestamp}
                   customActions={manager ? [actionLogin, actionConnections] : [actionConnections]}
                 />
diff --git a/modern/src/settings/components/CollectionActions.js b/modern/src/settings/components/CollectionActions.js
index 177295b1..bf8eb257 100644
--- a/modern/src/settings/components/CollectionActions.js
+++ b/modern/src/settings/components/CollectionActions.js
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 import {
   IconButton, Menu, MenuItem, useMediaQuery, useTheme,
 } from '@mui/material';
+import Tooltip from '@mui/material/Tooltip';
 import MoreVertIcon from '@mui/icons-material/MoreVert';
 import EditIcon from '@mui/icons-material/Edit';
 import DeleteIcon from '@mui/icons-material/Delete';
@@ -17,7 +18,7 @@ const useStyles = makeStyles(() => ({
 }));
 
 const CollectionActions = ({
-  itemId, editPath, endpoint, setTimestamp, customActions, readonly,
+  itemId, editPath, endpoint, collectionTitle, setTimestamp, customActions, readonly,
 }) => {
   const theme = useTheme();
   const classes = useStyles();
@@ -73,18 +74,24 @@ const CollectionActions = ({
       ) : (
         <div className={classes.row}>
           {customActions && customActions.map((action) => (
-            <IconButton size="small" onClick={() => handleCustom(action)} key={action.key}>
-              {action.icon}
-            </IconButton>
+            <Tooltip title={action.tooltip} enterDelay={500} enterNextDelay={500}>
+              <IconButton size="small" onClick={() => handleCustom(action)} key={action.key}>
+                {action.icon}
+              </IconButton>
+            </Tooltip>
           ))}
           {!readonly && (
             <>
-              <IconButton size="small" onClick={handleEdit}>
-                <EditIcon fontSize="small" />
-              </IconButton>
-              <IconButton size="small" onClick={handleRemove}>
-                <DeleteIcon fontSize="small" />
-              </IconButton>
+              <Tooltip title={t('sharedEdit').concat(' ').concat(collectionTitle || '')} enterDelay={500} enterNextDelay={500}>
+                <IconButton size="small" onClick={handleEdit}>
+                  <EditIcon fontSize="small" />
+                </IconButton>
+              </Tooltip>
+              <Tooltip title={t('sharedRemove').concat(' ').concat(collectionTitle || '')} enterDelay={500} enterNextDelay={500}>
+                <IconButton size="small" onClick={handleRemove}>
+                  <DeleteIcon fontSize="small" />
+                </IconButton>
+              </Tooltip>
             </>
           )}
         </div>
-- 
cgit v1.2.3


From c4d214632676a05d3e1cb33efb3bb6d99c7e0488 Mon Sep 17 00:00:00 2001
From: Jamie Guthrie <jamie.guthrie@gmail.com>
Date: Wed, 16 Aug 2023 22:32:58 +0200
Subject: Use more basic tooltip wording

---
 modern/src/other/GeofencesList.js                   | 4 +---
 modern/src/resources/l10n/en.json                   | 3 +--
 modern/src/settings/CalendarsPage.js                | 2 +-
 modern/src/settings/CommandsPage.js                 | 2 +-
 modern/src/settings/ComputedAttributesPage.js       | 2 +-
 modern/src/settings/DevicesPage.js                  | 2 --
 modern/src/settings/DriversPage.js                  | 2 +-
 modern/src/settings/GroupsPage.js                   | 8 +-------
 modern/src/settings/MaintenancesPage.js             | 2 +-
 modern/src/settings/NotificationsPage.js            | 2 +-
 modern/src/settings/UsersPage.js                    | 3 ---
 modern/src/settings/components/CollectionActions.js | 8 ++++----
 12 files changed, 13 insertions(+), 27 deletions(-)

(limited to 'modern')

diff --git a/modern/src/other/GeofencesList.js b/modern/src/other/GeofencesList.js
index a7858ce5..d26eff09 100644
--- a/modern/src/other/GeofencesList.js
+++ b/modern/src/other/GeofencesList.js
@@ -8,7 +8,6 @@ import {
 import { geofencesActions } from '../store';
 import CollectionActions from '../settings/components/CollectionActions';
 import { useCatchCallback } from '../reactHelper';
-import { useTranslation } from '../common/components/LocalizationProvider';
 
 const useStyles = makeStyles(() => ({
   list: {
@@ -25,7 +24,6 @@ const useStyles = makeStyles(() => ({
 const GeofencesList = ({ onGeofenceSelected }) => {
   const classes = useStyles();
   const dispatch = useDispatch();
-  const t = useTranslation();
 
   const items = useSelector((state) => state.geofences.items);
 
@@ -44,7 +42,7 @@ const GeofencesList = ({ onGeofenceSelected }) => {
         <Fragment key={item.id}>
           <ListItemButton key={item.id} onClick={() => onGeofenceSelected(item.id)}>
             <ListItemText primary={item.name} />
-            <CollectionActions itemId={item.id} editPath="/settings/geofence" endpoint="geofences" collectionTitle={t('sharedGeofence')} setTimestamp={refreshGeofences} />
+            <CollectionActions itemId={item.id} editPath="/settings/geofence" endpoint="geofences" setTimestamp={refreshGeofences} />
           </ListItemButton>
           {index < list.length - 1 ? <Divider /> : null}
         </Fragment>
diff --git a/modern/src/resources/l10n/en.json b/modern/src/resources/l10n/en.json
index 384e31e3..057c1655 100644
--- a/modern/src/resources/l10n/en.json
+++ b/modern/src/resources/l10n/en.json
@@ -8,8 +8,6 @@
     "sharedEdit": "Edit",
     "sharedRemove": "Remove",
     "sharedRemoveConfirm": "Remove item?",
-    "sharedPublish": "Publish",
-    "sharedLink": "Link",
     "sharedNoData": "No data",
     "sharedYes": "Yes",
     "sharedNo": "No",
@@ -381,6 +379,7 @@
     "stateValue": "Value",
     "commandTitle": "Command",
     "commandSend": "Send",
+    "commandSendTitle": "Send Command",
     "commandSent": "Command sent",
     "commandQueued": "Command queued",
     "commandUnit": "Unit",
diff --git a/modern/src/settings/CalendarsPage.js b/modern/src/settings/CalendarsPage.js
index e0b957e4..de27a451 100644
--- a/modern/src/settings/CalendarsPage.js
+++ b/modern/src/settings/CalendarsPage.js
@@ -50,7 +50,7 @@ const CalendarsPage = () => {
             <TableRow key={item.id}>
               <TableCell>{item.name}</TableCell>
               <TableCell className={classes.columnAction} padding="none">
-                <CollectionActions itemId={item.id} editPath="/settings/calendar" endpoint="calendars" collectionTitle={t('sharedCalendar')} setTimestamp={setTimestamp} />
+                <CollectionActions itemId={item.id} editPath="/settings/calendar" endpoint="calendars" setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
           )) : (<TableShimmer columns={2} endAction />)}
diff --git a/modern/src/settings/CommandsPage.js b/modern/src/settings/CommandsPage.js
index 7a330874..1b893831 100644
--- a/modern/src/settings/CommandsPage.js
+++ b/modern/src/settings/CommandsPage.js
@@ -59,7 +59,7 @@ const CommandsPage = () => {
               <TableCell>{formatBoolean(item.textChannel, t)}</TableCell>
               {!limitCommands && (
                 <TableCell className={classes.columnAction} padding="none">
-                  <CollectionActions itemId={item.id} editPath="/settings/command" endpoint="commands" collectionTitle={t('sharedSavedCommand')} setTimestamp={setTimestamp} />
+                  <CollectionActions itemId={item.id} editPath="/settings/command" endpoint="commands" setTimestamp={setTimestamp} />
                 </TableCell>
               )}
             </TableRow>
diff --git a/modern/src/settings/ComputedAttributesPage.js b/modern/src/settings/ComputedAttributesPage.js
index d252bc4d..6d098547 100644
--- a/modern/src/settings/ComputedAttributesPage.js
+++ b/modern/src/settings/ComputedAttributesPage.js
@@ -59,7 +59,7 @@ const ComputedAttributesPage = () => {
               <TableCell>{item.type}</TableCell>
               {administrator && (
                 <TableCell className={classes.columnAction} padding="none">
-                  <CollectionActions itemId={item.id} editPath="/settings/attribute" endpoint="attributes/computed" collectionTitle={t('sharedComputedAttribute')} setTimestamp={setTimestamp} />
+                  <CollectionActions itemId={item.id} editPath="/settings/attribute" endpoint="attributes/computed" setTimestamp={setTimestamp} />
                 </TableCell>
               )}
             </TableRow>
diff --git a/modern/src/settings/DevicesPage.js b/modern/src/settings/DevicesPage.js
index 6a285429..5ef5aae5 100644
--- a/modern/src/settings/DevicesPage.js
+++ b/modern/src/settings/DevicesPage.js
@@ -51,7 +51,6 @@ const DevicesPage = () => {
   const actionConnections = {
     key: 'connections',
     title: t('sharedConnections'),
-    tooltip: t('sharedLink').concat(' ').concat(t('reportDevice')),
     icon: <LinkIcon fontSize="small" />,
     handler: (deviceId) => navigate(`/settings/device/${deviceId}/connections`),
   };
@@ -87,7 +86,6 @@ const DevicesPage = () => {
                   itemId={item.id}
                   editPath="/settings/device"
                   endpoint="devices"
-                  collectionTitle={t('reportDevice')}
                   setTimestamp={setTimestamp}
                   customActions={[actionConnections]}
                   readonly={deviceReadonly}
diff --git a/modern/src/settings/DriversPage.js b/modern/src/settings/DriversPage.js
index dcd3f9fb..72834860 100644
--- a/modern/src/settings/DriversPage.js
+++ b/modern/src/settings/DriversPage.js
@@ -52,7 +52,7 @@ const DriversPage = () => {
               <TableCell>{item.name}</TableCell>
               <TableCell>{item.uniqueId}</TableCell>
               <TableCell className={classes.columnAction} padding="none">
-                <CollectionActions itemId={item.id} editPath="/settings/driver" endpoint="drivers" collectionTitle={t('sharedDriver')} setTimestamp={setTimestamp} />
+                <CollectionActions itemId={item.id} editPath="/settings/driver" endpoint="drivers" setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
           )) : (<TableShimmer columns={3} endAction />)}
diff --git a/modern/src/settings/GroupsPage.js b/modern/src/settings/GroupsPage.js
index e009b06b..7148184b 100644
--- a/modern/src/settings/GroupsPage.js
+++ b/modern/src/settings/GroupsPage.js
@@ -45,11 +45,7 @@ const GroupsPage = () => {
   const actionCommand = {
     key: 'command',
     title: t('deviceCommand'),
-    tooltip: t('commandSend')
-      .concat(' ')
-      .concat(t('reportGroup'))
-      .concat(' ')
-      .concat(t('commandTitle')),
+    tooltip: t('commandSendTitle'),
     icon: <PublishIcon fontSize="small" />,
     handler: (groupId) => navigate(`/settings/group/${groupId}/command`),
   };
@@ -57,7 +53,6 @@ const GroupsPage = () => {
   const actionConnections = {
     key: 'connections',
     title: t('sharedConnections'),
-    tooltip: t('sharedLink').concat(' ').concat(t('reportGroup')),
     icon: <LinkIcon fontSize="small" />,
     handler: (groupId) => navigate(`/settings/group/${groupId}/connections`),
   };
@@ -81,7 +76,6 @@ const GroupsPage = () => {
                   itemId={item.id}
                   editPath="/settings/group"
                   endpoint="groups"
-                  collectionTitle={t('reportGroup')}
                   setTimestamp={setTimestamp}
                   customActions={limitCommands ? [actionConnections] : [actionConnections, actionCommand]}
                 />
diff --git a/modern/src/settings/MaintenancesPage.js b/modern/src/settings/MaintenancesPage.js
index 4776deb6..2a66590c 100644
--- a/modern/src/settings/MaintenancesPage.js
+++ b/modern/src/settings/MaintenancesPage.js
@@ -79,7 +79,7 @@ const MaintenacesPage = () => {
               <TableCell>{convertAttribute(item.type, item.start)}</TableCell>
               <TableCell>{convertAttribute(item.type, item.period)}</TableCell>
               <TableCell className={classes.columnAction} padding="none">
-                <CollectionActions itemId={item.id} editPath="/settings/maintenance" endpoint="maintenance" collectionTitle={t('sharedMaintenance')} setTimestamp={setTimestamp} />
+                <CollectionActions itemId={item.id} editPath="/settings/maintenance" endpoint="maintenance" setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
           )) : (<TableShimmer columns={5} endAction />)}
diff --git a/modern/src/settings/NotificationsPage.js b/modern/src/settings/NotificationsPage.js
index 7d6197c0..f1e70a85 100644
--- a/modern/src/settings/NotificationsPage.js
+++ b/modern/src/settings/NotificationsPage.js
@@ -69,7 +69,7 @@ const NotificationsPage = () => {
               <TableCell>{formatList('alarm', item.attributes.alarms)}</TableCell>
               <TableCell>{formatList('notificator', item.notificators)}</TableCell>
               <TableCell className={classes.columnAction} padding="none">
-                <CollectionActions itemId={item.id} editPath="/settings/notification" endpoint="notifications" collectionTitle={t('sharedNotification')} setTimestamp={setTimestamp} />
+                <CollectionActions itemId={item.id} editPath="/settings/notification" endpoint="notifications" setTimestamp={setTimestamp} />
               </TableCell>
             </TableRow>
           )) : (<TableShimmer columns={5} endAction />)}
diff --git a/modern/src/settings/UsersPage.js b/modern/src/settings/UsersPage.js
index b4176763..d04f2a2b 100644
--- a/modern/src/settings/UsersPage.js
+++ b/modern/src/settings/UsersPage.js
@@ -44,7 +44,6 @@ const UsersPage = () => {
   const actionLogin = {
     key: 'login',
     title: t('loginLogin'),
-    tooltip: t('settingsUser').concat(' ').concat(t('loginTitle')),
     icon: <LoginIcon fontSize="small" />,
     handler: handleLogin,
   };
@@ -52,7 +51,6 @@ const UsersPage = () => {
   const actionConnections = {
     key: 'connections',
     title: t('sharedConnections'),
-    tooltip: t('sharedLink').concat(' ').concat(t('settingsUser')),
     icon: <LinkIcon fontSize="small" />,
     handler: (userId) => navigate(`/settings/user/${userId}/connections`),
   };
@@ -98,7 +96,6 @@ const UsersPage = () => {
                   itemId={item.id}
                   editPath="/settings/user"
                   endpoint="users"
-                  collectionTitle={t('settingsUser')}
                   setTimestamp={setTimestamp}
                   customActions={manager ? [actionLogin, actionConnections] : [actionConnections]}
                 />
diff --git a/modern/src/settings/components/CollectionActions.js b/modern/src/settings/components/CollectionActions.js
index bf8eb257..87ffe7af 100644
--- a/modern/src/settings/components/CollectionActions.js
+++ b/modern/src/settings/components/CollectionActions.js
@@ -18,7 +18,7 @@ const useStyles = makeStyles(() => ({
 }));
 
 const CollectionActions = ({
-  itemId, editPath, endpoint, collectionTitle, setTimestamp, customActions, readonly,
+  itemId, editPath, endpoint, setTimestamp, customActions, readonly,
 }) => {
   const theme = useTheme();
   const classes = useStyles();
@@ -74,7 +74,7 @@ const CollectionActions = ({
       ) : (
         <div className={classes.row}>
           {customActions && customActions.map((action) => (
-            <Tooltip title={action.tooltip} enterDelay={500} enterNextDelay={500}>
+            <Tooltip title={action.tooltip || action.title} enterDelay={500} enterNextDelay={500}>
               <IconButton size="small" onClick={() => handleCustom(action)} key={action.key}>
                 {action.icon}
               </IconButton>
@@ -82,12 +82,12 @@ const CollectionActions = ({
           ))}
           {!readonly && (
             <>
-              <Tooltip title={t('sharedEdit').concat(' ').concat(collectionTitle || '')} enterDelay={500} enterNextDelay={500}>
+              <Tooltip title={t('sharedEdit')} enterDelay={500} enterNextDelay={500}>
                 <IconButton size="small" onClick={handleEdit}>
                   <EditIcon fontSize="small" />
                 </IconButton>
               </Tooltip>
-              <Tooltip title={t('sharedRemove').concat(' ').concat(collectionTitle || '')} enterDelay={500} enterNextDelay={500}>
+              <Tooltip title={t('sharedRemove')} enterDelay={500} enterNextDelay={500}>
                 <IconButton size="small" onClick={handleRemove}>
                   <DeleteIcon fontSize="small" />
                 </IconButton>
-- 
cgit v1.2.3


From bf4a9e5c499c9eee9f8b63dbb6733e09e3090fd0 Mon Sep 17 00:00:00 2001
From: Jamie Guthrie <jamie.guthrie@gmail.com>
Date: Thu, 17 Aug 2023 03:05:50 +0200
Subject: Refactor & set tooltip delay in global env

---
 modern/.env                                         | 1 +
 modern/src/other/GeofencesPage.js                   | 2 +-
 modern/src/resources/l10n/en.json                   | 1 -
 modern/src/settings/GroupsPage.js                   | 1 -
 modern/src/settings/components/CollectionActions.js | 8 ++++----
 5 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'modern')

diff --git a/modern/.env b/modern/.env
index c8702185..30d7591a 100644
--- a/modern/.env
+++ b/modern/.env
@@ -1,3 +1,4 @@
 ESLINT_NO_DEV_ERRORS=false
 REACT_APP_URL_NAME='localhost:8082'
 REACT_APP_VERSION=$npm_package_version
+REACT_APP_TOOLTIP_DELAY=750
\ No newline at end of file
diff --git a/modern/src/other/GeofencesPage.js b/modern/src/other/GeofencesPage.js
index cbbf3d40..37875a67 100644
--- a/modern/src/other/GeofencesPage.js
+++ b/modern/src/other/GeofencesPage.js
@@ -118,7 +118,7 @@ const GeofencesPage = () => {
             <label htmlFor="upload-gpx">
               <input accept=".gpx" id="upload-gpx" type="file" className={classes.fileInput} onChange={handleFile} />
               <IconButton edge="end" component="span" onClick={() => {}}>
-                <Tooltip title={t('sharedUploadGeofence')} enterDelay={500} enterNextDelay={500}>
+                <Tooltip title={t('sharedUploadGeofence')} enterDelay={process.env.REACT_APP_TOOLTIP_DELAY} enterNextDelay={process.env.REACT_APP_TOOLTIP_DELAY}>
                   <UploadFileIcon />
                 </Tooltip>
               </IconButton>
diff --git a/modern/src/resources/l10n/en.json b/modern/src/resources/l10n/en.json
index 057c1655..4e0b72b1 100644
--- a/modern/src/resources/l10n/en.json
+++ b/modern/src/resources/l10n/en.json
@@ -379,7 +379,6 @@
     "stateValue": "Value",
     "commandTitle": "Command",
     "commandSend": "Send",
-    "commandSendTitle": "Send Command",
     "commandSent": "Command sent",
     "commandQueued": "Command queued",
     "commandUnit": "Unit",
diff --git a/modern/src/settings/GroupsPage.js b/modern/src/settings/GroupsPage.js
index 7148184b..baba7f72 100644
--- a/modern/src/settings/GroupsPage.js
+++ b/modern/src/settings/GroupsPage.js
@@ -45,7 +45,6 @@ const GroupsPage = () => {
   const actionCommand = {
     key: 'command',
     title: t('deviceCommand'),
-    tooltip: t('commandSendTitle'),
     icon: <PublishIcon fontSize="small" />,
     handler: (groupId) => navigate(`/settings/group/${groupId}/command`),
   };
diff --git a/modern/src/settings/components/CollectionActions.js b/modern/src/settings/components/CollectionActions.js
index 87ffe7af..287be964 100644
--- a/modern/src/settings/components/CollectionActions.js
+++ b/modern/src/settings/components/CollectionActions.js
@@ -74,20 +74,20 @@ const CollectionActions = ({
       ) : (
         <div className={classes.row}>
           {customActions && customActions.map((action) => (
-            <Tooltip title={action.tooltip || action.title} enterDelay={500} enterNextDelay={500}>
-              <IconButton size="small" onClick={() => handleCustom(action)} key={action.key}>
+            <Tooltip title={action.title} enterDelay={process.env.REACT_APP_TOOLTIP_DELAY} enterNextDelay={process.env.REACT_APP_TOOLTIP_DELAY} key={action.key}>
+              <IconButton size="small" onClick={() => handleCustom(action)}>
                 {action.icon}
               </IconButton>
             </Tooltip>
           ))}
           {!readonly && (
             <>
-              <Tooltip title={t('sharedEdit')} enterDelay={500} enterNextDelay={500}>
+              <Tooltip title={t('sharedEdit')} enterDelay={process.env.REACT_APP_TOOLTIP_DELAY} enterNextDelay={process.env.REACT_APP_TOOLTIP_DELAY}>
                 <IconButton size="small" onClick={handleEdit}>
                   <EditIcon fontSize="small" />
                 </IconButton>
               </Tooltip>
-              <Tooltip title={t('sharedRemove')} enterDelay={500} enterNextDelay={500}>
+              <Tooltip title={t('sharedRemove')} enterDelay={process.env.REACT_APP_TOOLTIP_DELAY} enterNextDelay={process.env.REACT_APP_TOOLTIP_DELAY}>
                 <IconButton size="small" onClick={handleRemove}>
                   <DeleteIcon fontSize="small" />
                 </IconButton>
-- 
cgit v1.2.3


From 3ea2579e679624f0fe3b8b31dc371a7baebda1fc Mon Sep 17 00:00:00 2001
From: Jamie Guthrie <jamie.guthrie@gmail.com>
Date: Thu, 17 Aug 2023 13:29:56 +0200
Subject: Create DelayedTooltip component

---
 modern/.env                                         |  3 +--
 modern/src/common/components/DelayedTooltip.js      | 16 ++++++++++++++++
 modern/src/other/GeofencesPage.js                   |  2 +-
 modern/src/settings/components/CollectionActions.js | 14 +++++++-------
 4 files changed, 25 insertions(+), 10 deletions(-)
 create mode 100644 modern/src/common/components/DelayedTooltip.js

(limited to 'modern')

diff --git a/modern/.env b/modern/.env
index 30d7591a..5f78fd1e 100644
--- a/modern/.env
+++ b/modern/.env
@@ -1,4 +1,3 @@
 ESLINT_NO_DEV_ERRORS=false
 REACT_APP_URL_NAME='localhost:8082'
-REACT_APP_VERSION=$npm_package_version
-REACT_APP_TOOLTIP_DELAY=750
\ No newline at end of file
+REACT_APP_VERSION=$npm_package_version
\ No newline at end of file
diff --git a/modern/src/common/components/DelayedTooltip.js b/modern/src/common/components/DelayedTooltip.js
new file mode 100644
index 00000000..c8872adb
--- /dev/null
+++ b/modern/src/common/components/DelayedTooltip.js
@@ -0,0 +1,16 @@
+import React from 'react';
+import Tooltip from '@mui/material/Tooltip';
+
+const DelayedTooltip = ({
+  ...props
+}) => {
+  (
+    <Tooltip
+      {...props}
+      enterDelay={700}
+      enterNextDelay={700}
+    />
+  );
+};
+
+export default DelayedTooltip;
diff --git a/modern/src/other/GeofencesPage.js b/modern/src/other/GeofencesPage.js
index 37875a67..fcc7153d 100644
--- a/modern/src/other/GeofencesPage.js
+++ b/modern/src/other/GeofencesPage.js
@@ -118,7 +118,7 @@ const GeofencesPage = () => {
             <label htmlFor="upload-gpx">
               <input accept=".gpx" id="upload-gpx" type="file" className={classes.fileInput} onChange={handleFile} />
               <IconButton edge="end" component="span" onClick={() => {}}>
-                <Tooltip title={t('sharedUploadGeofence')} enterDelay={process.env.REACT_APP_TOOLTIP_DELAY} enterNextDelay={process.env.REACT_APP_TOOLTIP_DELAY}>
+                <Tooltip title={t('sharedUploadGeofence')}>
                   <UploadFileIcon />
                 </Tooltip>
               </IconButton>
diff --git a/modern/src/settings/components/CollectionActions.js b/modern/src/settings/components/CollectionActions.js
index 287be964..09218b89 100644
--- a/modern/src/settings/components/CollectionActions.js
+++ b/modern/src/settings/components/CollectionActions.js
@@ -2,12 +2,12 @@ import React, { useState } from 'react';
 import {
   IconButton, Menu, MenuItem, useMediaQuery, useTheme,
 } from '@mui/material';
-import Tooltip from '@mui/material/Tooltip';
 import MoreVertIcon from '@mui/icons-material/MoreVert';
 import EditIcon from '@mui/icons-material/Edit';
 import DeleteIcon from '@mui/icons-material/Delete';
 import { useNavigate } from 'react-router-dom';
 import { makeStyles } from '@mui/styles';
+import DelayedTooltip from '../../common/components/DelayedTooltip';
 import RemoveDialog from '../../common/components/RemoveDialog';
 import { useTranslation } from '../../common/components/LocalizationProvider';
 
@@ -74,24 +74,24 @@ const CollectionActions = ({
       ) : (
         <div className={classes.row}>
           {customActions && customActions.map((action) => (
-            <Tooltip title={action.title} enterDelay={process.env.REACT_APP_TOOLTIP_DELAY} enterNextDelay={process.env.REACT_APP_TOOLTIP_DELAY} key={action.key}>
+            <DelayedTooltip title={action.title} key={action.key}>
               <IconButton size="small" onClick={() => handleCustom(action)}>
                 {action.icon}
               </IconButton>
-            </Tooltip>
+            </DelayedTooltip>
           ))}
           {!readonly && (
             <>
-              <Tooltip title={t('sharedEdit')} enterDelay={process.env.REACT_APP_TOOLTIP_DELAY} enterNextDelay={process.env.REACT_APP_TOOLTIP_DELAY}>
+              <DelayedTooltip title={t('sharedEdit')}>
                 <IconButton size="small" onClick={handleEdit}>
                   <EditIcon fontSize="small" />
                 </IconButton>
-              </Tooltip>
-              <Tooltip title={t('sharedRemove')} enterDelay={process.env.REACT_APP_TOOLTIP_DELAY} enterNextDelay={process.env.REACT_APP_TOOLTIP_DELAY}>
+              </DelayedTooltip>
+              <DelayedTooltip title={t('sharedRemove')}>
                 <IconButton size="small" onClick={handleRemove}>
                   <DeleteIcon fontSize="small" />
                 </IconButton>
-              </Tooltip>
+              </DelayedTooltip>
             </>
           )}
         </div>
-- 
cgit v1.2.3


From 8a4365fcc9f19c94f3b17429965112e11cde6da3 Mon Sep 17 00:00:00 2001
From: Jamie Guthrie <jamie.guthrie@gmail.com>
Date: Thu, 17 Aug 2023 13:52:22 +0200
Subject: Syntax fix

---
 modern/src/common/components/DelayedTooltip.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'modern')

diff --git a/modern/src/common/components/DelayedTooltip.js b/modern/src/common/components/DelayedTooltip.js
index c8872adb..f1821782 100644
--- a/modern/src/common/components/DelayedTooltip.js
+++ b/modern/src/common/components/DelayedTooltip.js
@@ -3,14 +3,12 @@ import Tooltip from '@mui/material/Tooltip';
 
 const DelayedTooltip = ({
   ...props
-}) => {
-  (
-    <Tooltip
-      {...props}
-      enterDelay={700}
-      enterNextDelay={700}
-    />
-  );
-};
+}) => (
+  <Tooltip
+    {...props}
+    enterDelay={700}
+    enterNextDelay={700}
+  />
+);
 
 export default DelayedTooltip;
-- 
cgit v1.2.3


From 1abb9a5445e4fa4c90680a972fad31c24a3f8449 Mon Sep 17 00:00:00 2001
From: Jamie Guthrie <jamie.guthrie@gmail.com>
Date: Thu, 17 Aug 2023 16:48:49 +0200
Subject: Use theme instead of Custom class for delayed tooltips

---
 modern/src/common/components/DelayedTooltip.js      | 14 --------------
 modern/src/common/theme/components.js               |  6 ++++++
 modern/src/settings/components/CollectionActions.js | 14 +++++++-------
 3 files changed, 13 insertions(+), 21 deletions(-)
 delete mode 100644 modern/src/common/components/DelayedTooltip.js

(limited to 'modern')

diff --git a/modern/src/common/components/DelayedTooltip.js b/modern/src/common/components/DelayedTooltip.js
deleted file mode 100644
index f1821782..00000000
--- a/modern/src/common/components/DelayedTooltip.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-import Tooltip from '@mui/material/Tooltip';
-
-const DelayedTooltip = ({
-  ...props
-}) => (
-  <Tooltip
-    {...props}
-    enterDelay={700}
-    enterNextDelay={700}
-  />
-);
-
-export default DelayedTooltip;
diff --git a/modern/src/common/theme/components.js b/modern/src/common/theme/components.js
index d0c7f9c6..572f876e 100644
--- a/modern/src/common/theme/components.js
+++ b/modern/src/common/theme/components.js
@@ -33,4 +33,10 @@ export default {
       },
     },
   },
+  MuiTooltip: {
+    defaultProps: {
+      enterDelay: 500,
+      enterNextDelay: 500,
+    },
+  },
 };
diff --git a/modern/src/settings/components/CollectionActions.js b/modern/src/settings/components/CollectionActions.js
index 09218b89..666052d5 100644
--- a/modern/src/settings/components/CollectionActions.js
+++ b/modern/src/settings/components/CollectionActions.js
@@ -2,12 +2,12 @@ import React, { useState } from 'react';
 import {
   IconButton, Menu, MenuItem, useMediaQuery, useTheme,
 } from '@mui/material';
+import Tooltip from '@mui/material/Tooltip';
 import MoreVertIcon from '@mui/icons-material/MoreVert';
 import EditIcon from '@mui/icons-material/Edit';
 import DeleteIcon from '@mui/icons-material/Delete';
 import { useNavigate } from 'react-router-dom';
 import { makeStyles } from '@mui/styles';
-import DelayedTooltip from '../../common/components/DelayedTooltip';
 import RemoveDialog from '../../common/components/RemoveDialog';
 import { useTranslation } from '../../common/components/LocalizationProvider';
 
@@ -74,24 +74,24 @@ const CollectionActions = ({
       ) : (
         <div className={classes.row}>
           {customActions && customActions.map((action) => (
-            <DelayedTooltip title={action.title} key={action.key}>
+            <Tooltip title={action.title} key={action.key}>
               <IconButton size="small" onClick={() => handleCustom(action)}>
                 {action.icon}
               </IconButton>
-            </DelayedTooltip>
+            </Tooltip>
           ))}
           {!readonly && (
             <>
-              <DelayedTooltip title={t('sharedEdit')}>
+              <Tooltip title={t('sharedEdit')}>
                 <IconButton size="small" onClick={handleEdit}>
                   <EditIcon fontSize="small" />
                 </IconButton>
-              </DelayedTooltip>
-              <DelayedTooltip title={t('sharedRemove')}>
+              </Tooltip>
+              <Tooltip title={t('sharedRemove')}>
                 <IconButton size="small" onClick={handleRemove}>
                   <DeleteIcon fontSize="small" />
                 </IconButton>
-              </DelayedTooltip>
+              </Tooltip>
             </>
           )}
         </div>
-- 
cgit v1.2.3


From 4750a83fa38d217569975250c11fe830405f99ba Mon Sep 17 00:00:00 2001
From: Jamie Guthrie <jamie.guthrie@gmail.com>
Date: Thu, 17 Aug 2023 16:54:11 +0200
Subject: Add newline to .env, as was originally

---
 modern/.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modern')

diff --git a/modern/.env b/modern/.env
index 5f78fd1e..c8702185 100644
--- a/modern/.env
+++ b/modern/.env
@@ -1,3 +1,3 @@
 ESLINT_NO_DEV_ERRORS=false
 REACT_APP_URL_NAME='localhost:8082'
-REACT_APP_VERSION=$npm_package_version
\ No newline at end of file
+REACT_APP_VERSION=$npm_package_version
-- 
cgit v1.2.3


From 49da8a2addd3febb2463a69a99c6007c7a11051a Mon Sep 17 00:00:00 2001
From: Jamie Guthrie <jamie.guthrie@gmail.com>
Date: Thu, 17 Aug 2023 17:04:38 +0200
Subject: Change 'Upload Geofence' to 'Upload'

---
 modern/src/other/GeofencesPage.js | 2 +-
 modern/src/resources/l10n/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'modern')

diff --git a/modern/src/other/GeofencesPage.js b/modern/src/other/GeofencesPage.js
index fcc7153d..4f31c1b3 100644
--- a/modern/src/other/GeofencesPage.js
+++ b/modern/src/other/GeofencesPage.js
@@ -118,7 +118,7 @@ const GeofencesPage = () => {
             <label htmlFor="upload-gpx">
               <input accept=".gpx" id="upload-gpx" type="file" className={classes.fileInput} onChange={handleFile} />
               <IconButton edge="end" component="span" onClick={() => {}}>
-                <Tooltip title={t('sharedUploadGeofence')}>
+                <Tooltip title={t('sharedUpload')}>
                   <UploadFileIcon />
                 </Tooltip>
               </IconButton>
diff --git a/modern/src/resources/l10n/en.json b/modern/src/resources/l10n/en.json
index 4e0b72b1..dcfea816 100644
--- a/modern/src/resources/l10n/en.json
+++ b/modern/src/resources/l10n/en.json
@@ -2,6 +2,7 @@
     "sharedLoading": "Loading...",
     "sharedHide": "Hide",
     "sharedSave": "Save",
+    "sharedUpload": "Upload",
     "sharedSet": "Set",
     "sharedCancel": "Cancel",
     "sharedAdd": "Add",
@@ -35,7 +36,6 @@
     "sharedGeofence": "Geofence",
     "sharedGeofences": "Geofences",
     "sharedCreateGeofence": "Create Geofence",
-    "sharedUploadGeofence": "Upload Geofence",
     "sharedNotifications": "Notifications",
     "sharedNotification": "Notification",
     "sharedAttributes": "Attributes",
-- 
cgit v1.2.3


From 2e5c04d2f6b98e09767727e1a41a38898ca9acf0 Mon Sep 17 00:00:00 2001
From: Jamie Guthrie <jamie.guthrie@gmail.com>
Date: Thu, 17 Aug 2023 21:33:34 +0200
Subject: Remove localization fallback

---
 modern/src/common/components/LocalizationProvider.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modern')

diff --git a/modern/src/common/components/LocalizationProvider.js b/modern/src/common/components/LocalizationProvider.js
index 9c51841c..6bc64831 100644
--- a/modern/src/common/components/LocalizationProvider.js
+++ b/modern/src/common/components/LocalizationProvider.js
@@ -178,7 +178,7 @@ export const useLocalization = () => useContext(LocalizationContext);
 export const useTranslation = () => {
   const context = useContext(LocalizationContext);
   const { data } = context.languages[context.language];
-  return useMemo(() => (key) => (data[key] ? data[key] : context.languages.en.data[key]), [data]);
+  return useMemo(() => (key) => data[key], [data]);
 };
 
 export const useTranslationKeys = (predicate) => {
-- 
cgit v1.2.3