📄 Update copyright year #10

Author: xecrets

LICENSE.md

@@ -1,8 +1,8 @@
 MIT License
 ===========
 
-Copyright © 2024, Svante Seleborg
----------------------------------
+Copyright © 2022-2025 Svante Seleborg
+-------------------------------------
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
 associated documentation files (the “Software”), to deal in the Software without restriction,

src/Xecrets.Localization/ITranslationsProvider.cs

@@ -1,7 +1,7 @@
 #region Copyright and License
 
 /*
- * Xecrets Ez - Copyright © 2022-2024, Svante Seleborg, All Rights Reserved.
+ * Xecrets Ez - Copyright © 2022-2025 Svante Seleborg, All Rights Reserved.
  *
  * This code file is part of Xecrets Ez - A cross platform desktop application
  * for encryption, decryption and other file operations based on Xecrets Cli.
@@ -34,17 +34,16 @@
 
 using Karambolo.PO;
 
-namespace Xecrets.Localization
+namespace Xecrets.Localization;
+
+/// <summary>
+/// Provides translations from embedded .po files.
+/// </summary>
+public interface ITranslationsProvider
 {
     /// <summary>
-    /// Provides translations from embedded .po files.
+    /// Gets the catalogs of translations.
     /// </summary>
-    public interface ITranslationsProvider
-    {
-        /// <summary>
-        /// Gets the catalogs of translations.
-        /// </summary>
-        /// <returns></returns>
-        IReadOnlyDictionary<string, POCatalog> GetCatalogs();
-    }
+    /// <returns></returns>
+    IReadOnlyDictionary<string, POCatalog> GetCatalogs();
 }

src/Xecrets.Localization/POStringLocalizer.cs

@@ -1,7 +1,7 @@
 #region Copyright and License
 
 /*
- * Xecrets Ez - Copyright © 2022-2024, Svante Seleborg, All Rights Reserved.
+ * Xecrets Ez - Copyright © 2022-2025 Svante Seleborg, All Rights Reserved.
  *
  * This code file is part of Xecrets Ez - A cross platform desktop application
  * for encryption, decryption and other file operations based on Xecrets Cli.
@@ -38,138 +38,137 @@
 
 using System.Globalization;
 
-namespace Xecrets.Localization
+namespace Xecrets.Localization;
+
+/// <summary>
+/// Localizes strings using a <see cref="ITranslationsProvider"/>.
+/// </summary>
+/// <param name="translationsProvider"></param>
+/// <param name="location"></param>
+/// <param name="culture"></param>
+public sealed class POStringLocalizer(ITranslationsProvider translationsProvider, string location, CultureInfo? culture = null) : IStringLocalizer
 {
+    private readonly CultureInfo _culture = culture ?? CultureInfo.CurrentUICulture;
+
     /// <summary>
-    /// Localizes strings using a <see cref="ITranslationsProvider"/>.
+    /// Translates a string by name, falling back to the name if no translation is found.
     /// </summary>
-    /// <param name="translationsProvider"></param>
-    /// <param name="location"></param>
-    /// <param name="culture"></param>
-    public sealed class POStringLocalizer(ITranslationsProvider translationsProvider, string location, CultureInfo? culture = null) : IStringLocalizer
+    /// <param name="name">The string to translate, typically the english original.</param>
+    /// <returns>A translated string.</returns>
+    public LocalizedString this[string name]
     {
-        private readonly CultureInfo _culture = culture ?? CultureInfo.CurrentUICulture;
-
-        /// <summary>
-        /// Translates a string by name, falling back to the name if no translation is found.
-        /// </summary>
-        /// <param name="name">The string to translate, typically the english original.</param>
-        /// <returns>A translated string.</returns>
-        public LocalizedString this[string name]
+        get
         {
-            get
-            {
-                bool resourceNotFound = !TryGetTranslation(name, out var searchedLocation, out var value);
-                return new LocalizedString(name, value!, resourceNotFound, searchedLocation);
-            }
+            bool resourceNotFound = !TryGetTranslation(name, out var searchedLocation, out var value);
+            return new LocalizedString(name, value!, resourceNotFound, searchedLocation);
         }
+    }
 
-        /// <summary>
-        /// Translates a string by name, falling back to the name if no translation is found.
-        /// Also formats the string with the provided arguments.
-        /// </summary>
-        /// <param name="name">The string to translate, typically the english original.</param>
-        /// <param name="arguments">Arguments passed to string.Format()</param>
-        /// <returns>A translated string.</returns>
-        public LocalizedString this[string name, params object[] arguments]
+    /// <summary>
+    /// Translates a string by name, falling back to the name if no translation is found.
+    /// Also formats the string with the provided arguments.
+    /// </summary>
+    /// <param name="name">The string to translate, typically the english original.</param>
+    /// <param name="arguments">Arguments passed to string.Format()</param>
+    /// <returns>A translated string.</returns>
+    public LocalizedString this[string name, params object[] arguments]
+    {
+        get
         {
-            get
-            {
-                bool resourceNotFound = !TryGetTranslation(name, out string searchedLocation, out string value);
-                return new LocalizedString(name, string.Format(value!, arguments), resourceNotFound, searchedLocation);
-            }
+            bool resourceNotFound = !TryGetTranslation(name, out string searchedLocation, out string value);
+            return new LocalizedString(name, string.Format(value!, arguments), resourceNotFound, searchedLocation);
         }
+    }
 
-        /// <summary>
-        /// Try to get a translation for a given name.
-        /// </summary>
-        /// <param name="name">The name of the string to get.</param>
-        /// <param name="searchedLocation">Where we're looking for the translation.</param>
-        /// <param name="value">The translated value, or falls back to name.</param>
-        /// <returns>true if a translation was found.</returns>
-        public bool TryGetTranslation(string name, out string searchedLocation, out string value)
+    /// <summary>
+    /// Try to get a translation for a given name.
+    /// </summary>
+    /// <param name="name">The name of the string to get.</param>
+    /// <param name="searchedLocation">Where we're looking for the translation.</param>
+    /// <param name="value">The translated value, or falls back to name.</param>
+    /// <returns>true if a translation was found.</returns>
+    public bool TryGetTranslation(string name, out string searchedLocation, out string value)
+    {
+        bool wasFound = TryInternal(location, name, out searchedLocation, out value);
+        value = value.Replace(@"\n", Environment.NewLine);
+        return wasFound;
+    }
+
+    private bool TryInternal(string location, string name, out string searchedLocation, out string value)
+    {
+        searchedLocation = location;
+
+        IReadOnlyDictionary<string, POCatalog> catalogs = translationsProvider.GetCatalogs();
+        POCatalog? catalog = GetCatalog(catalogs);
+        if (catalog == null)
         {
-            bool wasFound = TryInternal(location, name, out searchedLocation, out value);
-            value = value.Replace(@"\n", Environment.NewLine);
-            return wasFound;
+            value = name;
+            return false;
         }
 
-        private bool TryInternal(string location, string name, out string searchedLocation, out string value)
+        POKey key = new(name.Replace("\r\n", "\n"));
+        string? translation = catalog.GetTranslation(key);
+        if (translation == null)
         {
-            searchedLocation = location;
+            catalogs.TryGetValue("en-US", out POCatalog? englishCatalog);
+            translation = englishCatalog?.GetTranslation(key) ?? key.Id;
+        }
 
-            IReadOnlyDictionary<string, POCatalog> catalogs = translationsProvider.GetCatalogs();
-            POCatalog? catalog = GetCatalog(catalogs);
-            if (catalog == null)
+        value = translation;
+        return value != key.Id;
+    }
+
+    private POCatalog? GetCatalog(IReadOnlyDictionary<string, POCatalog> catalogs)
+    {
+        CultureInfo culture = _culture;
+        while (true)
+        {
+            if (catalogs.TryGetValue(culture.Name, out POCatalog? catalog))
             {
-                value = name;
-                return false;
+                return catalog;
             }
 
-            POKey key = new(name.Replace("\r\n", "\n"));
-            string? translation = catalog.GetTranslation(key);
-            if (translation == null)
+            CultureInfo parentCulture = culture.Parent;
+            if (culture == parentCulture)
             {
                 catalogs.TryGetValue("en-US", out POCatalog? englishCatalog);
-                translation = englishCatalog?.GetTranslation(key) ?? key.Id;
+                return englishCatalog;
             }
 
-            value = translation;
-            return value != key.Id;
-        }
-
-        private POCatalog? GetCatalog(IReadOnlyDictionary<string, POCatalog> catalogs)
-        {
-            CultureInfo culture = _culture;
-            while (true)
-            {
-                if (catalogs.TryGetValue(culture.Name, out POCatalog? catalog))
-                {
-                    return catalog;
-                }
-
-                CultureInfo parentCulture = culture.Parent;
-                if (culture == parentCulture)
-                {
-                    catalogs.TryGetValue("en-US", out POCatalog? englishCatalog);
-                    return englishCatalog;
-                }
-
-                culture = parentCulture;
-            }
+            culture = parentCulture;
         }
+    }
 
-        /// <summary>
-        /// Get all strings for the current culture.
-        /// </summary>
-        /// <param name="includeParentCultures"></param>
-        /// <returns></returns>
-        public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures)
+    /// <summary>
+    /// Get all strings for the current culture.
+    /// </summary>
+    /// <param name="includeParentCultures"></param>
+    /// <returns></returns>
+    public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures)
+    {
+        IReadOnlyDictionary<string, POCatalog> catalogs = translationsProvider.GetCatalogs();
+        CultureInfo culture = _culture;
+        do
         {
-            IReadOnlyDictionary<string, POCatalog> catalogs = translationsProvider.GetCatalogs();
-            CultureInfo culture = _culture;
-            do
+            if (catalogs.TryGetValue(culture.Name, out var catalog))
             {
-                if (catalogs.TryGetValue(culture.Name, out var catalog))
+                foreach (IPOEntry? entry in catalog)
                 {
-                    foreach (IPOEntry? entry in catalog)
+                    if (entry.Count > 0)
                     {
-                        if (entry.Count > 0)
-                        {
-                            yield return new LocalizedString(entry.Key.Id, entry[0], resourceNotFound: false, location);
-                        }
+                        yield return new LocalizedString(entry.Key.Id, entry[0], resourceNotFound: false, location);
                     }
                 }
+            }
 
-                CultureInfo parentCulture = culture.Parent;
-                if (culture == parentCulture)
-                {
-                    break;
-                }
-
-                culture = parentCulture;
+            CultureInfo parentCulture = culture.Parent;
+            if (culture == parentCulture)
+            {
+                break;
             }
-            while (includeParentCultures);
+
+            culture = parentCulture;
         }
+        while (includeParentCultures);
     }
 }

src/Xecrets.Localization/POStringLocalizerFactory.cs

@@ -1,7 +1,7 @@
 #region Copyright and License
 
 /*
- * Xecrets Ez - Copyright © 2022-2024, Svante Seleborg, All Rights Reserved.
+ * Xecrets Ez - Copyright © 2022-2025 Svante Seleborg, All Rights Reserved.
  *
  * This code file is part of Xecrets Ez - A cross platform desktop application
  * for encryption, decryption and other file operations based on Xecrets Cli.
@@ -34,31 +34,30 @@
 
 using Microsoft.Extensions.Localization;
 
-namespace Xecrets.Localization
+namespace Xecrets.Localization;
+
+/// <summary>
+/// Factory for creating <see cref="POStringLocalizer"/> instances.
+/// </summary>
+/// <param name="translationsProvider">An implementation of <see cref="ITranslationsProvider"/></param>
+public sealed class POStringLocalizerFactory(ITranslationsProvider translationsProvider) : IStringLocalizerFactory
 {
     /// <summary>
-    /// Factory for creating <see cref="POStringLocalizer"/> instances.
+    /// Creates an instance of <see cref="POStringLocalizer"/>.
     /// </summary>
-    /// <param name="translationsProvider">An implementation of <see cref="ITranslationsProvider"/></param>
-    public sealed class POStringLocalizerFactory(ITranslationsProvider translationsProvider) : IStringLocalizerFactory
-    {
-        /// <summary>
-        /// Creates an instance of <see cref="POStringLocalizer"/>.
-        /// </summary>
-        /// <param name="baseName"></param>
-        /// <param name="location"></param>
-        /// <returns></returns>
-        public IStringLocalizer Create(string baseName, string location) => new POStringLocalizer(translationsProvider, location);
+    /// <param name="baseName"></param>
+    /// <param name="location"></param>
+    /// <returns></returns>
+    public IStringLocalizer Create(string baseName, string location) => new POStringLocalizer(translationsProvider, location);
 
-        /// <summary>
-        /// Creates an instance of <see cref="POStringLocalizer"/>. Not implemented.
-        /// </summary>
-        /// <param name="resourceSource"></param>
-        /// <returns></returns>
-        /// <exception cref="NotImplementedException"></exception>
-        public IStringLocalizer Create(Type resourceSource)
-        {
-            throw new NotImplementedException();
-        }
+    /// <summary>
+    /// Creates an instance of <see cref="POStringLocalizer"/>. Not implemented.
+    /// </summary>
+    /// <param name="resourceSource"></param>
+    /// <returns></returns>
+    /// <exception cref="NotImplementedException"></exception>
+    public IStringLocalizer Create(Type resourceSource)
+    {
+        throw new NotImplementedException();
     }
 }