diff --git a/assets/fonts/Onest-LICENSE.txt b/assets/fonts/Onest-LICENSE.txt new file mode 100644 index 00000000..c7eb0538 --- /dev/null +++ b/assets/fonts/Onest-LICENSE.txt @@ -0,0 +1,93 @@ +Copyright 2021 The Onest Project Authors (https://github.com/googlefonts/onest) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/assets/fonts/Onest-VF.ttf b/assets/fonts/Onest-VF.ttf new file mode 100644 index 00000000..6c77d201 Binary files /dev/null and b/assets/fonts/Onest-VF.ttf differ diff --git a/assets/fonts/ShangguSans-LICENSE.txt b/assets/fonts/ShangguSans-LICENSE.txt new file mode 100644 index 00000000..075d1aef --- /dev/null +++ b/assets/fonts/ShangguSans-LICENSE.txt @@ -0,0 +1,91 @@ +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/assets/fonts/ShangguSansHWSC-VF.ttf b/assets/fonts/ShangguSansHWSC-VF.ttf new file mode 100644 index 00000000..bcc56a50 Binary files /dev/null and b/assets/fonts/ShangguSansHWSC-VF.ttf differ diff --git a/assets/fonts/ZhudouSansVF.ttf b/assets/fonts/ZhudouSansVF.ttf new file mode 100644 index 00000000..fffa3b1f Binary files /dev/null and b/assets/fonts/ZhudouSansVF.ttf differ diff --git a/src/_locales/cmn-CN.yml b/src/_locales/cmn-CN.yml index edd1bacc..1e293569 100644 --- a/src/_locales/cmn-CN.yml +++ b/src/_locales/cmn-CN.yml @@ -112,6 +112,10 @@ settings: mandarin_tw: 官話 - 繁体中文 jyut: 廣東話 customize_font: 自定义字体 + customize_font_opt: + default: Bilibili 默认 + recommend: 推荐 + custom: 自定义 customize_font_desc: |- 对于喜欢旧字形的用户，我们推荐 Shanggu Fonts (尚古字型) 和 Fan Wun Hak (繁媛黑體)。 这些字形还具有将简体中文转换为繁体/正体中文的能力。 diff --git a/src/_locales/cmn-TW.yml b/src/_locales/cmn-TW.yml index 7f495e4c..e1e53d6a 100644 --- a/src/_locales/cmn-TW.yml +++ b/src/_locales/cmn-TW.yml @@ -112,6 +112,10 @@ settings: mandarin_tw: 官話 - 繁体中文 jyut: 廣東話 customize_font: 自訂字型 + customize_font_opt: + default: Bilibili 預設 + recommend: 推介 + custom: 自訂 customize_font_desc: |- 對於喜歡舊字形的用戶，我們推薦 Shanggu Fonts (尚古字型) 和 Fan Wun Hak (繁媛黑體)。 這些字型還具有將簡體中文轉換爲繁體/繁体中文的能力。 diff --git a/src/_locales/en.yml b/src/_locales/en.yml index 649281d5..89a5ea77 100644 --- a/src/_locales/en.yml +++ b/src/_locales/en.yml @@ -114,6 +114,10 @@ settings: mandarin_tw: Mandarin - Traditional Chinese jyut: Cantonese customize_font: Customize font + customize_font_opt: + default: Bilibili Default + recommend: Recommend + custom: Custom customize_font_desc: |- For users who favor the old form of Chinese characters, we recommend Shanggu Fonts (尚古字型) and Fan Wun Hak (繁媛黑體). These fonts also possess the capability to convert simplified Chinese into traditional characters. diff --git a/src/_locales/jyut.yml b/src/_locales/jyut.yml index 623ecb07..9cd67ce8 100644 --- a/src/_locales/jyut.yml +++ b/src/_locales/jyut.yml @@ -112,6 +112,10 @@ settings: mandarin_tw: 官話 - 繁体中文 jyut: 廣東話 customize_font: 自訂字型 + customize_font_opt: + default: Bilibili 預設 + recommend: 推介 + custom: 自訂 customize_font_desc: |- 對於舊字形嘅用戶，我哋推介 Shanggu Fonts (尚古字型) 同 Fan Wun Hak (繁媛黑體)。 呢啲字型仲可以將簡體中文轉做繁體/繁体中文。 diff --git a/src/components/Settings/General/General.vue b/src/components/Settings/General/General.vue index 7cc00609..b73c8378 100644 --- a/src/components/Settings/General/General.vue +++ b/src/components/Settings/General/General.vue @@ -63,6 +63,23 @@ const videoCardOpenModeOptions = computed(() => { ] }) +const fontPreferenceOptions = computed(() => { + return [ + { + label: t('settings.customize_font_opt.default'), + value: 'default', + }, + { + label: t('settings.customize_font_opt.recommend'), + value: 'recommend', + }, + { + label: t('settings.customize_font_opt.custom'), + value: 'custom', + }, + ] +}) + watch(() => settings.value.language, (newValue) => { locale.value = newValue }) @@ -93,8 +110,12 @@ watch(() => settings.value.language, (newValue) => { /> - -