astra/ntfy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' into twilio

Browse source
This commit is contained in:
binwiederhier 2023-05-15 20:02:51 -04:00
commit 69b01bc468
23 changed files with 2593 additions and 267 deletions
Download patch file Download diff file Expand all files Collapse all files

2
web/src/components/Account.js
View file

@ -585,7 +585,7 @@ const Stats = () => {
description={t("account_usage_attachment_storage_description", {
filesize: formatBytes(account.limits.attachment_file_size),
expiry: humanizeDuration(account.limits.attachment_expiry_duration * 1000, {
language: i18n.language,
language: i18n.resolvedLanguage,
fallbacks: ["en"]
})
})}

6
web/src/components/Preferences.js
View file

@ -436,7 +436,7 @@ const Appearance = () => {
const Language = () => {
const { t, i18n } = useTranslation();
const labelId = "prefLanguage";
const lang = i18n.language ?? "en";
const lang = i18n.resolvedLanguage ?? "en";
// Country flags are displayed using emoji. Emoji rendering is handled by platform fonts.
// Windows in particular does not yet play nicely with flag emoji so for now, hide flags on Windows.
@ -541,8 +541,8 @@ const ReservationsTable = (props) => {
const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
const { subscriptions } = useOutletContext();
const localSubscriptions = (subscriptions?.length > 0)
? Object.assign(...subscriptions.filter(s => s.baseUrl === config.base_url).map(s => ({[s.topic]: s})))
: [];
? Object.assign({}, ...subscriptions.filter(s => s.baseUrl === config.base_url).map(s => ({[s.topic]: s})))
: {};
const handleEditClick = (reservation) => {
setDialogKey(prev => prev+1);

2
web/src/components/ReserveDialogs.js
View file

@ -34,7 +34,7 @@ export const ReserveAddDialog = (props) => {
const handleSubmit = async () => {
try {
await accountApi.upsertReservation(topic, everyone);
console.debug(`[ReserveAddDialog] Added reservation for topic ${t}: ${everyone}`);
console.debug(`[ReserveAddDialog] Added reservation for topic ${topic}: ${everyone}`);
} catch (e) {
console.log(`[ReserveAddDialog] Error adding topic reservation.`, e);
if (e instanceof UnauthorizedError) {