gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix crash in /about when server returns cached rules without translations attribute (#34997)

Browse source
This commit is contained in:
Claire 2025-06-10 15:25:24 +02:00 • committed by GitHub
parent 1824b1fd29
commit c727701839
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/javascript/mastodon/features/about/components/rules.tsx
View file

@ -29,7 +29,7 @@ interface BaseRule {
interface Rule extends BaseRule { interface Rule extends BaseRule {
id: string; id: string;
translations: Record<string, BaseRule>; translations?: Record<string, BaseRule>;
} }
export const RulesSection: FC<RulesSectionProps> = ({ isLoading = false }) => { export const RulesSection: FC<RulesSectionProps> = ({ isLoading = false }) => {
@ -113,15 +113,23 @@ const rulesSelector = createSelector(
(rules, locale): Rule[] => { (rules, locale): Rule[] => {
return rules.map((rule) => { return rules.map((rule) => {
const translations = rule.translations; const translations = rule.translations;
if (translations[locale]) {
rule.text = translations[locale].text; // Handle cached responses from earlier versions
rule.hint = translations[locale].hint; if (!translations) {
return rule;
} }
const partialLocale = locale.split('-')[0]; const partialLocale = locale.split('-')[0];
if (partialLocale && translations[partialLocale]) { if (partialLocale && translations[partialLocale]) {
rule.text = translations[partialLocale].text; rule.text = translations[partialLocale].text;
rule.hint = translations[partialLocale].hint; rule.hint = translations[partialLocale].hint;
} }
if (translations[locale]) {
rule.text = translations[locale].text;
rule.hint = translations[locale].hint;
}
return rule; return rule;
}); });
}, },