Skip to content

Commit 660a9d0

Browse files
LamparterLamparter
committed
Files.App.Utils
1 parent 383d82c commit 660a9d0

23 files changed

+115
-115
lines changed

‎src/Files.App/Utils/Cloud/CloudDriveSyncStatusUI.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public sealed partial class CloudDriveSyncStatusUI : ObservableObject
1616

1717
public bool LoadSyncStatus { get; }
1818

19-
public string SyncStatusString { get; } = "CloudDriveSyncStatus_Unknown".GetLocalizedResource();
19+
public string SyncStatusString { get; } = Strings.CloudDriveSyncStatus_Unknown.GetLocalizedResource();
2020

2121
public CloudDriveSyncStatusUI()
2222
{

‎src/Files.App/Utils/FileTags/FileTagsHelper.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ public static async void WriteFileTag(string filePath, string[] tag)
4242
{
4343
ContentDialog dialog = new()
4444
{
45-
Title = "ErrorApplyingTagTitle".GetLocalizedResource(),
46-
Content = "ErrorApplyingTagContent".GetLocalizedResource(),
45+
Title = Strings.ErrorApplyingTagTitle.GetLocalizedResource(),
46+
Content = Strings.ErrorApplyingTagContent.GetLocalizedResource(),
4747
PrimaryButtonText = "Ok".GetLocalizedResource()
4848
};
4949

‎src/Files.App/Utils/Git/GitHelpers.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -442,9 +442,9 @@ public static async Task PullOriginAsync(string? repositoryPath)
442442
{
443443
var viewModel = new DynamicDialogViewModel()
444444
{
445-
TitleText = "GitError".GetLocalizedResource(),
446-
SubtitleText = "PullTimeoutError".GetLocalizedResource(),
447-
CloseButtonText = "Close".GetLocalizedResource(),
445+
TitleText = Strings.GitError.GetLocalizedResource(),
446+
SubtitleText = Strings.PullTimeoutError.GetLocalizedResource(),
447+
CloseButtonText = Strings.Close.GetLocalizedResource(),
448448
DynamicButtons = DynamicDialogButtons.Cancel
449449
};
450450
var dialog = new DynamicDialog(viewModel);
@@ -570,7 +570,7 @@ public static async Task RequireGitAuthenticationAsync()
570570
var expiresIn = codeJsonContent.RootElement.GetProperty("expires_in").GetInt32();
571571

572572
var loginCTS = new CancellationTokenSource();
573-
var viewModel = new GitHubLoginDialogViewModel(userCode, "ConnectGitHubDescription".GetLocalizedResource(), loginCTS);
573+
var viewModel = new GitHubLoginDialogViewModel(userCode, Strings.ConnectGitHubDescription.GetLocalizedResource(), loginCTS);
574574

575575
var dialog = _dialogService.GetDialog(viewModel);
576576
var loginDialogTask = dialog.TryShowAsync();
@@ -621,7 +621,7 @@ public static async Task RequireGitAuthenticationAsync()
621621
GIT_RESOURCE_USERNAME,
622622
token);
623623

624-
viewModel.Subtitle = "AuthorizationSucceded".GetLocalizedResource();
624+
viewModel.Subtitle = Strings.AuthorizationSucceded.GetLocalizedResource();
625625
viewModel.LoginConfirmed = true;
626626
}
627627
catch (Exception ex)
@@ -687,10 +687,10 @@ public static GitItemModel GetGitInformationForItem(Repository repository, strin
687687
{
688688
changeKindHumanized = changeKind switch
689689
{
690-
ChangeKind.Added => "Added".GetLocalizedResource(),
691-
ChangeKind.Deleted => "Deleted".GetLocalizedResource(),
692-
ChangeKind.Modified => "Modified".GetLocalizedResource(),
693-
ChangeKind.Untracked => "Untracked".GetLocalizedResource(),
690+
ChangeKind.Added => Strings.Added.GetLocalizedResource(),
691+
ChangeKind.Deleted => Strings.Deleted.GetLocalizedResource(),
692+
ChangeKind.Modified => Strings.Modified.GetLocalizedResource(),
693+
ChangeKind.Untracked => Strings.Untracked.GetLocalizedResource(),
694694
_ => null,
695695
};
696696
}

‎src/Files.App/Utils/Library/LibraryManager.cs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -255,20 +255,20 @@ public async Task<LibraryLocationItem> UpdateLibrary(string libraryPath, string
255255
{
256256
if (string.IsNullOrWhiteSpace(name))
257257
{
258-
return (false, "ErrorInputEmpty".GetLocalizedResource());
258+
return (false, Strings.ErrorInputEmpty.GetLocalizedResource());
259259
}
260260
if (FilesystemHelpers.ContainsRestrictedCharacters(name))
261261
{
262-
return (false, "ErrorNameInputRestrictedCharacters".GetLocalizedResource());
262+
return (false, Strings.ErrorNameInputRestrictedCharacters.GetLocalizedResource());
263263
}
264264
if (FilesystemHelpers.ContainsRestrictedFileName(name))
265265
{
266-
return (false, "ErrorNameInputRestricted".GetLocalizedResource());
266+
return (false, Strings.ErrorNameInputRestricted.GetLocalizedResource());
267267
}
268268
if (Libraries.Any((item) => string.Equals(name, item.Text, StringComparison.OrdinalIgnoreCase) ||
269269
string.Equals(name, Path.GetFileNameWithoutExtension(item.Path), StringComparison.OrdinalIgnoreCase)))
270270
{
271-
return (false, "CreateLibraryErrorAlreadyExists".GetLocalizedResource());
271+
return (false, Strings.CreateLibraryErrorAlreadyExists.GetLocalizedResource());
272272
}
273273
return (true, string.Empty);
274274
}
@@ -277,10 +277,10 @@ public static async Task ShowRestoreDefaultLibrariesDialogAsync()
277277
{
278278
var dialog = new DynamicDialog(new DynamicDialogViewModel
279279
{
280-
TitleText = "DialogRestoreLibrariesTitleText".GetLocalizedResource(),
281-
SubtitleText = "DialogRestoreLibrariesSubtitleText".GetLocalizedResource(),
282-
PrimaryButtonText = "Restore".GetLocalizedResource(),
283-
CloseButtonText = "Cancel".GetLocalizedResource(),
280+
TitleText = Strings.DialogRestoreLibrariesTitleText.GetLocalizedResource(),
281+
SubtitleText = Strings.DialogRestoreLibrariesSubtitleText.GetLocalizedResource(),
282+
PrimaryButtonText = Strings.Restore.GetLocalizedResource(),
283+
CloseButtonText = Strings.Cancel.GetLocalizedResource(),
284284
PrimaryButtonAction = async (vm, e) =>
285285
{
286286
await ContextMenu.InvokeVerb("restorelibraries", ShellLibraryItem.LibrariesPath);
@@ -303,7 +303,7 @@ public static async Task ShowCreateNewLibraryDialogAsync()
303303
{
304304
var inputText = new TextBox
305305
{
306-
PlaceholderText = "FolderWidgetCreateNewLibraryInputPlaceholderText".GetLocalizedResource()
306+
PlaceholderText = Strings.FolderWidgetCreateNewLibraryInputPlaceholderText.GetLocalizedResource()
307307
};
308308
var tipText = new TextBlock
309309
{
@@ -328,10 +328,10 @@ public static async Task ShowCreateNewLibraryDialogAsync()
328328
}
329329
}
330330
},
331-
TitleText = "FolderWidgetCreateNewLibraryDialogTitleText".GetLocalizedResource(),
332-
SubtitleText = "SideBarCreateNewLibrary/Text".GetLocalizedResource(),
333-
PrimaryButtonText = "Create".GetLocalizedResource(),
334-
CloseButtonText = "Cancel".GetLocalizedResource(),
331+
TitleText = Strings.FolderWidgetCreateNewLibraryDialogTitleText.GetLocalizedResource(),
332+
SubtitleText = Strings.SideBarCreateNewLibrary_Text.GetLocalizedResource(),
333+
PrimaryButtonText = Strings.Create.GetLocalizedResource(),
334+
CloseButtonText = Strings.Cancel.GetLocalizedResource(),
335335
PrimaryButtonAction = async (vm, e) =>
336336
{
337337
var (result, reason) = App.LibraryManager.CanCreateLibrary(inputText.Text);

‎src/Files.App/Utils/Shell/ShellHelpers.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ public static string GetShellNameFromPath(string shPath)
2828
{
2929
return shPath switch
3030
{
31-
"Home" => "Home".GetLocalizedResource(),
32-
Constants.UserEnvironmentPaths.RecycleBinPath => "RecycleBin".GetLocalizedResource(),
33-
Constants.UserEnvironmentPaths.NetworkFolderPath => "Network".GetLocalizedResource(),
34-
Constants.UserEnvironmentPaths.MyComputerPath => "ThisPC".GetLocalizedResource(),
31+
"Home" => Strings.Home.GetLocalizedResource(),
32+
Constants.UserEnvironmentPaths.RecycleBinPath => Strings.RecycleBin.GetLocalizedResource(),
33+
Constants.UserEnvironmentPaths.NetworkFolderPath => Strings.Network.GetLocalizedResource(),
34+
Constants.UserEnvironmentPaths.MyComputerPath => Strings.ThisPC.GetLocalizedResource(),
3535
_ => shPath
3636
};
3737
}

‎src/Files.App/Utils/StatusCenter/StatusCenterItem.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ public StatusCenterItem(
199199
AnimatedIconState = "NormalOff";
200200
SpeedGraphValues = [];
201201
CancelCommand = new RelayCommand(ExecuteCancelCommand);
202-
Message = "ProcessingItems".GetLocalizedResource();
202+
Message = Strings.ProcessingItems.GetLocalizedResource();
203203
Source = source;
204204
Destination = destination;
205205

@@ -296,15 +296,15 @@ private void ReportProgress(StatusCenterItemProgressModel value)
296296
{
297297
Message =
298298
$"{string.Format(
299-
"StatusCenter_ProcessedItems_Header".GetLocalizedResource(),
299+
Strings.StatusCenter_ProcessedItems_Header.GetLocalizedResource(),
300300
value.ProcessedItemsCount,
301301
value.ItemsCount)}";
302302
}
303303
else
304304
{
305305
Message =
306306
$"{string.Format(
307-
"StatusCenter_ProcessedSize_Header".GetLocalizedResource(),
307+
Strings.StatusCenter_ProcessedSize_Header.GetLocalizedResource(),
308308
value.ProcessedSize.ToSizeString(),
309309
value.TotalSize.ToSizeString())}";
310310
}
@@ -393,7 +393,7 @@ public void ExecuteCancelCommand()
393393
IsCancelable = false;
394394
IsExpanded = false;
395395
IsSpeedAndProgressAvailable = false;
396-
Header = $"{"Canceling".GetLocalizedResource()} - {Header}";
396+
Header = $"{Strings.Canceling.GetLocalizedResource()} - {Header}";
397397
}
398398
}
399399
}

‎src/Files.App/Utils/Storage/Collection/GroupedCollection.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ private void GroupedCollection_PropertyChanged(object sender, PropertyChangedEve
4343
{
4444
Model.CountText = string.Format(
4545
Count > 1
46-
? "GroupItemsCount_Plural".GetLocalizedResource()
47-
: "GroupItemsCount_Singular".GetLocalizedResource(),
46+
? Strings.GroupItemsCount_Plural.GetLocalizedResource()
47+
: Strings.GroupItemsCount_Singular.GetLocalizedResource(),
4848
Count);
4949
}
5050
}

‎src/Files.App/Utils/Storage/Collection/GroupingHelper.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public static (Action<GroupedCollection<ListedItem>>, Action<GroupedCollection<L
9292
{
9393
ListedItem first = x.FirstOrDefault();
9494
x.Model.ShowCountTextBelow = true;
95-
x.Model.Text = first.FileTagsUI?.FirstOrDefault()?.Name ?? "Untagged".GetLocalizedResource();
95+
x.Model.Text = first.FileTagsUI?.FirstOrDefault()?.Name ?? Strings.Untagged.GetLocalizedResource();
9696
//x.Model.Icon = first.FileTagsUI?.FirstOrDefault()?.Color;
9797
}, null),
9898

@@ -141,7 +141,7 @@ public static (string key, string text, string range, int index) GetGroupSizeInf
141141
lastSizeStr = sizeGp.sizeText;
142142
}
143143

