diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids index 83598f410..7cf1c9955 100644 --- a/core/language/en-GB/Buttons.multids +++ b/core/language/en-GB/Buttons.multids @@ -18,6 +18,8 @@ CopyToClipboard/Caption: copy to clipboard CopyToClipboard/Hint: Copy this text to the clipboard Delete/Caption: delete Delete/Hint: Delete this tiddler +DeleteTiddlers/Caption: delete tiddlers +DeleteTiddlers/Hint: Delete tiddlers Edit/Caption: edit Edit/Hint: Edit this tiddler Encryption/Caption: encryption diff --git a/core/language/en-GB/Misc.multids b/core/language/en-GB/Misc.multids index b677494e6..00cb3c99c 100644 --- a/core/language/en-GB/Misc.multids +++ b/core/language/en-GB/Misc.multids @@ -8,6 +8,7 @@ CloseAll/Button: close all ColourPicker/Recent: Recent: ConfirmCancelTiddler: Do you wish to discard changes to the tiddler "<$text text=<>/>"? ConfirmDeleteTiddler: Do you wish to delete the tiddler "<$text text=<<title>>/>"? +ConfirmDeleteTiddlers: Are you sure you wish to delete <<resultCount>> tiddler(s)? ConfirmOverwriteTiddler: Do you wish to overwrite the tiddler "<$text text=<<title>>/>"? ConfirmEditShadowTiddler: You are about to edit a ShadowTiddler. Any changes will override the default system making future upgrades non-trivial. Are you sure you want to edit "<$text text=<<title>>/>"? ConfirmAction: Do you wish to proceed? diff --git a/core/modules/editor/factory.js b/core/modules/editor/factory.js index 5cc9a2662..118f44f43 100644 --- a/core/modules/editor/factory.js +++ b/core/modules/editor/factory.js @@ -115,7 +115,7 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) { // Otherwise, we need to construct a default value for the editor switch(this.editField) { case "text": - value = "Type the text for the tiddler '" + this.editTitle + "'"; + value = ""; type = "text/vnd.tiddlywiki"; break; case "title": diff --git a/core/ui/AdvancedSearch/FilterButtons/delete.tid b/core/ui/AdvancedSearch/FilterButtons/delete.tid index 85d9b224e..8d3069b57 100644 --- a/core/ui/AdvancedSearch/FilterButtons/delete.tid +++ b/core/ui/AdvancedSearch/FilterButtons/delete.tid @@ -3,7 +3,7 @@ tags: $:/tags/AdvancedSearch/FilterButton \whitespace trim <$reveal state="$:/temp/advancedsearch" type="nomatch" text=""> -<$button popup=<<qualify "$:/state/filterDeleteDropdown">> class="tc-btn-invisible"> +<$button tooltip={{$:/language/Buttons/DeleteTiddlers/Hint}} popup=<<qualify "$:/state/filterDeleteDropdown">> class="tc-btn-invisible"> {{$:/core/images/delete-button}} </$button> </$reveal> @@ -13,13 +13,13 @@ tags: $:/tags/AdvancedSearch/FilterButton <div class="tc-block-dropdown tc-edit-type-dropdown"> <div class="tc-dropdown-item-plain"> <$set name="resultCount" value="""<$count filter={{$:/temp/advancedsearch}}/>"""> -Are you sure you wish to delete <<resultCount>> tiddler(s)? +{{$:/language/ConfirmDeleteTiddlers}} </$set> </div> <div class="tc-dropdown-item-plain"> <$button class="tc-btn"> <$action-deletetiddler $filter={{$:/temp/advancedsearch}}/> -Delete these tiddlers +{{$:/language/Buttons/DeleteTiddlers/Hint}} </$button> </div> </div> diff --git a/languages/fr-FR/Buttons.multids b/languages/fr-FR/Buttons.multids index 058cf8041..426a4c1fb 100644 --- a/languages/fr-FR/Buttons.multids +++ b/languages/fr-FR/Buttons.multids @@ -18,6 +18,8 @@ CopyToClipboard/Caption: copier dans le presse-papier CopyToClipboard/Hint: Copie ce texte dans le presse-papier Delete/Caption: supprimer Delete/Hint: Supprime ce tiddler +DeleteTiddlers/Caption: supprimer les tiddlers +DeleteTiddlers/Hint: Supprime ces tiddlers Edit/Caption: éditer Edit/Hint: Édite ce tiddler Encryption/Caption: chiffrement diff --git a/languages/fr-FR/Misc.multids b/languages/fr-FR/Misc.multids index 2d9c66655..1c0be807f 100644 --- a/languages/fr-FR/Misc.multids +++ b/languages/fr-FR/Misc.multids @@ -7,8 +7,9 @@ ClassicWarning/Upgrade/Caption: mettre à jour CloseAll/Button: tout fermer ColourPicker/Recent: Récent : ConfirmCancelTiddler: Souhaitez-vous annuler les modifications apportées au tiddler « <$text text=<<title>>/> » ? -ConfirmDeleteTiddler: Souhaitez-vous supprimer le tiddler « <$text text=<<title>>/> » ? -ConfirmOverwriteTiddler: Souhaitez-vous supplanter le tiddler « <$text text=<<title>>/> » ? +ConfirmDeleteTiddler: Souhaitez-vous supprimer le tiddler « <$text text=<<title>>/> » ? +ConfirmDeleteTiddlers: Êtes-vous sûr•e de vouloir supprimer <<resultCount>> tiddler(s) ? +ConfirmOverwriteTiddler: Souhaitez-vous supplanter le tiddler « <$text text=<<title>>/> » ? ConfirmEditShadowTiddler: Vous êtes sur le point d'éditer un ShadowTiddler. Toute modification supplantera la version par défaut du système, rendant les prochaines mises à jour non-triviales. Êtes-vous sûr(e) de vouloir éditer "<$text text=<<title>>/>"? ConfirmAction: Souhaitez-vous poursuivre ? Count: total diff --git a/languages/zh-Hans/Buttons.multids b/languages/zh-Hans/Buttons.multids index 380bba3eb..6feef4e92 100644 --- a/languages/zh-Hans/Buttons.multids +++ b/languages/zh-Hans/Buttons.multids @@ -18,6 +18,8 @@ CopyToClipboard/Caption: 复制到剪贴板 CopyToClipboard/Hint: 将此文本复制到剪贴板 Delete/Caption: 删除 Delete/Hint: 删除此条目 +DeleteTiddlers/Caption: 删除条目 +DeleteTiddlers/Hint: 删除条目 Edit/Caption: 编辑 Edit/Hint: 编辑此条目 Encryption/Caption: 加密 diff --git a/languages/zh-Hans/Misc.multids b/languages/zh-Hans/Misc.multids index 7b8edb4b8..567ddfaee 100644 --- a/languages/zh-Hans/Misc.multids +++ b/languages/zh-Hans/Misc.multids @@ -8,6 +8,7 @@ CloseAll/Button: 全部关闭 ColourPicker/Recent: 最近︰ ConfirmCancelTiddler: 您确定要放弃对条目 "<$text text=<<title>>/>" 的更改? ConfirmDeleteTiddler: 您确定要删除条目 "<$text text=<<title>>/>"? +ConfirmDeleteTiddlers: 您确定要删除 <<resultCount>> 个条目? ConfirmOverwriteTiddler: 您确定要复写条目 "<$text text=<<title>>/>"? ConfirmEditShadowTiddler: 您即将要编辑默认条目,任何更改将会复盖默认的系统,使未来的升级不寻常。您确定要编辑 "<$text text=<<title>>/>"? ConfirmAction: 是否要继续? diff --git a/languages/zh-Hant/Buttons.multids b/languages/zh-Hant/Buttons.multids index aa94f7013..2a170ed8e 100644 --- a/languages/zh-Hant/Buttons.multids +++ b/languages/zh-Hant/Buttons.multids @@ -18,6 +18,8 @@ CopyToClipboard/Caption: 複製到剪貼簿 CopyToClipboard/Hint: 將此文字複製到剪貼簿 Delete/Caption: 刪除 Delete/Hint: 刪除此條目 +DeleteTiddlers/Caption: 刪除條目 +DeleteTiddlers/Hint: 刪除條目 Edit/Caption: 編輯 Edit/Hint: 編輯此條目 Encryption/Caption: 加密 diff --git a/languages/zh-Hant/Misc.multids b/languages/zh-Hant/Misc.multids index 3b67b65ba..0269aa7dd 100644 --- a/languages/zh-Hant/Misc.multids +++ b/languages/zh-Hant/Misc.multids @@ -8,6 +8,7 @@ CloseAll/Button: 全部關閉 ColourPicker/Recent: 最近︰ ConfirmCancelTiddler: 您確定要放棄對條目 "<$text text=<<title>>/>" 的更改? ConfirmDeleteTiddler: 您確定要刪除條目 "<$text text=<<title>>/>"? +ConfirmDeleteTiddlers: 您確定要刪除 <<resultCount>> 個條目? ConfirmOverwriteTiddler: 您確定要覆寫條目 "<$text text=<<title>>/>"? ConfirmEditShadowTiddler: 您即將要編輯預設條目,任何更改將會覆蓋預設的系統,使未來的升級不尋常。您確定要編輯 "<$text text=<<title>>/>"? ConfirmAction: 是否要繼續? diff --git a/package.json b/package.json index 4642bca92..68e44ff3c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tiddlywiki", "preferGlobal": "true", - "version": "5.2.4", + "version": "5.2.4-prerelease", "author": "Jeremy Ruston <jeremy@jermolene.com>", "description": "a non-linear personal web notebook", "contributors": [ diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid index cbb8b1784..9c4a342ff 100644 --- a/themes/tiddlywiki/vanilla/base.tid +++ b/themes/tiddlywiki/vanilla/base.tid @@ -397,6 +397,7 @@ a.tc-tiddlylink { font-weight: 500; color: <<colour tiddler-link-foreground>>; -webkit-user-select: inherit; /* Otherwise the draggable attribute makes links impossible to select */ + -webkit-touch-callout: none; /* Prevents long presses from bringing up a link preview */ } .tc-sidebar-lists a.tc-tiddlylink {