Skip to content

Commit 7700885

Browse files
yaira2SuburbannotsvietOK
authored
Updated the confirm delete dialog to include the number of selected items (#1863)
* Updated the confirm delete dialog to include the number of selected items. Co-authored-by: Vinicius ⚡ <[email protected]> Co-authored-by: Vladyslav <[email protected]>
1 parent b8777ea commit 7700885

38 files changed

+186
-154
lines changed

‎Files/BaseLayout.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,19 @@ internal set
8585
SelectedItem = _SelectedItems.First();
8686
SelectedItemsPropertiesViewModel.IsItemSelected = true;
8787

88+
if (SelectedItems.Count >= 1)
89+
{
90+
SelectedItemsPropertiesViewModel.SelectedItemsCount = SelectedItems.Count;
91+
}
92+
8893
if (SelectedItems.Count == 1)
8994
{
90-
SelectedItemsPropertiesViewModel.SelectedItemsCount = SelectedItems.Count.ToString() + " " + ResourceController.GetTranslation("ItemSelected/Text");
95+
SelectedItemsPropertiesViewModel.SelectedItemsCountString = SelectedItems.Count.ToString() + " " + ResourceController.GetTranslation("ItemSelected/Text");
9196
SelectedItemsPropertiesViewModel.ItemSize = SelectedItem.FileSize;
9297
}
9398
else
9499
{
95-
SelectedItemsPropertiesViewModel.SelectedItemsCount = SelectedItems.Count.ToString() + " " + ResourceController.GetTranslation("ItemsSelected/Text");
100+
SelectedItemsPropertiesViewModel.SelectedItemsCountString = SelectedItems.Count.ToString() + " " + ResourceController.GetTranslation("ItemsSelected/Text");
96101

97102
if (SelectedItems.All(x => x.PrimaryItemAttribute == StorageItemTypes.File))
98103
{

‎Files/Dialogs/ConfirmDeleteDialog.xaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@
2222
<RowDefinition />
2323
</Grid.RowDefinitions>
2424
<StackPanel Grid.Row="0" Spacing="10">
25-
<TextBlock
26-
x:Uid="ConfirmDeleteDialogHeader"
27-
Text="Are you sure you want to delete the selected item(s)?"
28-
TextWrapping="WrapWholeWords" />
25+
<TextBlock Text="{x:Bind Description, Mode=OneWay}" TextWrapping="WrapWholeWords" />
2926

3027
<CheckBox
3128
x:Name="chkPermanentlyDelete"

‎Files/Dialogs/ConfirmDeleteDialog.xaml.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Windows.Storage;
1+
using Files.View_Models;
2+
using Windows.Storage;
23
using Windows.UI.Xaml;
34
using Windows.UI.Xaml.Controls;
45

@@ -9,6 +10,8 @@ namespace Files.Dialogs
910
public sealed partial class ConfirmDeleteDialog : ContentDialog
1011
{
1112
public StorageDeleteOption PermanentlyDelete { get; set; }
13+
public string Description { get; set; }
14+
public SelectedItemsPropertiesViewModel SelectedItemsPropertiesViewModel => App.CurrentInstance.ContentPage.SelectedItemsPropertiesViewModel;
1215
public MyResult Result { get; set; }
1316

1417
public enum MyResult
@@ -27,6 +30,15 @@ public ConfirmDeleteDialog(bool deleteFromRecycleBin, StorageDeleteOption delete
2730

2831
// If deleting from recycle bin disable "permanently delete" option
2932
this.chkPermanentlyDelete.IsEnabled = !deleteFromRecycleBin;
33+
34+
if (SelectedItemsPropertiesViewModel.SelectedItemsCount == 1)
35+
{
36+
Description = ResourceController.GetTranslation("ConfirmDeleteDialogDeleteOneItem/Text");
37+
}
38+
else
39+
{
40+
Description = string.Format(ResourceController.GetTranslation("ConfirmDeleteDialogDeleteMultipleItems/Text"), SelectedItemsPropertiesViewModel.SelectedItemsCount);
41+
}
3042
}
3143

3244
private void btnDelete_Click(object sender, RoutedEventArgs e)

‎Files/MultilingualResources/Files.de-DE.xlf

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,6 @@
183183
<source>Delete</source>
184184
<target state="translated">Löschen</target>
185185
</trans-unit>
186-
<trans-unit id="ConfirmDeleteDialogHeader.Text" translate="yes" xml:space="preserve">
187-
<source>Are you sure you want to delete the selected item(s)?</source>
188-
<target state="translated">Sind Sie sicher, dass Sie die ausgewählten Dateien löschen möchten?</target>
189-
<!--This doesn't work in German. If multiply items are selected, the whole sentence needs to change. Maybe I find a better solution at some point-->
190-
</trans-unit>
191186
<trans-unit id="ConfirmDeleteDialogPermanentlyDeleteCheckBox.Content" translate="yes" xml:space="preserve">
192187
<source>Permanently delete</source>
193188
<target state="translated">Endgültig löschen</target>
@@ -1193,6 +1188,14 @@
11931188
<source>Show all context menu items</source>
11941189
<target state="translated">Alle im Kontextmenü verfügbaren Elemente anzeigen</target>
11951190
</trans-unit>
1191+
<trans-unit id="ConfirmDeleteDialogDeleteOneItem.Text" translate="yes" xml:space="preserve">
1192+
<source>Are you sure you want to delete this item?</source>
1193+
<target state="new">Are you sure you want to delete this item?</target>
1194+
</trans-unit>
1195+
<trans-unit id="ConfirmDeleteDialogDeleteMultipleItems.Text" translate="yes" xml:space="preserve">
1196+
<source>Are you sure you want to delete these {0} items?</source>
1197+
<target state="new">Are you sure you want to delete these {0} items?</target>
1198+
</trans-unit>
11961199
</group>
11971200
</body>
11981201
</file>

‎Files/MultilingualResources/Files.es-ES.xlf

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,10 +183,6 @@
183183
<source>Delete</source>
184184
<target state="translated">Eliminar</target>
185185
</trans-unit>
186-
<trans-unit id="ConfirmDeleteDialogHeader.Text" translate="yes" xml:space="preserve">
187-
<source>Are you sure you want to delete the selected item(s)?</source>
188-
<target state="translated">¿Está seguro que desea eliminar el archivo seleccionado?</target>
189-
</trans-unit>
190186
<trans-unit id="ConfirmDeleteDialogPermanentlyDeleteCheckBox.Content" translate="yes" xml:space="preserve">
191187
<source>Permanently delete</source>
192188
<target state="translated">Eliminar permanentemente</target>
@@ -1186,6 +1182,14 @@
11861182
<source>Show all context menu items</source>
11871183
<target state="translated">Mostrar todos los elementos del menú contextual</target>
11881184
</trans-unit>
1185+
<trans-unit id="ConfirmDeleteDialogDeleteOneItem.Text" translate="yes" xml:space="preserve">
1186+
<source>Are you sure you want to delete this item?</source>
1187+
<target state="new">Are you sure you want to delete this item?</target>
1188+
</trans-unit>
1189+
<trans-unit id="ConfirmDeleteDialogDeleteMultipleItems.Text" translate="yes" xml:space="preserve">
1190+
<source>Are you sure you want to delete these {0} items?</source>
1191+
<target state="new">Are you sure you want to delete these {0} items?</target>
1192+
</trans-unit>
11891193
</group>
11901194
</body>
11911195
</file>

‎Files/MultilingualResources/Files.fr-FR.xlf

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,10 +189,6 @@
189189
<source>Delete</source>
190190
<target state="needs-review-translation" state-qualifier="tm-suggestion">Supprimer</target>
191191
</trans-unit>
192-
<trans-unit id="ConfirmDeleteDialogHeader.Text" translate="yes" xml:space="preserve">
193-
<source>Are you sure you want to delete the selected item(s)?</source>
194-
<target state="needs-review-translation" state-qualifier="tm-suggestion">Voulez-vous vraiment supprimer le(s) élément(s) sélectionné(s) ?</target>
195-
</trans-unit>
196192
<trans-unit id="ConfirmDeleteDialogPermanentlyDeleteCheckBox.Content" translate="yes" xml:space="preserve">
197193
<source>Permanently delete</source>
198194
<target state="needs-review-translation" state-qualifier="tm-suggestion">Supprimer de façon définitive</target>
@@ -1185,6 +1181,14 @@
11851181
<source>Show all context menu items</source>
11861182
<target state="new">Show all context menu items</target>
11871183
</trans-unit>
1184+
<trans-unit id="ConfirmDeleteDialogDeleteOneItem.Text" translate="yes" xml:space="preserve">
1185+
<source>Are you sure you want to delete this item?</source>
1186+
<target state="new">Are you sure you want to delete this item?</target>
1187+
</trans-unit>
1188+
<trans-unit id="ConfirmDeleteDialogDeleteMultipleItems.Text" translate="yes" xml:space="preserve">
1189+
<source>Are you sure you want to delete these {0} items?</source>
1190+
<target state="new">Are you sure you want to delete these {0} items?</target>
1191+
</trans-unit>
11881192
</group>
11891193
</body>
11901194
</file>

‎Files/MultilingualResources/Files.he-IL.xlf

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
<source>Delete</source>
1919
<target state="translated" state-qualifier="tm-suggestion">מחק</target>
2020
</trans-unit>
21-
<trans-unit id="ConfirmDeleteDialogHeader.Text" translate="yes" xml:space="preserve">
22-
<source>Are you sure you want to delete the selected item(s)?</source>
23-
<target state="translated" state-qualifier="tm-suggestion">האם אתה בטוח שאתה רוצה למחוק את הפריט/ים המסומנ/ים?</target>
24-
</trans-unit>
2521
<trans-unit id="ConfirmDeleteDialogPermanentlyDeleteCheckBox.Content" translate="yes" xml:space="preserve">
2622
<source>Permanently delete</source>
2723
<target state="translated" state-qualifier="tm-suggestion">‏‏מחק לצמיתות</target>
@@ -1181,6 +1177,14 @@
11811177
<source>Show all context menu items</source>
11821178
<target state="new">Show all context menu items</target>
11831179
</trans-unit>
1180+
<trans-unit id="ConfirmDeleteDialogDeleteOneItem.Text" translate="yes" xml:space="preserve">
1181+
<source>Are you sure you want to delete this item?</source>
1182+
<target state="new">Are you sure you want to delete this item?</target>
1183+
</trans-unit>
1184+
<trans-unit id="ConfirmDeleteDialogDeleteMultipleItems.Text" translate="yes" xml:space="preserve">
1185+
<source>Are you sure you want to delete these {0} items?</source>
1186+
<target state="new">Are you sure you want to delete these {0} items?</target>
1187+
</trans-unit>
11841188
</group>
11851189
</body>
11861190
</file>

‎Files/MultilingualResources/Files.hi-IN.xlf

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
<source>Delete</source>
1919
<target state="translated">हटाएँ</target>
2020
</trans-unit>
21-
<trans-unit id="ConfirmDeleteDialogHeader.Text" translate="yes" xml:space="preserve">
22-
<source>Are you sure you want to delete the selected item(s)?</source>
23-
<target state="translated">क्या आप सुनिश्चित हैं कि आप चयनित वस्तु(ओं) को हटाना चाहते हैं?</target>
24-
</trans-unit>
2521
<trans-unit id="ConfirmDeleteDialogPermanentlyDeleteCheckBox.Content" translate="yes" xml:space="preserve">
2622
<source>Permanently delete</source>
2723
<target state="translated">स्थायी रूप से हटाएं</target>
@@ -1187,6 +1183,14 @@
11871183
<source>Show all context menu items</source>
11881184
<target state="new">Show all context menu items</target>
11891185
</trans-unit>
1186+
<trans-unit id="ConfirmDeleteDialogDeleteOneItem.Text" translate="yes" xml:space="preserve">
1187+
<source>Are you sure you want to delete this item?</source>
1188+
<target state="new">Are you sure you want to delete this item?</target>
1189+
</trans-unit>
1190+
<trans-unit id="ConfirmDeleteDialogDeleteMultipleItems.Text" translate="yes" xml:space="preserve">
1191+
<source>Are you sure you want to delete these {0} items?</source>
1192+
<target state="new">Are you sure you want to delete these {0} items?</target>
1193+
</trans-unit>
11901194
</group>
11911195
</body>
11921196
</file>

‎Files/MultilingualResources/Files.it-IT.xlf

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
<source>Delete</source>
1919
<target state="translated">Elimina</target>
2020
</trans-unit>
21-
<trans-unit id="ConfirmDeleteDialogHeader.Text" translate="yes" xml:space="preserve">
22-
<source>Are you sure you want to delete the selected item(s)?</source>
23-
<target state="translated">Sei sicuro di voler eliminare gli elementi selezionati?</target>
24-
</trans-unit>
2521
<trans-unit id="ConfirmDeleteDialogPermanentlyDeleteCheckBox.Content" translate="yes" xml:space="preserve">
2622
<source>Permanently delete</source>
2723
<target state="translated">Elimina definitivamente</target>
@@ -1187,6 +1183,14 @@
11871183
<source>Show all context menu items</source>
11881184
<target state="translated">Mostra tutti gli elementi nel menu contestuale</target>
11891185
</trans-unit>
1186+
<trans-unit id="ConfirmDeleteDialogDeleteOneItem.Text" translate="yes" xml:space="preserve">
1187+
<source>Are you sure you want to delete this item?</source>
1188+
<target state="new">Are you sure you want to delete this item?</target>
1189+
</trans-unit>
1190+
<trans-unit id="ConfirmDeleteDialogDeleteMultipleItems.Text" translate="yes" xml:space="preserve">
1191+
<source>Are you sure you want to delete these {0} items?</source>
1192+
<target state="new">Are you sure you want to delete these {0} items?</target>
1193+
</trans-unit>
11901194
</group>
11911195
</body>
11921196
</file>

‎Files/MultilingualResources/Files.ja-JP.xlf

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
<source>Delete</source>
1919
<target state="translated">削除</target>
2020
</trans-unit>
21-
<trans-unit id="ConfirmDeleteDialogHeader.Text" translate="yes" xml:space="preserve">
22-
<source>Are you sure you want to delete the selected item(s)?</source>
23-
<target state="translated">選択したアイテムを削除してもよろしいですか？</target>
24-
</trans-unit>
2521
<trans-unit id="ConfirmDeleteDialogPermanentlyDeleteCheckBox.Content" translate="yes" xml:space="preserve">
2622
<source>Permanently delete</source>
2723
<target state="translated">完全に削除</target>
@@ -1189,6 +1185,14 @@
11891185
<source>Show all context menu items</source>
11901186
<target state="new">Show all context menu items</target>
11911187
</trans-unit>
1188+
<trans-unit id="ConfirmDeleteDialogDeleteOneItem.Text" translate="yes" xml:space="preserve">
1189+
<source>Are you sure you want to delete this item?</source>
1190+
<target state="new">Are you sure you want to delete this item?</target>
1191+
</trans-unit>
1192+
<trans-unit id="ConfirmDeleteDialogDeleteMultipleItems.Text" translate="yes" xml:space="preserve">
1193+
<source>Are you sure you want to delete these {0} items?</source>
1194+
<target state="new">Are you sure you want to delete these {0} items?</target>
1195+
</trans-unit>
11921196
</group>
11931197
</body>
11941198
</file>

0 commit comments

Comments
 (0)