1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-04-06 10:46:57 +00:00

Merge 7aec0e122bd1bdacd119377ad752d4ad79c459d3 into 961e74f73d230d0028efb586db07699120eac888

This commit is contained in:
Leilei332 2025-04-04 15:00:28 +02:00 committed by GitHub
commit 224e6abb4c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 16 additions and 2 deletions

View File

@ -0,0 +1,3 @@
title: $:/language/DraftAuthor
by $1$

View File

@ -0,0 +1,3 @@
title: $:/language/DraftNumber
$1$

View File

@ -15,6 +15,8 @@ ConfirmAction: Do you wish to proceed?
Count: count
DefaultNewTiddlerTitle: New Tiddler
Diffs/CountMessage: <<diff-count>> differences
DraftTitle: Draft $1$of '$2$'$3$
DropMessage: Drop now (or use the 'Escape' key to cancel)
Encryption/Cancel: Cancel
Encryption/ConfirmClearPassword: Do you wish to clear the password? This will remove the encryption applied when saving this wiki

View File

@ -1702,9 +1702,12 @@ exports.generateDraftTitle = function(title) {
var c = 0,
draftTitle,
username = this.getTiddlerText("$:/status/UserName"),
attribution = username ? " by " + username : "";
draftBaseTitle = $tw.language.getRawString("DraftTitle"),
draftAuthor = $tw.language.getRawString("DraftAuthor"),
draftNumber = $tw.language.getRawString("DraftNumber"),
attribution = username ? draftAuthor.replace("$1$",username) : "";
do {
draftTitle = "Draft " + (c ? (c + 1) + " " : "") + "of '" + title + "'" + attribution;
draftTitle = draftBaseTitle.replace("$1$", (c ? draftNumber.replace(draftNumber, "$1$") : "")).replace("$2$", title).replace("$3$",attribution);
c++;
} while(this.tiddlerExists(draftTitle));
return draftTitle;

View File

@ -15,6 +15,9 @@ ConfirmAction: 是否要继续?
Count: 计数
DefaultNewTiddlerTitle: 新条目
Diffs/CountMessage: <<diff-count>> 个差异
DraftAuthor: $1$撰写的
DraftNumber: $1$
DraftTitle: $3$“$2$”的草稿$1$
DropMessage: 现在放下(或按 ESC 键取消)
Encryption/Cancel: 取消
Encryption/ConfirmClearPassword: 您要清除密码吗?当保存此维基时,这将删除已套用的加密