From 0b1fc8e574de16e280a6dd00ab5dc4477a7c8ee6 Mon Sep 17 00:00:00 2001 From: Xavier Cazin Date: Wed, 31 Aug 2022 18:32:55 +0200 Subject: [PATCH] Make dialogs over deleting AdvancedSearch filter results translatable (#6933) * Add fr-FR strings over deleting AvancedSearch filter results * Add default strings over deleting AvancedSearch filter results * Make dialogs over deleting results from AdvancedSearch filters translatable --- core/language/en-GB/Buttons.multids | 2 ++ core/language/en-GB/Misc.multids | 1 + core/ui/AdvancedSearch/FilterButtons/delete.tid | 6 +++--- languages/fr-FR/Buttons.multids | 2 ++ languages/fr-FR/Misc.multids | 5 +++-- 5 files changed, 11 insertions(+), 5 deletions(-) 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/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