144-
return ("0", "ItemSizeText_Tiny".GetLocalizedResource(), $"{"0 B".ConvertSizeAbbreviation()} - {lastSizeStr}", 0);
144+
return ("0", Strings.ItemSizeText_Tiny.GetLocalizedResource(), $"{"0 B".ConvertSizeAbbreviation()} - {lastSizeStr}", 0);
145145
}
146146

147147
public static string GetGroupSizeKey(long size)
@@ -159,11 +159,11 @@ public static string GetGroupSizeKey(long size)
159159

160160
private static readonly (long size, string text, string sizeText)[] sizeGroups =
161161
[
162-
(5000000000, "ItemSizeText_Huge".GetLocalizedResource(), "5 GiB".ConvertSizeAbbreviation()),
163-
(1000000000, "ItemSizeText_VeryLarge".GetLocalizedResource(), "1 GiB".ConvertSizeAbbreviation()),
164-
(128000000, "ItemSizeText_Large".GetLocalizedResource(), "128 MiB".ConvertSizeAbbreviation()),
165-
(1000000, "ItemSizeText_Medium".GetLocalizedResource(), "1 MiB".ConvertSizeAbbreviation()),
166-
(16000, "ItemSizeText_Small".GetLocalizedResource(), "16 KiB".ConvertSizeAbbreviation()),
162+
(5000000000, Strings.ItemSizeText_Huge.GetLocalizedResource(), "5 GiB".ConvertSizeAbbreviation()),
163+
(1000000000, Strings.ItemSizeText_VeryLarge.GetLocalizedResource(), "1 GiB".ConvertSizeAbbreviation()),
164+
(128000000, Strings.ItemSizeText_Large.GetLocalizedResource(), "128 MiB".ConvertSizeAbbreviation()),
165+
(1000000, Strings.ItemSizeText_Medium.GetLocalizedResource(), "1 MiB".ConvertSizeAbbreviation()),
166+
(16000, Strings.ItemSizeText_Small.GetLocalizedResource(), "16 KiB".ConvertSizeAbbreviation()),
167167
];
168168

