Skip to content

Code Quality: Convert Multiple Localized Strings to ICU Message Format | Fix word order problem #15520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 2, 2024
Merged

Code Quality: Convert Multiple Localized Strings to ICU Message Format | Fix word order problem #15520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cf2b783
Fix: ConflictingItemsDialogSubtitleConflictsNonConflicts
XTorLukas May 31, 2024
c0eec69
Fix: PropertiesFilesAndFoldersAndLocationsCountString
XTorLukas May 31, 2024
e857940
Update BaseProperties.cs
XTorLukas May 31, 2024
780af0e
Fix: Remove `String`
XTorLukas May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Files.App/Strings/en-US/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,8 @@
<data name="PropertiesFilesAndFoldersCountString" xml:space="preserve">
<value>{0, number} {0, plural, one {file} other {files}}, {1, number} {1, plural, one {folder} other {folders}}</value>
</data>
<data name="PropertiesLocationsCountString" xml:space="preserve">
<value>from {0, number} {0, plural, one {location} other {locations}}</value>
<data name="PropertiesFilesAndFoldersAndLocationsCount" xml:space="preserve">
<value>{0, number} {0, plural, one {file} other {files}}, {1, number} {1, plural, one {folder} other {folders}} from {2, number} {2, plural, one {location} other {locations}}</value>
</data>
<data name="BaseLayoutContextFlyoutRunAsAnotherUser.Text" xml:space="preserve">
<value>Run as another user</value>
Expand Down Expand Up @@ -1239,7 +1239,7 @@
<value>{0, plural, one {There is one conflicting file name} other {There are # conflicting file names}}</value>
</data>
<data name="ConflictingItemsDialogSubtitleConflictsNonConflicts" xml:space="preserve">
<value>{0, plural, one {, and one outgoing item} other {, and # outgoing items}}</value>
<value>{0, plural, one {There is one conflicting file name} other {There are # conflicting file names}}, and {1, plural, one {one outgoing item} other {# outgoing items}}</value>
</data>
<data name="ConflictingItemsDialogTitle" xml:space="preserve">
<value>Conflicting {0, plural, one {file name} other {file names}}</value>
Expand Down
10 changes: 3 additions & 7 deletions src/Files.App/ViewModels/Dialogs/FileSystemDialog/FileSystemDialogViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,10 @@ public static FileSystemDialogViewModel GetDialogViewModel(FileSystemDialogMode
{
titleText = "ConflictingItemsDialogTitle".GetLocalizedFormatResource(totalCount);

var descriptionLocalized = new StringBuilder();
descriptionLocalized.Append("ConflictingItemsDialogSubtitleConflicts".GetLocalizedFormatResource(conflictingItems.Count));
descriptionText = nonConflictingItems.Count > 0
? "ConflictingItemsDialogSubtitleConflictsNonConflicts".GetLocalizedFormatResource(conflictingItems.Count, nonConflictingItems.Count)
: "ConflictingItemsDialogSubtitleConflicts".GetLocalizedFormatResource(conflictingItems.Count);

if (nonConflictingItems.Count > 0)
descriptionLocalized.Append("ConflictingItemsDialogSubtitleConflictsNonConflicts".GetLocalizedFormatResource(nonConflictingItems.Count));

descriptionLocalized.Append('.');
descriptionText = descriptionLocalized.ToString();
primaryButtonText = "ConflictingItemsDialogPrimaryButtonText".ToLocalized();
secondaryButtonText = "Cancel".ToLocalized();
}
Expand Down
14 changes: 3 additions & 11 deletions src/Files.App/ViewModels/Properties/Items/BaseProperties.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using Microsoft.UI.Dispatching;
using System.IO;
using System.Text;
using Windows.Storage.FileProperties;
using static Files.App.Helpers.Win32Helper;
using FileAttributes = System.IO.FileAttributes;
Expand Down Expand Up @@ -122,16 +121,9 @@ await Dispatcher.EnqueueOrInvokeAsync(() =>

public void SetItemsCountString()
{
var resourceText = new StringBuilder();
resourceText.Append("PropertiesFilesAndFoldersCountString".GetLocalizedFormatResource(ViewModel.FilesCount, ViewModel.FoldersCount));

if (ViewModel.LocationsCount > 0)
{
resourceText.Append(' ');
resourceText.Append("PropertiesLocationsCountString".GetLocalizedFormatResource(ViewModel.LocationsCount));
}

ViewModel.FilesAndFoldersCountString = resourceText.ToString();
ViewModel.FilesAndFoldersCountString = ViewModel.LocationsCount > 0
? "PropertiesFilesAndFoldersAndLocationsCount".GetLocalizedFormatResource(ViewModel.FilesCount, ViewModel.FoldersCount, ViewModel.LocationsCount)
: "PropertiesFilesAndFoldersCountString".GetLocalizedFormatResource(ViewModel.FilesCount, ViewModel.FoldersCount);
}
}
}