Skip to content

Commit a027cef

Browse files
committed
fix(core): some fonts are unavailable (#8139)
close AF-1349 AF-1347
1 parent 7d93fae commit a027cef

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

packages/frontend/core/src/components/affine/setting-modal/general-setting/editor/general.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ const FontMenuItem = ({
234234
onSelect: (font: string) => void;
235235
}) => {
236236
const handleFontSelect = useCallback(
237-
() => onSelect(font.fullName),
237+
() => onSelect(font.family),
238238
[font, onSelect]
239239
);
240240
const fontFamily = getFontFamily(font.family);
@@ -268,6 +268,7 @@ const CustomFontFamilySettings = () => {
268268
const settings = useLiveData(editorSettingService.editorSetting.settings$);
269269

270270
const fontFamily = getFontFamily(settings.customFontFamily);
271+
271272
const onCustomFontFamilyChange = useCallback(
272273
(fontFamily: string) => {
273274
editorSettingService.editorSetting.set('customFontFamily', fontFamily);

packages/frontend/i18n/src/resources/en.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -414,19 +414,19 @@
414414
"com.affine.appUpdater.updateAvailable": "Update available",
415415
"com.affine.appUpdater.whatsNew": "Discover what's new!",
416416
"com.affine.appearanceSettings.clientBorder.description": "Customise the appearance of the client.",
417-
"com.affine.appearanceSettings.clientBorder.title": "Client Border Style",
417+
"com.affine.appearanceSettings.clientBorder.title": "Client border style",
418418
"com.affine.appearanceSettings.color.description": "Choose your colour mode",
419-
"com.affine.appearanceSettings.color.title": "Colour Mode",
419+
"com.affine.appearanceSettings.color.title": "Colour mode",
420420
"com.affine.appearanceSettings.date.title": "Date",
421421
"com.affine.appearanceSettings.dateFormat.description": "Customise your date style.",
422-
"com.affine.appearanceSettings.dateFormat.title": "Date Format",
422+
"com.affine.appearanceSettings.dateFormat.title": "Date format",
423423
"com.affine.appearanceSettings.font.description": "Choose your font style",
424-
"com.affine.appearanceSettings.font.title": "Font Style",
424+
"com.affine.appearanceSettings.font.title": "Font style",
425425
"com.affine.appearanceSettings.fontStyle.mono": "Mono",
426426
"com.affine.appearanceSettings.fontStyle.sans": "Sans",
427427
"com.affine.appearanceSettings.fontStyle.serif": "Serif",
428428
"com.affine.appearanceSettings.fullWidth.description": "Maximum display of content within a doc.",
429-
"com.affine.appearanceSettings.fullWidth.title": "Full width Layout",
429+
"com.affine.appearanceSettings.fullWidth.title": "Full width layout",
430430
"com.affine.appearanceSettings.language.description": "Select the language for the interface.",
431431
"com.affine.appearanceSettings.language.title": "Display language",
432432
"com.affine.appearanceSettings.noisyBackground.description": "Use background noise effect on the sidebar.",
@@ -1253,7 +1253,7 @@
12531253
"com.affine.settings.editorSettings.edgeless.connecter.border-style": "Border style",
12541254
"com.affine.settings.editorSettings.edgeless.connecter.border-thickness": "Border thickness",
12551255
"com.affine.settings.editorSettings.edgeless.connecter.color": "Color",
1256-
"com.affine.settings.editorSettings.edgeless.connecter.connector-shape": "Connector Shape",
1256+
"com.affine.settings.editorSettings.edgeless.connecter.connector-shape": "Connector shape",
12571257
"com.affine.settings.editorSettings.edgeless.connecter.connector-shape.curve": "Curve",
12581258
"com.affine.settings.editorSettings.edgeless.connecter.connector-shape.elbowed": "Elbowed",
12591259
"com.affine.settings.editorSettings.edgeless.connecter.connector-shape.straight": "Straight",
@@ -1304,9 +1304,9 @@
13041304
"com.affine.settings.editorSettings.edgeless.text.alignment.right": "Right",
13051305
"com.affine.settings.editorSettings.edgeless.text.color": "Text color",
13061306
"com.affine.settings.editorSettings.edgeless.text.font": "Font",
1307-
"com.affine.settings.editorSettings.edgeless.text.font-family": "Font Family",
1307+
"com.affine.settings.editorSettings.edgeless.text.font-family": "Font family",
13081308
"com.affine.settings.editorSettings.edgeless.text.font-size": "Font size",
1309-
"com.affine.settings.editorSettings.edgeless.text.font-style": "Font Style",
1309+
"com.affine.settings.editorSettings.edgeless.text.font-style": "Font style",
13101310
"com.affine.settings.editorSettings.edgeless.text.font-weight": "Font weight",
13111311
"com.affine.settings.editorSettings.general": "General",
13121312
"com.affine.settings.editorSettings.general.ai.description": "Enable the powerful AI assistant, AFFiNE AI.",

packages/frontend/i18n/src/resources/zh-Hans.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1288,7 +1288,7 @@
12881288
"com.affine.settings.editorSettings.edgeless.shape.font": "字体",
12891289
"com.affine.settings.editorSettings.edgeless.shape.font-size": "字体大小",
12901290
"com.affine.settings.editorSettings.edgeless.shape.font-style": "字体样式",
1291-
"com.affine.settings.editorSettings.edgeless.shape.rounded-rectangle": "长方形",
1291+
"com.affine.settings.editorSettings.edgeless.shape.rounded-rectangle": "圆角矩形",
12921292
"com.affine.settings.editorSettings.edgeless.shape.square": "正方形",
12931293
"com.affine.settings.editorSettings.edgeless.shape.text-alignment": "文本对齐",
12941294
"com.affine.settings.editorSettings.edgeless.shape.text-color": "文本颜色",

0 commit comments

Comments
 (0)