Skip to content

Commit 9669ad6

Browse files
hishitetsuhishitetsu
authored
Code Quality: Deleted duplicate string resources (files-community#11469)
1 parent c654338 commit 9669ad6

39 files changed

+143
-332
lines changed

‎src/Files.App/DataModels/NavigationControlItems/DriveItem.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,15 +215,15 @@ public async Task UpdatePropertiesAsync()
215215
}
216216
else
217217
{
218-
SpaceText = "DriveCapacityUnknown".GetLocalizedResource();
218+
SpaceText = "Unknown".GetLocalizedResource();
219219
MaxSpace = SpaceUsed = FreeSpace = ByteSize.FromBytes(0);
220220
}
221221

222222
OnPropertyChanged(nameof(ShowDriveDetails));
223223
}
224224
catch (Exception)
225225
{
226-
SpaceText = "DriveCapacityUnknown".GetLocalizedResource();
226+
SpaceText = "Unknown".GetLocalizedResource();
227227
MaxSpace = SpaceUsed = FreeSpace = ByteSize.FromBytes(0);
228228

229229
OnPropertyChanged(nameof(ShowDriveDetails));

‎src/Files.App/Dialogs/CredentialDialog.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
CornerRadius="{StaticResource OverlayCornerRadius}"
1111
PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
1212
PrimaryButtonStyle="{StaticResource AccentButtonStyle}"
13-
PrimaryButtonText="{helpers:ResourceString Name=AskCredentialDialog/PrimaryButtonText}"
13+
PrimaryButtonText="{helpers:ResourceString Name=OK}"
1414
RequestedTheme="{x:Bind helpers:ThemeHelper.RootTheme}"
1515
SecondaryButtonText="{helpers:ResourceString Name=Cancel}"
1616
Style="{StaticResource DefaultContentDialogStyle}"
@@ -42,7 +42,7 @@
4242
x:Name="Password"
4343
Margin="4"
4444
IsEnabled="{x:Bind ViewModel.IsAnonymous, Mode=OneWay, Converter={StaticResource BoolNegationConverter}}"
45-
PlaceholderText="{helpers:ResourceString Name=CredentialDialogPassword/PlaceholderText}" />
45+
PlaceholderText="{helpers:ResourceString Name=Password}" />
4646
<CheckBox
4747
x:Name="Anonymous"
4848
Margin="4"

‎src/Files.App/Dialogs/DecompressArchiveDialog.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
x:Name="Password"
6969
HorizontalAlignment="Stretch"
7070
VerticalAlignment="Stretch"
71-
PlaceholderText="{helpers:ResourceString Name=CredentialDialogPassword/PlaceholderText}" />
71+
PlaceholderText="{helpers:ResourceString Name=Password}" />
7272
</StackPanel>
7373

7474
<!-- Open when complete -->

‎src/Files.App/Dialogs/FilesystemOperationDialog.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
SelectedIndex="{x:Bind ConflictResolveOption, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay, Converter={StaticResource ConflictResolveOptionToIndexConverter}}">
117117
<ComboBox.Items>
118118
<ComboBoxItem Content="{helpers:ResourceString Name=GenerateNewName}" />
119-
<ComboBoxItem Content="{helpers:ResourceString Name=ConflictingItemsDialogItemOptionReplaceExisting/Text}" />
119+
<ComboBoxItem Content="{helpers:ResourceString Name=ReplaceExisting}" />
120120
<ComboBoxItem Content="{helpers:ResourceString Name=Skip}" />
121121
</ComboBox.Items>
122122
</ComboBox>
@@ -180,7 +180,7 @@
180180
<ComboBox.Items>
181181
<ComboBoxItem Content="{helpers:ResourceString Name=Custom}" />
182182
<ComboBoxItem Content="{helpers:ResourceString Name=GenerateNewName}" />
183-
<ComboBoxItem Content="{helpers:ResourceString Name=ConflictingItemsDialogOptionReplaceExisting/Text}" />
183+
<ComboBoxItem Content="{helpers:ResourceString Name=ReplaceExisting}" />
184184
<ComboBoxItem Content="{helpers:ResourceString Name=Skip}" />
185185
</ComboBox.Items>
186186
</ComboBox>

‎src/Files.App/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ await DialogDisplayHelper.ShowDialogAsync(
563563
if (showExtensionDialog &&
564564
Path.GetExtension(source.Path) != Path.GetExtension(newName)) // Only prompt user when extension has changed, not when file name has changed
565565
{
566-
var yesSelected = await DialogDisplayHelper.ShowDialogAsync("RenameFileDialogTitle".GetLocalizedResource(), "RenameFileDialog/Text".GetLocalizedResource(), "Yes".GetLocalizedResource(), "No".GetLocalizedResource());
566+
var yesSelected = await DialogDisplayHelper.ShowDialogAsync("Rename".GetLocalizedResource(), "RenameFileDialog/Text".GetLocalizedResource(), "Yes".GetLocalizedResource(), "No".GetLocalizedResource());
567567
if (yesSelected)
568568
{
569569
history = await filesystemOperations.RenameAsync(source, newName, collision, progress, cancellationToken);

‎src/Files.App/Filesystem/LibraryManager.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ public static async void ShowRestoreDefaultLibrariesDialog()
302302
{
303303
TitleText = "DialogRestoreLibrariesTitleText".GetLocalizedResource(),
304304
SubtitleText = "DialogRestoreLibrariesSubtitleText".GetLocalizedResource(),
305-
PrimaryButtonText = "DialogRestoreLibrariesButtonText".GetLocalizedResource(),
305+
PrimaryButtonText = "Restore".GetLocalizedResource(),
306306
CloseButtonText = "Cancel".GetLocalizedResource(),
307307
PrimaryButtonAction = async (vm, e) =>
308308
{
@@ -353,7 +353,7 @@ public static async void ShowCreateNewLibraryDialog()
353353
},
354354
TitleText = "FolderWidgetCreateNewLibraryDialogTitleText".GetLocalizedResource(),
355355
SubtitleText = "SideBarCreateNewLibrary/Text".GetLocalizedResource(),
356-
PrimaryButtonText = "DialogCreateLibraryButtonText".GetLocalizedResource(),
356+
PrimaryButtonText = "Create".GetLocalizedResource(),
357357
CloseButtonText = "Cancel".GetLocalizedResource(),
358358
PrimaryButtonAction = async (vm, e) =>
359359
{

‎src/Files.App/Filesystem/ListedItem.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public string ItemTooltipText
5353
tooltipBuilder.AppendLine($"{"ToolTipDescriptionType".GetLocalizedResource()} {itemType}");
5454
tooltipBuilder.Append($"{"ToolTipDescriptionDate".GetLocalizedResource()} {ItemDateModified}");
5555
if(!string.IsNullOrWhiteSpace(FileSize))
56-
tooltipBuilder.Append($"{Environment.NewLine}{"ToolTipDescriptionSize".GetLocalizedResource()} {FileSize}");
56+
tooltipBuilder.Append($"{Environment.NewLine}{"SizeLabel".GetLocalizedResource()} {FileSize}");
5757
if(SyncStatusUI.LoadSyncStatus)
5858
tooltipBuilder.Append($"{Environment.NewLine}{"syncStatusColumn/Header".GetLocalizedResource()}: {syncStatusUI.SyncStatusString}");
5959

@@ -400,7 +400,7 @@ public override string ToString()
400400
}
401401
else if (IsLibrary)
402402
{
403-
suffix = "LibraryItemAutomation".GetLocalizedResource();
403+
suffix = "Library".GetLocalizedResource();
404404
}
405405
else
406406
{
@@ -493,7 +493,7 @@ public FtpItem(FtpListItem item, string folder) : base(null)
493493
PrimaryItemAttribute = isFile ? StorageItemTypes.File : StorageItemTypes.Folder;
494494
ItemPropertiesInitialized = false;
495495

496-
var itemType = isFile ? "ItemTypeFile".GetLocalizedResource() : "Folder".GetLocalizedResource();
496+
var itemType = isFile ? "File".GetLocalizedResource() : "Folder".GetLocalizedResource();
497497
if (isFile && Name.Contains('.', StringComparison.Ordinal))
498498
{
499499
itemType = FileExtension.Trim('.') + " " + itemType;
@@ -571,7 +571,7 @@ public LibraryItem(LibraryLocationItem library) : base(null)
571571
ItemPath = library.Path;
572572
ItemNameRaw = library.Text;
573573
PrimaryItemAttribute = StorageItemTypes.Folder;
574-
ItemType = "ItemTypeLibrary".GetLocalizedResource();
574+
ItemType = "Library".GetLocalizedResource();
575575
LoadCustomIcon = true;
576576
CustomIcon = library.Icon;
577577
//CustomIconSource = library.IconSource;

‎src/Files.App/Filesystem/StorageEnumerators/Win32StorageEnumerator.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ private static IEnumerable<ListedItem> EnumAdsForPath(string itemPath, ListedIte
139139

140140
public static ListedItem GetAlternateStream((string Name, long Size) ads, ListedItem main)
141141
{
142-
string itemType = "ItemTypeFile".GetLocalizedResource();
142+
string itemType = "File".GetLocalizedResource();
143143
string itemFileExtension = null;
144144
if (ads.Name.Contains('.'))
145145
{
@@ -253,7 +253,7 @@ CancellationToken cancellationToken
253253

254254
long itemSizeBytes = findData.GetSize();
255255
var itemSize = itemSizeBytes.ToSizeString();
256-
string itemType = "ItemTypeFile".GetLocalizedResource();
256+
string itemType = "File".GetLocalizedResource();
257257
string itemFileExtension = null;
258258

259259
if (findData.cFileName.Contains('.'))
@@ -293,7 +293,7 @@ CancellationToken cancellationToken
293293
ItemDateModifiedReal = itemModifiedDate,
294294
ItemDateAccessedReal = itemLastAccessDate,
295295
ItemDateCreatedReal = itemCreatedDate,
296-
ItemType = "ShortcutFileType".GetLocalizedResource(),
296+
ItemType = "Shortcut".GetLocalizedResource(),
297297
ItemPath = itemPath,
298298
FileSize = itemSize,
299299
FileSizeBytes = itemSizeBytes,
@@ -322,7 +322,7 @@ CancellationToken cancellationToken
322322
ItemDateModifiedReal = itemModifiedDate,
323323
ItemDateAccessedReal = itemLastAccessDate,
324324
ItemDateCreatedReal = itemCreatedDate,
325-
ItemType = isUrl ? "ShortcutWebLinkFileType".GetLocalizedResource() : "ShortcutFileType".GetLocalizedResource(),
325+
ItemType = isUrl ? "ShortcutWebLinkFileType".GetLocalizedResource() : "Shortcut".GetLocalizedResource(),
326326
ItemPath = itemPath,
327327
FileSize = itemSize,
328328
FileSizeBytes = itemSizeBytes,

‎src/Files.App/Filesystem/StorageItems/FtpStorageFile.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public override string DisplayType
2828
{
2929
get
3030
{
31-
var itemType = "ItemTypeFile".GetLocalizedResource();
31+
var itemType = "File".GetLocalizedResource();
3232
if (Name.Contains('.', StringComparison.Ordinal))
3333
{
3434
itemType = IO.Path.GetExtension(Name).Trim('.') + " " + itemType;

‎src/Files.App/Filesystem/StorageItems/NativeStorageFile.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public override string DisplayType
3535
{
3636
get
3737
{
38-
var itemType = "ItemTypeFile".GetLocalizedResource();
38+
var itemType = "File".GetLocalizedResource();
3939

4040
if (Name.Contains('.', StringComparison.Ordinal))
4141
itemType = IO.Path.GetExtension(Name).Trim('.') + " " + itemType;

0 commit comments

Comments
 (0)