Skip to content

Commit 122f2f1

Browse files
jaigakyaira2
andauthored
Fixed an issue where screen readers will wrongly read files and folders as Files.Filesystem.ListedItem (#2177)
Co-authored-by: Yair Aichenbaum <[email protected]>
1 parent 37423ee commit 122f2f1

19 files changed

+297
-0
lines changed

Files/Filesystem/ListedItem.cs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,19 @@ public static string GetFriendlyDateFromFormat(DateTimeOffset d, string returnFo
241241
}
242242
}
243243

244+
public override string ToString()
245+
{
246+
string suffix;
247+
if (IsRecycleBinItem) suffix = "RecycleBinItemAutomation".GetLocalized();
248+
else if (IsShortcutItem) suffix = "ShortcutItemAutomation".GetLocalized();
249+
else
250+
{
251+
if (PrimaryItemAttribute == StorageItemTypes.File) suffix = "FileItemAutomation".GetLocalized();
252+
else suffix = "FolderItemAutomation".GetLocalized();
253+
}
254+
return $"{ItemName}, {ItemPath}, {suffix}";
255+
}
256+
244257
public bool IsRecycleBinItem => this is RecycleBinItem;
245258
public bool IsShortcutItem => this is ShortcutItem;
246259
public bool IsLinkItem => IsShortcutItem && ((ShortcutItem)this).IsUrl;

Files/MultilingualResources/Files.de-DE.xlf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,6 +1385,22 @@
13851385
<source>Open items with a single click</source>
13861386
<target state="new">Open items with a single click</target>
13871387
</trans-unit>
1388+
<trans-unit id="FileItemAutomation" translate="yes" xml:space="preserve">
1389+
<source>File</source>
1390+
<target state="new">File</target>
1391+
</trans-unit>
1392+
<trans-unit id="FolderItemAutomation" translate="yes" xml:space="preserve">
1393+
<source>Folder</source>
1394+
<target state="new">Folder</target>
1395+
</trans-unit>
1396+
<trans-unit id="RecycleBinItemAutomation" translate="yes" xml:space="preserve">
1397+
<source>Recycle bin item</source>
1398+
<target state="new">Recycle bin item</target>
1399+
</trans-unit>
1400+
<trans-unit id="ShortcutItemAutomation" translate="yes" xml:space="preserve">
1401+
<source>Shortcut item</source>
1402+
<target state="new">Shortcut item</target>
1403+
</trans-unit>
13881404
<trans-unit id="PinToSidebarByDraggingCaptionText" translate="yes" xml:space="preserve">
13891405
<source>Move here</source>
13901406
<target state="new">Move here</target>

Files/MultilingualResources/Files.es-ES.xlf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,6 +1422,22 @@
14221422
<source>Show recent files on the home page</source>
14231423
<target state="translated">Mostrar archivos recientes en la página de inicio</target>
14241424
</trans-unit>
1425+
<trans-unit id="FileItemAutomation" translate="yes" xml:space="preserve">
1426+
<source>File</source>
1427+
<target state="new">File</target>
1428+
</trans-unit>
1429+
<trans-unit id="FolderItemAutomation" translate="yes" xml:space="preserve">
1430+
<source>Folder</source>
1431+
<target state="new">Folder</target>
1432+
</trans-unit>
1433+
<trans-unit id="RecycleBinItemAutomation" translate="yes" xml:space="preserve">
1434+
<source>Recycle bin item</source>
1435+
<target state="new">Recycle bin item</target>
1436+
</trans-unit>
1437+
<trans-unit id="ShortcutItemAutomation" translate="yes" xml:space="preserve">
1438+
<source>Shortcut item</source>
1439+
<target state="new">Shortcut item</target>
1440+
</trans-unit>
14251441
<trans-unit id="SettingsPreferencesCopyLocationSwitch.Header" translate="yes" xml:space="preserve">
14261442
<source>Show an option to copy the location of the selected item</source>
14271443
<target state="translated">Mostrar en el menú contextual una opción para copiar la ubicación del archivo seleccionado</target>

