hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into 2-10-1-fixes

Browse source
This commit is contained in:
Henry Jameson 2026-01-08 19:12:32 +02:00
commit dcb7ed1b8c
428 changed files with 55612 additions and 18549 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/i18n/en.json
View file

@ -688,7 +688,6 @@
"name_bio": "Name & bio",
"new_email": "New email",
"new_password": "New password",
"posts": "Posts",
"user_profiles": "User Profiles",
"notification_visibility": "Types of notifications to show",
"notification_visibility_in_column": "Show in notifications column/drawer",
@ -777,7 +776,6 @@
"column_sizes_sidebar": "Sidebar",
"column_sizes_content": "Content",
"column_sizes_notifs": "Notifications",
"layout": "Layout",
"scale_and_font": "Scale and Font",
"theme_editor_min_width": "Minimum width of theme editor (0 for \"fit-content\")",
"tree_advanced": "Allow more flexible navigation in tree view",
@ -946,7 +944,7 @@
},
"font": {
"group-builtin": "Browser default fonts",
"builtin" : {
"builtin": {
"serif": "Serif",
"sans-serif": "Sans-serif",
"monospace": "Monospace",
@ -1188,9 +1186,6 @@
"restrictions": "Restrictions",
"activitypub": "ActivityPub"
},
"http": {
"outbound": "Outbound HTTP requests"
},
"auth": {
"MFA": "Multi-factor Authentication",
"LDAP": "LDAP Settings",
@ -1245,24 +1240,6 @@
"web_push": "Web Push",
"web_push_description": "Web Push VAPID settings. You can use the mix task web_push.gen.keypair to generate it."
},
"instance": {
"instance": "Instance information",
"branding": "Branding",
"registrations": "User sign-ups",
"captcha_header": "CAPTCHA",
"kocaptcha": "KoCaptcha settings",
"access": "Instance access",
"rich_metadata": "Metadata",
"restrict": {
"header": "Restrict access for anonymous visitors",
"description": "Detailed setting for allowing/disallowing access to certain aspects of API. By default (indeterminate state) it will disallow if instance is not public, ticked checkbox means disallow access even if instance is public, unticked means allow access even if instance is private. Please note that unexpected behavior might happen if some settings are set, i.e. if profile access is disabled posts will show without profile information.",
"timelines": "Timelines access",
"profiles": "User profiles access",
"activities": "Statuses/activities access"
},
":unauthenticated": "Unauthenticated",
":all": "Everyone"
},
"registrations": {
"welcome": {
"title": "Welcome message",
@ -1394,6 +1371,9 @@
},
"instance": {
"instance": "Instance information",
"registrations": "User sign-ups",
"captcha_header": "CAPTCHA",
"kocaptcha": "KoCaptcha settings",
"pwa": {
"manifest": "PWA Manifest",
"optional": "(optional)",
@ -1530,7 +1510,7 @@
"weeks_suffix": "week(s)",
"years": "{0} year | {0} years",
"years_short": "{0}y",
"years": "year(s)"
"years_suffix": "year(s)"
},
"in_future": "in {0}",
"in_past": "{0} ago",
@ -1780,7 +1760,6 @@
"repeat": "Repeat",
"unrepeat": "Unrepeat",
"reply": "Reply",
"add_reaction": "Add reaction",
"favorite": "Favorite",
"unfavorite": "Unfavorite",
"add_reaction": "Add Reaction",

8
src/i18n/languages.js
View file

@ -30,18 +30,18 @@ const languages = [
'te',
'uk',
'zh',
'zh_Hant'
'zh_Hant',
]
const specialJsonName = {
ja: 'ja_pedantic'
ja: 'ja_pedantic',
}
const langCodeToJsonName = (code) => specialJsonName[code] || code
const langCodeToCldrName = (code) => code
const ensureFinalFallback = codes => {
const ensureFinalFallback = (codes) => {
const codeList = Array.isArray(codes) ? codes : [codes]
return codeList.includes('en') ? codeList : codeList.concat(['en'])
}
@ -50,5 +50,5 @@ export {
languages,
langCodeToJsonName,
langCodeToCldrName,
ensureFinalFallback
ensureFinalFallback,
}

11
src/i18n/messages.js
View file

@ -8,8 +8,9 @@
// There's only problem that apostrophe character ' gets replaced by \\ so you have to fix it manually, sorry.
import { isEqual } from 'lodash'
import { languages, langCodeToJsonName } from './languages.js'
import enMessages from './en.json'
import { langCodeToJsonName, languages } from './languages.js'
const ULTIMATE_FALLBACK_LOCALE = 'en'
@ -25,10 +26,12 @@ const loadLanguageFile = (code) => {
const messages = {
languages,
default: {
en: enMessages
en: enMessages,
},
setLanguage: async (i18n, language) => {
const languages = (Array.isArray(language) ? language : [language]).filter(k => k)
const languages = (Array.isArray(language) ? language : [language]).filter(
(k) => k,
)
if (!languages.includes(ULTIMATE_FALLBACK_LOCALE)) {
languages.push(ULTIMATE_FALLBACK_LOCALE)
@ -48,7 +51,7 @@ const messages = {
i18n.fallbackLocale = rest
i18n.locale = first
}
},
}
export default messages

22
src/i18n/oc.json
View file

@ -3,17 +3,17 @@
"title": "Messatjariá"
},
"exporter": {
"export": "Exportar",
"processing": "Tractament, vos demandarem lèu de telecargar lo fichièr"
"export": "Exportar",
"processing": "Tractament, vos demandarem lèu de telecargar lo fichièr"
},
"features_panel": {
"chat": "Chat",
"gopher": "Gopher",
"media_proxy": "Servidor mandatari mèdia",
"scope_options": "Nivèls de confidencialitat",
"text_limit": "Limita de tèxte",
"title": "Foncionalitats",
"who_to_follow": "Qual seguir"
"features_panel": {
"chat": "Chat",
"gopher": "Gopher",
"media_proxy": "Servidor mandatari mèdia",
"scope_options": "Nivèls de confidencialitat",
"text_limit": "Limita de tèxte",
"title": "Foncionalitats",
"who_to_follow": "Qual seguir"
},
"finder": {
"error_fetching_user": "Error pendent la cèrca d’un utilizaire",
@ -520,7 +520,7 @@
"favorite": "aimar",
"user_settings": "Paramètres utilizaire"
},
"upload":{
"upload": {
"error": {
"base": "Mandadís fracassat.",
"file_too_big": "Fichièr tròp grand [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",

2
src/i18n/service_worker_messages.js
View file

@ -30,7 +30,7 @@ const messages = {
sk: require('../lib/notification-i18n-loader.js!./sk.json'),
te: require('../lib/notification-i18n-loader.js!./te.json'),
zh: require('../lib/notification-i18n-loader.js!./zh.json'),
en: require('../lib/notification-i18n-loader.js!./en.json')
en: require('../lib/notification-i18n-loader.js!./en.json'),
}
export default messages