imp - Loop through resources for localization

AptiviCEO · AptiviCEO · commit e5050d555a8f · 2025-10-27T12:02:36.000+03:00
---

We need to loop through resources for localization.

---

Type: imp
Breaking: False
Doc Required: False
Backport Required: False
Part: 1/1
diff --git a/public/VisualCard.Calendar/Languages/LanguageTools.cs b/public/VisualCard.Calendar/Languages/LanguageTools.cs
@@ -17,16 +17,20 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 //
 
+using ResourceLab.Management;
 using MainLangTools = VisualCard.Common.Languages.LanguageTools;
 
 namespace VisualCard.Calendar.Languages
 {
     internal static class LanguageTools
     {
+        private const string LocalName = "VisualCard.Calendar";
+
         internal static string GetLocalized(string id)
         {
-            if (!MainLangTools.resourceManagers.ContainsKey("VisualCard.Calendar"))
-                MainLangTools.resourceManagers.Add("VisualCard.Calendar", new("VisualCard.Calendar.Resources.Languages.Output.Localizations", typeof(LanguageTools).Assembly));
+            // Add local resource
+            if (!ResourcesManager.ResourceManagerExists(LocalName))
+                ResourcesManager.AddResourceManager(LocalName, new($"{LocalName}.Resources.Languages.Output.Localizations", typeof(LanguageTools).Assembly));
             return MainLangTools.GetLocalized(id);
         }
     }
diff --git a/public/VisualCard.Calendar/VisualCard.Calendar.csproj b/public/VisualCard.Calendar/VisualCard.Calendar.csproj
@@ -29,8 +29,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aptivestigate.Serilog" Version="1.3.1" />
-    <PackageReference Include="Textify.Offline" Version="2.13.3" />
+    <PackageReference Include="Aptivestigate.Serilog" Version="1.3.2" />
+    <PackageReference Include="Textify.Offline" Version="2.13.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/public/VisualCard.Common/Languages/LanguageTools.cs b/public/VisualCard.Common/Languages/LanguageTools.cs
@@ -17,25 +17,33 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 //
 
-using System.Collections.Generic;
-using System.Resources;
+using ResourceLab.Management;
 
 namespace VisualCard.Common.Languages
 {
     internal static class LanguageTools
     {
-        internal static readonly Dictionary<string, ResourceManager> resourceManagers = new()
-        {
-            { "VisualCard.Common", new("VisualCard.Common.Resources.Languages.Output.Localizations", typeof(LanguageTools).Assembly) }
-        };
+        private const string LocalName = "VisualCard.Common";
 
         internal static string GetLocalized(string id)
         {
-            foreach (var resourceManager in resourceManagers.Values)
+            // Add local resource
+            if (!ResourcesManager.ResourceManagerExists(LocalName))
+                ResourcesManager.AddResourceManager(LocalName, new($"{LocalName}.Resources.Languages.Output.Localizations", typeof(LanguageTools).Assembly));
+
+            // Loop through all resource managers
+            foreach (var resourceManager in ResourcesManager.ResourceManagers.Values)
             {
-                string resourceLocalization = resourceManager.GetString(id);
-                if (!string.IsNullOrEmpty(resourceLocalization))
-                    return resourceLocalization;
+                try
+                {
+                    string resourceLocalization = resourceManager.GetString(id);
+                    if (!string.IsNullOrEmpty(resourceLocalization))
+                        return resourceLocalization;
+                }
+                catch
+                {
+                    return id;
+                }
             }
             return id;
         }
diff --git a/public/VisualCard.Common/VisualCard.Common.csproj b/public/VisualCard.Common/VisualCard.Common.csproj
@@ -29,10 +29,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aptivestigate.Serilog" Version="1.3.1" />
+    <PackageReference Include="Aptivestigate.Serilog" Version="1.3.2" />
+    <PackageReference Include="ResourceLab" Version="1.0.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
-    <PackageReference Include="Textify.Offline" Version="2.13.3" />
-    <PackageReference Include="Textify.Offline.Data" Version="2.13.3" />
+    <PackageReference Include="Textify.Offline" Version="2.13.4" />
+    <PackageReference Include="Textify.Offline.Data" Version="2.13.4" />
   </ItemGroup>
 
 </Project>
diff --git a/public/VisualCard.Extras/Languages/LanguageTools.cs b/public/VisualCard.Extras/Languages/LanguageTools.cs
@@ -17,16 +17,20 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 //
 
+using ResourceLab.Management;
 using MainLangTools = VisualCard.Common.Languages.LanguageTools;
 
 namespace VisualCard.Extras.Languages
 {
     internal static class LanguageTools
     {
+        private const string LocalName = "VisualCard.Extras";
+
         internal static string GetLocalized(string id)
         {
-            if (!MainLangTools.resourceManagers.ContainsKey("VisualCard.Extras"))
-                MainLangTools.resourceManagers.Add("VisualCard.Extras", new("VisualCard.Extras.Resources.Languages.Output.Localizations", typeof(LanguageTools).Assembly));
+            // Add local resource
+            if (!ResourcesManager.ResourceManagerExists(LocalName))
+                ResourcesManager.AddResourceManager(LocalName, new($"{LocalName}.Resources.Languages.Output.Localizations", typeof(LanguageTools).Assembly));
             return MainLangTools.GetLocalized(id);
         }
     }
diff --git a/public/VisualCard.Extras/VisualCard.Extras.csproj b/public/VisualCard.Extras/VisualCard.Extras.csproj
@@ -29,9 +29,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aptivestigate.Serilog" Version="1.3.1" />
+    <PackageReference Include="Aptivestigate.Serilog" Version="1.3.2" />
     <PackageReference Include="Microsoft.Data.Sqlite.Core" Version="9.0.6" />
-    <PackageReference Include="Nettify" Version="1.7.1" />
+    <PackageReference Include="Nettify" Version="1.7.2" />
     <PackageReference Include="QRCoder" Version="1.6.0" />
   </ItemGroup>
 
diff --git a/public/VisualCard/Languages/LanguageTools.cs b/public/VisualCard/Languages/LanguageTools.cs
@@ -17,16 +17,20 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 //
 
+using ResourceLab.Management;
 using MainLangTools = VisualCard.Common.Languages.LanguageTools;
 
 namespace VisualCard.Languages
 {
     internal static class LanguageTools
     {
+        private const string LocalName = "VisualCard";
+
         internal static string GetLocalized(string id)
         {
-            if (!MainLangTools.resourceManagers.ContainsKey("VisualCard"))
-                MainLangTools.resourceManagers.Add("VisualCard", new("VisualCard.Resources.Languages.Output.Localizations", typeof(LanguageTools).Assembly));
+            // Add local resource
+            if (!ResourcesManager.ResourceManagerExists(LocalName))
+                ResourcesManager.AddResourceManager(LocalName, new($"{LocalName}.Resources.Languages.Output.Localizations", typeof(LanguageTools).Assembly));
             return MainLangTools.GetLocalized(id);
         }
     }
diff --git a/public/VisualCard/VisualCard.csproj b/public/VisualCard/VisualCard.csproj
@@ -26,9 +26,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aptivestigate.Serilog" Version="1.3.1" />
-    <PackageReference Include="Textify.Offline" Version="2.13.3" />
-    <PackageReference Include="Textify.Offline.Data" Version="2.13.3" />
+    <PackageReference Include="Aptivestigate.Serilog" Version="1.3.2" />
+    <PackageReference Include="Textify.Offline" Version="2.13.4" />
+    <PackageReference Include="Textify.Offline.Data" Version="2.13.4" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -17,16 +17,20 @@`
`17`	`17`	`// along with this program. If not, see <https://www.gnu.org/licenses/>.`
`18`	`18`	`//`
`19`	`19`
	`20`	`+using ResourceLab.Management;`
`20`	`21`	`using MainLangTools = VisualCard.Common.Languages.LanguageTools;`
`21`	`22`
`22`	`23`	`namespace VisualCard.Calendar.Languages`
`23`	`24`	`{`
`24`	`25`	`internal static class LanguageTools`
`25`	`26`	`{`
	`27`	`+ private const string LocalName = "VisualCard.Calendar";`
	`28`	`+`
`26`	`29`	`internal static string GetLocalized(string id)`
`27`	`30`	`{`
`28`		`- if (!MainLangTools.resourceManagers.ContainsKey("VisualCard.Calendar"))`
`29`		`- MainLangTools.resourceManagers.Add("VisualCard.Calendar", new("VisualCard.Calendar.Resources.Languages.Output.Localizations", typeof(LanguageTools).Assembly));`
	`31`	`+ // Add local resource`
	`32`	`+ if (!ResourcesManager.ResourceManagerExists(LocalName))`
	`33`	`+ ResourcesManager.AddResourceManager(LocalName, new($"{LocalName}.Resources.Languages.Output.Localizations", typeof(LanguageTools).Assembly));`
`30`	`34`	`return MainLangTools.GetLocalized(id);`
`31`	`35`	`}`
`32`	`36`	`}`