Files/MultilingualResources/Files.fr-FR.xlf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,6 +1383,22 @@
13831383
<source>Open items with a single click</source>
13841384
<target state="new">Open items with a single click</target>
13851385
</trans-unit>
1386+
<trans-unit id="FileItemAutomation" translate="yes" xml:space="preserve">
1387+
<source>File</source>
1388+
<target state="new">File</target>
1389+
</trans-unit>
1390+
<trans-unit id="FolderItemAutomation" translate="yes" xml:space="preserve">
1391+
<source>Folder</source>
1392+
<target state="new">Folder</target>
1393+
</trans-unit>
1394+
<trans-unit id="RecycleBinItemAutomation" translate="yes" xml:space="preserve">
1395+
<source>Recycle bin item</source>
1396+
<target state="new">Recycle bin item</target>
1397+
</trans-unit>
1398+
<trans-unit id="ShortcutItemAutomation" translate="yes" xml:space="preserve">
1399+
<source>Shortcut item</source>
1400+
<target state="new">Shortcut item</target>
1401+
</trans-unit>
13861402
<trans-unit id="PinToSidebarByDraggingCaptionText" translate="yes" xml:space="preserve">
13871403
<source>Move here</source>
13881404
<target state="new">Move here</target>

Files/MultilingualResources/Files.he-IL.xlf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,6 +1382,22 @@
13821382
<source>Open items with a single click</source>
13831383
<target state="new">Open items with a single click</target>
13841384
</trans-unit>
1385+
<trans-unit id="FileItemAutomation" translate="yes" xml:space="preserve">
1386+
<source>File</source>
1387+
<target state="new">File</target>
1388+
</trans-unit>
1389+
<trans-unit id="FolderItemAutomation" translate="yes" xml:space="preserve">
1390+
<source>Folder</source>
1391+
<target state="new">Folder</target>
1392+
</trans-unit>
1393+
<trans-unit id="RecycleBinItemAutomation" translate="yes" xml:space="preserve">
1394+
<source>Recycle bin item</source>
1395+
<target state="new">Recycle bin item</target>
1396+
</trans-unit>
1397+
<trans-unit id="ShortcutItemAutomation" translate="yes" xml:space="preserve">
1398+
<source>Shortcut item</source>
1399+
<target state="new">Shortcut item</target>
1400+
</trans-unit>
13851401
<trans-unit id="PinToSidebarByDraggingCaptionText" translate="yes" xml:space="preserve">
13861402
<source>Move here</source>
13871403
<target state="new">Move here</target>

Files/MultilingualResources/Files.hi-IN.xlf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1394,6 +1394,22 @@
13941394
<source>Open items with a single click</source>
13951395
<target state="new">Open items with a single click</target>
13961396
</trans-unit>
1397+
<trans-unit id="FileItemAutomation" translate="yes" xml:space="preserve">
1398+
<source>File</source>
1399+
<target state="new">File</target>
1400+
</trans-unit>
1401+
<trans-unit id="FolderItemAutomation" translate="yes" xml:space="preserve">
1402+
<source>Folder</source>
1403+
<target state="new">Folder</target>
1404+
</trans-unit>
1405+
<trans-unit id="RecycleBinItemAutomation" translate="yes" xml:space="preserve">
1406+
<source>Recycle bin item</source>
1407+
<target state="new">Recycle bin item</target>
1408+
</trans-unit>
1409+
<trans-unit id="ShortcutItemAutomation" translate="yes" xml:space="preserve">
1410+
<source>Shortcut item</source>
1411+
<target state="new">Shortcut item</target>
1412+
</trans-unit>
13971413
<trans-unit id="PinToSidebarByDraggingCaptionText" translate="yes" xml:space="preserve">
13981414
<source>Move here</source>
13991415
<target state="new">Move here</target>

Files/MultilingualResources/Files.hu-HU.xlf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1422,6 +1422,22 @@
14221422
<source>Show recent files on the home page</source>
14231423
<target state="translated">Legutóbbi megnyitottak megjelenítése a fő oldalon</target>
14241424
</trans-unit>
1425+
<trans-unit id="FileItemAutomation" translate="yes" xml:space="preserve">
1426+
<source>File</source>
1427+
<target state="new">File</target>
1428+
</trans-unit>
1429+
<trans-unit id="FolderItemAutomation" translate="yes" xml:space="preserve">
1430+
<source>Folder</source>
1431+
<target state="new">Folder</target>
1432+
</trans-unit>
1433+
<trans-unit id="RecycleBinItemAutomation" translate="yes" xml:space="preserve">
1434+
<source>Recycle bin item</source>
1435+
<target state="new">Recycle bin item</target>
1436+
</trans-unit>
1437+
<trans-unit id="ShortcutItemAutomation" translate="yes" xml:space="preserve">
1438+
<source>Shortcut item</source>
1439+
<target state="new">Shortcut item</target>
1440+
</trans-unit>
14251441
<trans-unit id="SettingsPreferencesCopyLocationSwitch.Header" translate="yes" xml:space="preserve">
14261442
<source>Show an option to copy the location of the selected item</source>
14271443
<target state="translated">Kijelölt elem helyének másolása lehetőség megjelenítése</target>

