diff --git a/app/soapbox/__fixtures__/intlMessages.json b/app/soapbox/__fixtures__/intlMessages.json index a16bb1692..82a489909 100644 --- a/app/soapbox/__fixtures__/intlMessages.json +++ b/app/soapbox/__fixtures__/intlMessages.json @@ -52,11 +52,11 @@ "audio.play": "Play", "audio.unmute": "Unmute", "boost_modal.combo": "You can press {combo} to skip this next time", - "bundle_column_error.body": "Something went wrong while loading this component.", + "bundle_column_error.body": "Something went wrong while loading this page.", "bundle_column_error.retry": "Try again", "bundle_column_error.title": "Network error", "bundle_modal_error.close": "Close", - "bundle_modal_error.message": "Something went wrong while loading this component.", + "bundle_modal_error.message": "Something went wrong while loading this page.", "bundle_modal_error.retry": "Try again", "column.blocks": "Blocked users", "column.community": "Local timeline", @@ -530,11 +530,11 @@ "audio.play": "Play", "audio.unmute": "Unmute", "boost_modal.combo": "You can press {combo} to skip this next time", - "bundle_column_error.body": "Something went wrong while loading this component.", + "bundle_column_error.body": "Something went wrong while loading this page.", "bundle_column_error.retry": "Try again", "bundle_column_error.title": "Network error", "bundle_modal_error.close": "Close", - "bundle_modal_error.message": "Something went wrong while loading this component.", + "bundle_modal_error.message": "Something went wrong while loading this page.", "bundle_modal_error.retry": "Try again", "column.blocks": "Blocked users", "column.community": "Local timeline", diff --git a/app/soapbox/features/ui/components/bundle_column_error.tsx b/app/soapbox/features/ui/components/bundle_column_error.tsx index d7f458410..c79013b73 100644 --- a/app/soapbox/features/ui/components/bundle_column_error.tsx +++ b/app/soapbox/features/ui/components/bundle_column_error.tsx @@ -1,14 +1,11 @@ import React from 'react'; import { defineMessages, useIntl } from 'react-intl'; -import IconButton from '../../../components/icon_button'; - -import Column from './column'; -import ColumnHeader from './column_header'; +import { Column, Stack, Text, IconButton } from 'soapbox/components/ui'; const messages = defineMessages({ title: { id: 'bundle_column_error.title', defaultMessage: 'Network error' }, - body: { id: 'bundle_column_error.body', defaultMessage: 'Something went wrong while loading this component.' }, + body: { id: 'bundle_column_error.body', defaultMessage: 'Something went wrong while loading this page.' }, retry: { id: 'bundle_column_error.retry', defaultMessage: 'Try again' }, }); @@ -24,12 +21,17 @@ const BundleColumnError: React.FC = ({ onRetry }) => { }; return ( - - -
- - {intl.formatMessage(messages.body)} -
+ + + + + {intl.formatMessage(messages.body)} + ); }; diff --git a/app/soapbox/features/ui/components/bundle_modal_error.js b/app/soapbox/features/ui/components/bundle_modal_error.js index 9f4749893..70d8265e3 100644 --- a/app/soapbox/features/ui/components/bundle_modal_error.js +++ b/app/soapbox/features/ui/components/bundle_modal_error.js @@ -5,7 +5,7 @@ import { defineMessages, injectIntl } from 'react-intl'; import IconButton from '../../../components/icon_button'; const messages = defineMessages({ - error: { id: 'bundle_modal_error.message', defaultMessage: 'Something went wrong while loading this component.' }, + error: { id: 'bundle_modal_error.message', defaultMessage: 'Something went wrong while loading this page.' }, retry: { id: 'bundle_modal_error.retry', defaultMessage: 'Try again' }, close: { id: 'bundle_modal_error.close', defaultMessage: 'Close' }, }); diff --git a/app/soapbox/locales/ast.json b/app/soapbox/locales/ast.json index f1839fc47..a77435076 100644 --- a/app/soapbox/locales/ast.json +++ b/app/soapbox/locales/ast.json @@ -142,11 +142,11 @@ "backups.empty_message.action": "Create one now?", "backups.pending": "Pending", "boost_modal.combo": "Pues primir {combo} pa saltar esto la próxima vegada", - "bundle_column_error.body": "Something went wrong while loading this component.", + "bundle_column_error.body": "Something went wrong while loading this page.", "bundle_column_error.retry": "Try again", "bundle_column_error.title": "Network error", "bundle_modal_error.close": "Close", - "bundle_modal_error.message": "Something went wrong while loading this component.", + "bundle_modal_error.message": "Something went wrong while loading this page.", "bundle_modal_error.retry": "Try again", "chat_box.actions.close": "Close chat", "chat_box.actions.send": "Send", diff --git a/app/soapbox/locales/bg.json b/app/soapbox/locales/bg.json index 8e9a4eab8..54af1e40b 100644 --- a/app/soapbox/locales/bg.json +++ b/app/soapbox/locales/bg.json @@ -142,11 +142,11 @@ "backups.empty_message.action": "Create one now?", "backups.pending": "Pending", "boost_modal.combo": "You can press {combo} to skip this next time", - "bundle_column_error.body": "Something went wrong while loading this component.", + "bundle_column_error.body": "Something went wrong while loading this page.", "bundle_column_error.retry": "Опитай отново", "bundle_column_error.title": "Network error", "bundle_modal_error.close": "Close", - "bundle_modal_error.message": "Something went wrong while loading this component.", + "bundle_modal_error.message": "Something went wrong while loading this page.", "bundle_modal_error.retry": "Try again", "chat_box.actions.close": "Close chat", "chat_box.actions.send": "Send", diff --git a/app/soapbox/locales/br.json b/app/soapbox/locales/br.json index 803a94160..079210878 100644 --- a/app/soapbox/locales/br.json +++ b/app/soapbox/locales/br.json @@ -142,11 +142,11 @@ "backups.empty_message.action": "Create one now?", "backups.pending": "Pending", "boost_modal.combo": "You can press {combo} to skip this next time", - "bundle_column_error.body": "Something went wrong while loading this component.", + "bundle_column_error.body": "Something went wrong while loading this page.", "bundle_column_error.retry": "Klask endro", "bundle_column_error.title": "Fazi rouedad", "bundle_modal_error.close": "Serriñ", - "bundle_modal_error.message": "Something went wrong while loading this component.", + "bundle_modal_error.message": "Something went wrong while loading this page.", "bundle_modal_error.retry": "Klask endro", "chat_box.actions.close": "Close chat", "chat_box.actions.send": "Send", diff --git a/app/soapbox/locales/defaultMessages.json b/app/soapbox/locales/defaultMessages.json index e9aeea8d6..1568a010e 100644 --- a/app/soapbox/locales/defaultMessages.json +++ b/app/soapbox/locales/defaultMessages.json @@ -5245,7 +5245,7 @@ "id": "bundle_column_error.title" }, { - "defaultMessage": "Something went wrong while loading this component.", + "defaultMessage": "Something went wrong while loading this page.", "id": "bundle_column_error.body" }, { @@ -5258,7 +5258,7 @@ { "descriptors": [ { - "defaultMessage": "Something went wrong while loading this component.", + "defaultMessage": "Something went wrong while loading this page.", "id": "bundle_modal_error.message" }, { diff --git a/app/soapbox/locales/en.json b/app/soapbox/locales/en.json index 4050a869d..cb8fc8414 100644 --- a/app/soapbox/locales/en.json +++ b/app/soapbox/locales/en.json @@ -142,11 +142,11 @@ "backups.empty_message.action": "Create one now?", "backups.pending": "Pending", "boost_modal.combo": "You can press {combo} to skip this next time", - "bundle_column_error.body": "Something went wrong while loading this component.", + "bundle_column_error.body": "Something went wrong while loading this page.", "bundle_column_error.retry": "Try again", "bundle_column_error.title": "Network error", "bundle_modal_error.close": "Close", - "bundle_modal_error.message": "Something went wrong while loading this component.", + "bundle_modal_error.message": "Something went wrong while loading this page.", "bundle_modal_error.retry": "Try again", "chat_box.actions.close": "Close chat", "chat_box.actions.send": "Send", diff --git a/app/soapbox/locales/ga.json b/app/soapbox/locales/ga.json index 924e4dfc2..d42425fcb 100644 --- a/app/soapbox/locales/ga.json +++ b/app/soapbox/locales/ga.json @@ -142,11 +142,11 @@ "backups.empty_message.action": "Create one now?", "backups.pending": "Pending", "boost_modal.combo": "You can press {combo} to skip this next time", - "bundle_column_error.body": "Something went wrong while loading this component.", + "bundle_column_error.body": "Something went wrong while loading this page.", "bundle_column_error.retry": "Try again", "bundle_column_error.title": "Network error", "bundle_modal_error.close": "Close", - "bundle_modal_error.message": "Something went wrong while loading this component.", + "bundle_modal_error.message": "Something went wrong while loading this page.", "bundle_modal_error.retry": "Try again", "chat_box.actions.close": "Close chat", "chat_box.actions.send": "Send", diff --git a/app/soapbox/locales/hi.json b/app/soapbox/locales/hi.json index c4029b501..a5e3fc4cf 100644 --- a/app/soapbox/locales/hi.json +++ b/app/soapbox/locales/hi.json @@ -142,11 +142,11 @@ "backups.empty_message.action": "Create one now?", "backups.pending": "Pending", "boost_modal.combo": "You can press {combo} to skip this next time", - "bundle_column_error.body": "Something went wrong while loading this component.", + "bundle_column_error.body": "Something went wrong while loading this page.", "bundle_column_error.retry": "Try again", "bundle_column_error.title": "Network error", "bundle_modal_error.close": "Close", - "bundle_modal_error.message": "Something went wrong while loading this component.", + "bundle_modal_error.message": "Something went wrong while loading this page.", "bundle_modal_error.retry": "Try again", "chat_box.actions.close": "Close chat", "chat_box.actions.send": "Send", diff --git a/app/soapbox/locales/hr.json b/app/soapbox/locales/hr.json index a852d25fc..1682ca26c 100644 --- a/app/soapbox/locales/hr.json +++ b/app/soapbox/locales/hr.json @@ -142,11 +142,11 @@ "backups.empty_message.action": "Create one now?", "backups.pending": "Pending", "boost_modal.combo": "Možeš pritisnuti {combo} kako bi ovo preskočio sljedeći put", - "bundle_column_error.body": "Something went wrong while loading this component.", + "bundle_column_error.body": "Something went wrong while loading this page.", "bundle_column_error.retry": "Try again", "bundle_column_error.title": "Network error", "bundle_modal_error.close": "Close", - "bundle_modal_error.message": "Something went wrong while loading this component.", + "bundle_modal_error.message": "Something went wrong while loading this page.", "bundle_modal_error.retry": "Try again", "chat_box.actions.close": "Close chat", "chat_box.actions.send": "Send", diff --git a/app/soapbox/locales/io.json b/app/soapbox/locales/io.json index 3cbbb920d..8b4389e97 100644 --- a/app/soapbox/locales/io.json +++ b/app/soapbox/locales/io.json @@ -142,11 +142,11 @@ "backups.empty_message.action": "Create one now?", "backups.pending": "Pending", "boost_modal.combo": "Tu povas presar sur {combo} por omisar co en la venonta foyo", - "bundle_column_error.body": "Something went wrong while loading this component.", + "bundle_column_error.body": "Something went wrong while loading this page.", "bundle_column_error.retry": "Try again", "bundle_column_error.title": "Network error", "bundle_modal_error.close": "Close", - "bundle_modal_error.message": "Something went wrong while loading this component.", + "bundle_modal_error.message": "Something went wrong while loading this page.", "bundle_modal_error.retry": "Try again", "chat_box.actions.close": "Close chat", "chat_box.actions.send": "Send", diff --git a/app/soapbox/locales/lt.json b/app/soapbox/locales/lt.json index 0afc4539b..6efa1033c 100644 --- a/app/soapbox/locales/lt.json +++ b/app/soapbox/locales/lt.json @@ -142,11 +142,11 @@ "backups.empty_message.action": "Create one now?", "backups.pending": "Pending", "boost_modal.combo": "You can press {combo} to skip this next time", - "bundle_column_error.body": "Something went wrong while loading this component.", + "bundle_column_error.body": "Something went wrong while loading this page.", "bundle_column_error.retry": "Try again", "bundle_column_error.title": "Network error", "bundle_modal_error.close": "Close", - "bundle_modal_error.message": "Something went wrong while loading this component.", + "bundle_modal_error.message": "Something went wrong while loading this page.", "bundle_modal_error.retry": "Try again", "chat_box.actions.close": "Close chat", "chat_box.actions.send": "Send", diff --git a/app/soapbox/locales/ms.json b/app/soapbox/locales/ms.json index 6031dd7f7..5f4a9d63a 100644 --- a/app/soapbox/locales/ms.json +++ b/app/soapbox/locales/ms.json @@ -142,11 +142,11 @@ "backups.empty_message.action": "Create one now?", "backups.pending": "Pending", "boost_modal.combo": "You can press {combo} to skip this next time", - "bundle_column_error.body": "Something went wrong while loading this component.", + "bundle_column_error.body": "Something went wrong while loading this page.", "bundle_column_error.retry": "Try again", "bundle_column_error.title": "Network error", "bundle_modal_error.close": "Close", - "bundle_modal_error.message": "Something went wrong while loading this component.", + "bundle_modal_error.message": "Something went wrong while loading this page.", "bundle_modal_error.retry": "Try again", "chat_box.actions.close": "Close chat", "chat_box.actions.send": "Send",