Merge pull request #52 from crupest/i18n

Add NeutralResourcesLanguage. Conform to best practices.

3 files changed, 10 insertions, 11 deletions

diff --git a/Timeline/Services/DatabaseExtensions.cs b/Timeline/Services/DatabaseExtensions.cs
index 62b22f00..8cbc8fef 100644
--- a/Timeline/Services/DatabaseExtensions.cs
+++ b/Timeline/Services/DatabaseExtensions.cs
@@ -1,6 +1,5 @@
 using Microsoft.EntityFrameworkCore;

 using System;

-using System.Collections.Generic;

 using System.Linq;

 using System.Threading.Tasks;

 using Timeline.Entities;

@@ -22,9 +21,9 @@ namespace Timeline.Services
         {

             if (username == null)

                 throw new ArgumentNullException(nameof(username));

-            var (result, messageGenerator) = validator.Validate(username);

+            var (result, message) = validator.Validate(username);

             if (!result)

-                throw new UsernameBadFormatException(username, messageGenerator(null));

+                throw new UsernameBadFormatException(username, message);

 

             var userId = await userDbSet.Where(u => u.Name == username).Select(u => u.Id).SingleOrDefaultAsync();

             if (userId == 0)

diff --git a/Timeline/Services/UserAvatarService.cs b/Timeline/Services/UserAvatarService.cs
index ff80003c..2afe9093 100644
--- a/Timeline/Services/UserAvatarService.cs
+++ b/Timeline/Services/UserAvatarService.cs
@@ -219,7 +219,7 @@ namespace Timeline.Services
             {

                 if (!LanguageHelper.AreSame(avatarEntity.Data == null, avatarEntity.Type == null))

                 {

-                    var message = Resources.Services.UserAvatarService.DatabaseCorruptedDataAndTypeNotSame;

+                    var message = Resources.Services.UserAvatarService.ExceptionDatabaseCorruptedDataAndTypeNotSame;

                     _logger.LogCritical(message);

                     throw new DatabaseCorruptedException(message);

                 }

@@ -248,9 +248,9 @@ namespace Timeline.Services
             if (avatar != null)

             {

                 if (avatar.Data == null)

-                    throw new ArgumentException(Resources.Services.UserAvatarService.ArgumentAvatarDataNull, nameof(avatar));

+                    throw new ArgumentException(Resources.Services.UserAvatarService.ExceptionAvatarDataNull, nameof(avatar));

                 if (string.IsNullOrEmpty(avatar.Type))

-                    throw new ArgumentException(Resources.Services.UserAvatarService.ArgumentAvatarTypeNullOrEmpty, nameof(avatar));

+                    throw new ArgumentException(Resources.Services.UserAvatarService.ExceptionAvatarTypeNullOrEmpty, nameof(avatar));

             }

 

             var userId = await DatabaseExtensions.CheckAndGetUser(_database.Users, _usernameValidator, username);

diff --git a/Timeline/Services/UserService.cs b/Timeline/Services/UserService.cs
index 8f354fc7..4012539f 100644
--- a/Timeline/Services/UserService.cs
+++ b/Timeline/Services/UserService.cs
@@ -164,15 +164,15 @@ namespace Timeline.Services
             _logger.LogInformation(Log.Format(Resources.Services.UserService.LogCacheRemove, ("Key", key)));

         }

 

-        private void CheckUsernameFormat(string username, string? message = null)

+        private void CheckUsernameFormat(string username, string? additionalMessage = null)

         {

-            var (result, messageGenerator) = _usernameValidator.Validate(username);

+            var (result, message) = _usernameValidator.Validate(username);

             if (!result)

             {

-                if (message == null)

-                    throw new UsernameBadFormatException(username, messageGenerator(null));

+                if (additionalMessage == null)

+                    throw new UsernameBadFormatException(username, message);

                 else

-                    throw new UsernameBadFormatException(username, message + messageGenerator(null));

+                    throw new UsernameBadFormatException(username, additionalMessage + message);

             }

         }