Files/MultilingualResources/Files.it-IT.xlf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,6 +1383,22 @@
13831383
<source>Open items with a single click</source>
13841384
<target state="new">Open items with a single click</target>
13851385
</trans-unit>
1386+
<trans-unit id="FileItemAutomation" translate="yes" xml:space="preserve">
1387+
<source>File</source>
1388+
<target state="new">File</target>
1389+
</trans-unit>
1390+
<trans-unit id="FolderItemAutomation" translate="yes" xml:space="preserve">
1391+
<source>Folder</source>
1392+
<target state="new">Folder</target>
1393+
</trans-unit>
1394+
<trans-unit id="RecycleBinItemAutomation" translate="yes" xml:space="preserve">
1395+
<source>Recycle bin item</source>
1396+
<target state="new">Recycle bin item</target>
1397+
</trans-unit>
1398+
<trans-unit id="ShortcutItemAutomation" translate="yes" xml:space="preserve">
1399+
<source>Shortcut item</source>
1400+
<target state="new">Shortcut item</target>
1401+
</trans-unit>
13861402
<trans-unit id="PinToSidebarByDraggingCaptionText" translate="yes" xml:space="preserve">
13871403
<source>Move here</source>
13881404
<target state="new">Move here</target>

Files/MultilingualResources/Files.ja-JP.xlf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1382,6 +1382,22 @@
13821382
<source>Open items with a single click</source>
13831383
<target state="new">Open items with a single click</target>
13841384
</trans-unit>
1385+
<trans-unit id="FileItemAutomation" translate="yes" xml:space="preserve">
1386+
<source>File</source>
1387+
<target state="new">File</target>
1388+
</trans-unit>
1389+
<trans-unit id="FolderItemAutomation" translate="yes" xml:space="preserve">
1390+
<source>Folder</source>
1391+
<target state="new">Folder</target>
1392+
</trans-unit>
1393+
<trans-unit id="RecycleBinItemAutomation" translate="yes" xml:space="preserve">
1394+
<source>Recycle bin item</source>
1395+
<target state="new">Recycle bin item</target>
1396+
</trans-unit>
1397+
<trans-unit id="ShortcutItemAutomation" translate="yes" xml:space="preserve">
1398+
<source>Shortcut item</source>
1399+
<target state="new">Shortcut item</target>
1400+
</trans-unit>
13851401
<trans-unit id="PinToSidebarByDraggingCaptionText" translate="yes" xml:space="preserve">
13861402
<source>Move here</source>
13871403
<target state="new">Move here</target>

Files/MultilingualResources/Files.nl-NL.xlf

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1396,6 +1396,22 @@
13961396
<source>Open items with a single click</source>
13971397
<target state="new">Open items with a single click</target>
13981398
</trans-unit>
1399+
<trans-unit id="FileItemAutomation" translate="yes" xml:space="preserve">
1400+
<source>File</source>
1401+
<target state="new">File</target>
1402+
</trans-unit>
1403+
<trans-unit id="FolderItemAutomation" translate="yes" xml:space="preserve">
1404+
<source>Folder</source>
1405+
<target state="new">Folder</target>
1406+
</trans-unit>
1407+
<trans-unit id="RecycleBinItemAutomation" translate="yes" xml:space="preserve">
1408+
<source>Recycle bin item</source>
1409+
<target state="new">Recycle bin item</target>
1410+
</trans-unit>
1411+
<trans-unit id="ShortcutItemAutomation" translate="yes" xml:space="preserve">
1412+
<source>Shortcut item</source>
1413+
<target state="new">Shortcut item</target>
1414+
</trans-unit>
13991415
<trans-unit id="PinToSidebarByDraggingCaptionText" translate="yes" xml:space="preserve">
14001416
<source>Move here</source>
14011417
<target state="new">Move here</target>

0 commit comments

Comments
 (0)