0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2024-05-11 16:19:46 +08:00
commit 30b0f69dff
9 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/appearance/langs/en_US.json
View file

@ -425,7 +425,7 @@
"dynamicLoadBlocks": "Number of dynamically loaded blocks",
"dynamicLoadBlocksTip": "This value contains the number of subblocks. If there are many code blocks, formula blocks or chart blocks that need to be rendered, it is recommended not to set too large",
"backlinkExpand": "Backlink default expand",
"backlinkExpandTip": "If configured as <code class='fn__code'>0</code>, it will not be expanded, if configured as <code class='fn__code'>-1</code>, the panel will be closed",
"backlinkExpandTip": "If configured as <code class='fn__code'>0</code>",
"backmentionExpand": "Backmention default expand",
"backmentionExpandTip": "If configured as <code class='fn__code'>0</code>, it will not be expanded, if configured as <code class='fn__code'>-1</code>, the panel will be closed",
"googleAnalytics": "Google Analytics",

2
app/appearance/langs/es_ES.json
View file

@ -425,7 +425,7 @@
"dynamicLoadBlocks": "Número de bloques cargados dinámicamente",
"dynamicLoadBlocksTip": "Este valor contiene el número de subbloques. Si hay muchos bloques de código, bloques de fórmulas o bloques de gráficos que necesitan renderizarse, se recomienda no configurarlos demasiado grandes",
"backlinkExpand": "Expansión predeterminada de vínculo de retroceso",
"backlinkExpandTip": "Si se configura como <code class='fn__code'>0</code>, no se expandirá, si se configura como <code class='fn__code'>-1</code>, el panel se cerrará",
"backlinkExpandTip": "Si se configura como <code class='fn__code'>0</code>",
"backmentionExpand": "Expansión predeterminada de la mención",
"backmentionExpandTip": "Si se configura como <code class='fn__code'>0</code>, no se expandirá, , si se configura como <code class='fn__code'>-1</code>, el panel se cerrará",
"googleAnalytics": "Google Analytics",

2
app/appearance/langs/fr_FR.json
View file

@ -425,7 +425,7 @@
"dynamicLoadBlocks": "Nombre de blocs chargés dynamiquement",
"dynamicLoadBlocksTip": "Cette valeur contient le nombre de sous-blocs. S'il y a beaucoup de blocs de code, de blocs de formule ou de blocs de graphique qui doivent être rendus, il est recommandé de ne pas définir trop grand",
"backlinkExpand": "Développer le lien retour par défaut",
"backlinkExpandTip": "Si configuré comme <code class='fn__code'>0</code>, il ne sera pas développé, s'il est configuré comme <code class='fn__code'>-1</code>, le panneau sera fermé",
"backlinkExpandTip": "Si configuré comme <code class='fn__code'>0</code>",
"backmentionExpand": "Développer la mention par défaut",
"backmentionExpandTip": "Si configuré comme <code class='fn__code'>0</code>, il ne sera pas développé, s'il est configuré comme <code class='fn__code'>-1</code>, le panneau sera fermé",
"googleAnalytics": "Google Analytics",

2
app/appearance/langs/ja_JP.json
View file

@ -425,7 +425,7 @@
"dynamicLoadBlocks": "動的に読み込まれるブロックの数",
"dynamicLoadBlocksTip": "この値にはサブブロックの数が含まれます。レンダリングする必要があるコードブロック、数式ブロック、チャートブロックが数多くある場合はあまり大きな数値に設定しないことをお勧めします",
"backlinkExpand": "バックリンクのデフォルト展開数",
"backlinkExpandTip": "<code class='fn__code'>0</code> の場合は展開されません、<code class='fn__code'>-1</code> に設定してパネルを閉じます",
"backlinkExpandTip": "<code class='fn__code'>0</code> の場合は展開されません",
"backmentionExpand": "逆参照のデフォルト展開数",
"backmentionExpandTip": "<code class='fn__code'>0</code> の場合は展開されません、<code class='fn__code'>-1</code> に設定してパネルを閉じます",
"googleAnalytics": "Google アナリティクス",

