Skip to content

Commit

Permalink
imp - Also check the known addons list
Browse files Browse the repository at this point in the history 
---

The known addons list contains some localizable properties, so check them as well.

---

Type: imp
Breaking: False
Doc Required: False
Backport Required: False
Part: 1/1
  • Loading branch information
@AptiviCEO
AptiviCEO committed Sep 9, 2024
1 parent 31a484f commit 115c808
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 0 deletions.
6 changes: 6 additions & 0 deletions private/Nitrocid.LocaleChecker/Localization/UnlocalizedStringAnalyzer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ private void AnalyzeResourceLocalization(CompilationAnalysisContext context)
// Check the description and the display
string description = ((string?)settingsEntryList["Desc"] ?? "").Replace("\\\"", "\"");
string displayAs = ((string?)settingsEntryList["DisplayAs"] ?? "").Replace("\\\"", "\"");
string knownAddonDisplay = ((string?)settingsEntryList["display"] ?? "").Replace("\\\"", "\"");
if (!string.IsNullOrEmpty(description) && !localizationList.Contains(description))
{
var diagnostic = Diagnostic.Create(Rule, null, description);
Expand All @@ -255,6 +256,11 @@ private void AnalyzeResourceLocalization(CompilationAnalysisContext context)
var diagnostic = Diagnostic.Create(Rule, null, displayAs);
context.ReportDiagnostic(diagnostic);
}
if (!string.IsNullOrEmpty(knownAddonDisplay) && !localizationList.Contains(knownAddonDisplay))
{
var diagnostic = Diagnostic.Create(Rule, null, knownAddonDisplay);
context.ReportDiagnostic(diagnostic);
}

// Now, check the keys
JArray? keys = (JArray?)settingsEntryList["Keys"];
Expand Down
1 change: 1 addition & 0 deletions private/Nitrocid.LocaleChecker/Nitrocid.LocaleChecker.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
<EmbeddedResource Include="..\..\public\Nitrocid\Resources\Themes\*.json" Visible="false" />
<EmbeddedResource Include="..\..\public\Nitrocid.Addons\**\Resources\*Settings.json" Visible="false" />
<EmbeddedResource Include="..\..\public\Nitrocid.Addons\Nitrocid.ThemePacks\Resources\Themes\*.json" Visible="false" />
<EmbeddedResource Include="..\..\private\Nitrocid.Generators\Nitrocid.Generators.KnownAddons\Resources\KnownAddons.json" Visible="false" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions private/Nitrocid.LocaleCheckerStandalone/Analyzers/LocalizableResourcesAnalyzer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ internal static string[] GetUnlocalizedStrings()
// Check the description and the display
string description = ((string?)settingsEntryList["Desc"] ?? "").Replace("\\\"", "\"");
string displayAs = ((string?)settingsEntryList["DisplayAs"] ?? "").Replace("\\\"", "\"");
string knownAddonDisplay = ((string?)settingsEntryList["display"] ?? "").Replace("\\\"", "\"");
if (!string.IsNullOrEmpty(description) && !EntryPoint.localizationList.Contains(description))
{
TextWriterColor.WriteColor($"{nameof(NLOC0001)}Resources: {resourceName}: Unlocalized settings description found: {description}", true, ConsoleColors.Yellow);
Expand All @@ -82,6 +83,11 @@ internal static string[] GetUnlocalizedStrings()
TextWriterColor.WriteColor($"{nameof(NLOC0001)}Resources: {resourceName}: Unlocalized settings display found: {displayAs}", true, ConsoleColors.Yellow);
unlocalizedStrings.Add(displayAs);
}
if (!string.IsNullOrEmpty(knownAddonDisplay) && !EntryPoint.localizationList.Contains(knownAddonDisplay))
{
TextWriterColor.WriteColor($"{nameof(NLOC0001)}Resources: {resourceName}: Unlocalized known addon display found: {knownAddonDisplay}", true, ConsoleColors.Yellow);
unlocalizedStrings.Add(knownAddonDisplay);
}

// Now, check the keys
JArray? keys = (JArray?)settingsEntryList["Keys"];
Expand Down
1 change: 1 addition & 0 deletions private/Nitrocid.LocaleCheckerStandalone/Nitrocid.LocaleCheckerStandalone.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<EmbeddedResource Include="..\..\public\Nitrocid\Resources\Themes\*.json" Visible="false" />
<EmbeddedResource Include="..\..\public\Nitrocid.Addons\**\Resources\*Settings.json" Visible="false" />
<EmbeddedResource Include="..\..\public\Nitrocid.Addons\Nitrocid.ThemePacks\Resources\Themes\*.json" Visible="false" />
<EmbeddedResource Include="..\..\private\Nitrocid.Generators\Nitrocid.Generators.KnownAddons\Resources\KnownAddons.json" Visible="false" />
</ItemGroup>

</Project>
3 changes: 3 additions & 0 deletions private/Nitrocid.LocaleClean/Analyzers/LocalizableResourcesAnalyzer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,13 @@ internal static string[] GetLocalizedStrings()
// Check the description and the display
string description = ((string?)settingsEntryList["Desc"] ?? "").Replace("\\\"", "\"");
string displayAs = ((string?)settingsEntryList["DisplayAs"] ?? "").Replace("\\\"", "\"");
string knownAddonDisplay = ((string?)settingsEntryList["display"] ?? "").Replace("\\\"", "\"");
if (!string.IsNullOrEmpty(description) && EntryPoint.localizationList.Contains(description))
localizedStrings.Add(description);
if (!string.IsNullOrEmpty(displayAs) && EntryPoint.localizationList.Contains(displayAs))
localizedStrings.Add(displayAs);
if (!string.IsNullOrEmpty(knownAddonDisplay) && EntryPoint.localizationList.Contains(knownAddonDisplay))
localizedStrings.Add(knownAddonDisplay);

// Now, check the keys
JArray? keys = (JArray?)settingsEntryList["Keys"];
Expand Down
1 change: 1 addition & 0 deletions private/Nitrocid.LocaleClean/Nitrocid.LocaleClean.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
<EmbeddedResource Include="..\..\public\Nitrocid\Resources\Themes\*.json" Visible="false" />
<EmbeddedResource Include="..\..\public\Nitrocid.Addons\**\Resources\*Settings.json" Visible="false" />
<EmbeddedResource Include="..\..\public\Nitrocid.Addons\Nitrocid.ThemePacks\Resources\Themes\*.json" Visible="false" />
<EmbeddedResource Include="..\..\private\Nitrocid.Generators\Nitrocid.Generators.KnownAddons\Resources\KnownAddons.json" Visible="false" />
</ItemGroup>

</Project>

0 comments on commit 115c808

Please sign in to comment.