169169
private static string GetFolderName(string path)

‎src/Files.App/Utils/Storage/Enumerators/Win32StorageEnumerator.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public static class Win32StorageEnumerator
1515
private static readonly ISizeProvider folderSizeProvider = Ioc.Default.GetService<ISizeProvider>();
1616
private static readonly IStorageCacheService fileListCache = Ioc.Default.GetRequiredService<IStorageCacheService>();
1717

18-
private static readonly string folderTypeTextLocalized = "Folder".GetLocalizedResource();
18+
private static readonly string folderTypeTextLocalized = Strings.Folder.GetLocalizedResource();
1919

2020
public static async Task<List<ListedItem>> ListEntries(
2121
string path,
@@ -112,7 +112,7 @@ private static IEnumerable<ListedItem> EnumAdsForPath(string itemPath, ListedIte
112112

113113
public static ListedItem GetAlternateStream((string Name, long Size) ads, ListedItem main)
114114
{
115-
string itemType = "File".GetLocalizedResource();
115+
string itemType = Strings.File.GetLocalizedResource();
116116
string itemFileExtension = null;
117117

118118
if (ads.Name.Contains('.'))
@@ -250,7 +250,7 @@ CancellationToken cancellationToken
250250

251251
long itemSizeBytes = findData.GetSize();
252252
var itemSize = itemSizeBytes.ToSizeString();
253-
string itemType = "File".GetLocalizedResource();
253+
string itemType = Strings.File.GetLocalizedResource();
254254
string itemFileExtension = null;
255255

256256
if (findData.cFileName.Contains('.'))
@@ -289,7 +289,7 @@ CancellationToken cancellationToken
289289
ItemDateModifiedReal = itemModifiedDate,
290290
ItemDateAccessedReal = itemLastAccessDate,
291291
ItemDateCreatedReal = itemCreatedDate,
292-
ItemType = "Shortcut".GetLocalizedResource(),
292+
ItemType = Strings.Shortcut.GetLocalizedResource(),
293293
ItemPath = itemPath,
294294
FileSize = itemSize,
295295
FileSizeBytes = itemSizeBytes,
@@ -311,7 +311,7 @@ CancellationToken cancellationToken
311311
ItemDateModifiedReal = itemModifiedDate,
312312
ItemDateAccessedReal = itemLastAccessDate,
313313
ItemDateCreatedReal = itemCreatedDate,
314-
ItemType = "Shortcut".GetLocalizedResource(),
314+
ItemType = Strings.Shortcut.GetLocalizedResource(),
315315
ItemPath = itemPath,
316316
FileSize = itemSize,
317317
FileSizeBytes = itemSizeBytes,
@@ -342,7 +342,7 @@ CancellationToken cancellationToken
342342
ItemDateModifiedReal = itemModifiedDate,
343343
ItemDateAccessedReal = itemLastAccessDate,
344344
ItemDateCreatedReal = itemCreatedDate,
345-
ItemType = isUrl ? "ShortcutWebLinkFileType".GetLocalizedResource() : "Shortcut".GetLocalizedResource(),
345+
ItemType = isUrl ? Strings.ShortcutWebLinkFileType.GetLocalizedResource() : Strings.Shortcut.GetLocalizedResource(),
346346
ItemPath = itemPath,
347347
FileSize = itemSize,
348348
FileSizeBytes = itemSizeBytes,
@@ -368,7 +368,7 @@ CancellationToken cancellationToken
368368
ItemDateModifiedReal = itemModifiedDate,
369369
ItemDateAccessedReal = itemLastAccessDate,
370370
ItemDateCreatedReal = itemCreatedDate,
371-
ItemType = isUrl ? "ShortcutWebLinkFileType".GetLocalizedResource() : "Shortcut".GetLocalizedResource(),
371+
ItemType = isUrl ? Strings.ShortcutWebLinkFileType.GetLocalizedResource() : Strings.Shortcut.GetLocalizedResource(),
372372
ItemPath = itemPath,
373373
FileSize = itemSize,
374374
FileSizeBytes = itemSizeBytes,

‎src/Files.App/Utils/Storage/Helpers/DriveHelpers.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ public static async Task<bool> CheckEmptyDrive(string? drivePath)
4242
return false;
4343

4444
var ejectButton = await DialogDisplayHelper.ShowDialogAsync(
45-
"InsertDiscDialog/Title".GetLocalizedResource(),
46-
string.Format("InsertDiscDialog/Text".GetLocalizedResource(), matchingDrive.Path),
47-
"InsertDiscDialog/OpenDriveButton".GetLocalizedResource(),
48-
"Close".GetLocalizedResource());
45+
Strings.InsertDiscDialog_Title.GetLocalizedResource(),
46+
string.Format(Strings.InsertDiscDialog_Text.GetLocalizedResource(), matchingDrive.Path),
47+
Strings.InsertDiscDialog_OpenDriveButton.GetLocalizedResource(),
48+
Strings.Close.GetLocalizedResource());
4949
if (ejectButton)
5050
EjectDeviceAsync(matchingDrive.Path);
5151
return true;

0 commit comments

Comments
 (0)