2
app/appearance/langs/zh_CHT.json
View file

@ -425,7 +425,7 @@
"dynamicLoadBlocks": "動態載入塊數",
"dynamicLoadBlocksTip": "該值包含了子塊數。如果需要渲染的代碼塊、公式塊或圖表塊較多，建議不要設置過大",
"backlinkExpand": "反向連結預設展開數",
"backlinkExpandTip": "配置為 <code class='fn__code'>0</code> 則不展開，配置為 <code class='fn__code'>-1</code> 則收起面板",
"backlinkExpandTip": "配置為 <code class='fn__code'>0</code> 則不展開",
"backmentionExpand": "反向提及默認展開數",
"backmentionExpandTip": "配置為 <code class='fn__code'>0</code> 則不展開，配置為 <code class='fn__code'>-1</code> 則收起面板",
"googleAnalytics": "Google Analytics",

2
app/appearance/langs/zh_CN.json
View file

@ -425,7 +425,7 @@
"dynamicLoadBlocks": "动态加载块数",
"dynamicLoadBlocksTip": "该值包含了子块数。如果需要渲染的代码块、公式块或图表块较多，建议不要设置过大",
"backlinkExpand": "反向链接默认展开数",
"backlinkExpandTip": "配置为 <code class='fn__code'>0</code> 则不展开，配置为 <code class='fn__code'>-1</code> 则收起面板",
"backlinkExpandTip": "配置为 <code class='fn__code'>0</code> 则不展开",
"backmentionExpand": "反向提及默认展开数",
"backmentionExpandTip": "配置为 <code class='fn__code'>0</code> 则不展开，配置为 <code class='fn__code'>-1</code> 则收起面板",
"googleAnalytics": "Google Analytics",

2
app/src/config/editor.ts
View file

@ -192,7 +192,7 @@ export const editor = {
<div class="b3-label__text">${window.siyuan.languages.backmentionExpandTip}</div>
</div>
<span class="fn__space"></span>
<input class="b3-text-field fn__flex-center fn__size200" id="backmentionExpandCount" type="number" min="0" max="512" value="${window.siyuan.config.editor.backmentionExpandCount}"/>
<input class="b3-text-field fn__flex-center fn__size200" id="backmentionExpandCount" type="number" min="-1" max="512" value="${window.siyuan.config.editor.backmentionExpandCount}"/>
</div>
<div class="fn__flex b3-label config__item">
<div class="fn__flex-1">

2
app/src/mobile/settings/editor.ts
View file

@ -197,7 +197,7 @@ export const initEditor = () => {
<div class="b3-label fn__displayblock">
${window.siyuan.languages.backlinkExpand}
<span class="fn__hr"></span>
<input class="b3-text-field fn__block" id="backlinkExpandCount" type="number" min="-1" max="512" value="${window.siyuan.config.editor.backlinkExpandCount}"/>
<input class="b3-text-field fn__block" id="backlinkExpandCount" type="number" min="0" max="512" value="${window.siyuan.config.editor.backlinkExpandCount}"/>
<div class="b3-label__text">${window.siyuan.languages.backlinkExpandTip}</div>
</div>
<div class="b3-label fn__displayblock">

4
kernel/model/conf.go
View file

@ -249,8 +249,8 @@ func InitConf() {
if conf.MaxDynamicLoadBlocks < Conf.Editor.DynamicLoadBlocks {
Conf.Editor.DynamicLoadBlocks = conf.MaxDynamicLoadBlocks
}
if -1 > Conf.Editor.BacklinkExpandCount {
Conf.Editor.BacklinkExpandCount = -1
if 0 > Conf.Editor.BacklinkExpandCount {
Conf.Editor.BacklinkExpandCount = 0
}
if -1 > Conf.Editor.BackmentionExpandCount {
Conf.Editor.BackmentionExpandCount = -1