Merge pull request #56 from hmlendea/templates

Fixed some templates being built incorrectly

Author: hmlendea

Service/TextBuilding/Localisation/EnglishTextBuilder.cs

@@ -1731,19 +1731,19 @@ public string BuildGitContributionsMeasurementLogText(PersonalLog log)
             => $"I have made {log.Data["contributions_count"]} contributions on {GetPlatform(log.Data)}";
 
         public string BuildGitReleaseLogText(PersonalLog log)
-            => $"I have released version {log.Data["release_version"]} of the `{log.Data["repository_name"]}` repository on {GetPlatform(log.Data)}";
+            => $"I have released version {GetDataValue(log.Data, "version")} of the `{GetDataValue(log.Data, "repository")}` repository on {GetPlatform(log.Data)}";
 
         public string BuildGitRepositoryArchivalLogText(PersonalLog log)
-            => $"I have archived the `{GetDataValue(log.Data, "repository_name")}` repository on {GetPlatform(log.Data)}";
+            => $"I have archived the `{GetDataValue(log.Data, "repository")}` repository on {GetPlatform(log.Data)}";
 
         public string BuildGitRepositoryCreationLogText(PersonalLog log)
-            => $"I have created the `{GetDataValue(log.Data, "repository_name")}` repository on {GetPlatform(log.Data)}";
+            => $"I have created the `{GetDataValue(log.Data, "repository")}` repository on {GetPlatform(log.Data)}";
 
         public string BuildGitRepositoryDeletionLogText(PersonalLog log)
-            => $"I have deleted the `{GetDataValue(log.Data, "repository_name")}` repository from {GetPlatform(log.Data)}";
+            => $"I have deleted the `{GetDataValue(log.Data, "repository")}` repository from {GetPlatform(log.Data)}";
 
         public string BuildGitRepositoryRenameLogText(PersonalLog log)
-            => $"I have renamed the `{GetDataValue(log.Data, "old_repository_name")}` repository from {GetPlatform(log.Data)} to `{GetDataValue(log.Data, "new_repository_name")}`";
+            => $"I have renamed the `{GetDataValue(log.Data, "old_repository")}` repository from {GetPlatform(log.Data)} to `{GetDataValue(log.Data, "new_repository")}`";
 
         public string BuildGoingToSleepLogText(PersonalLog log)
         {

Service/TextBuilding/Localisation/RomanianTextBuilder.cs

@@ -1749,19 +1749,19 @@ public string BuildGitContributionsMeasurementLogText(PersonalLog log)
             => $"Am avut {log.Data["contributions_count"]} de contribuții pe {GetPlatform(log.Data)}";
 
         public string BuildGitReleaseLogText(PersonalLog log)
-            => $"Am lansat versiunea '{log.Data["release_version"]}' pentru repozitory-ul '{log.Data["repository_name"]}' pe {GetPlatform(log.Data)}";
+            => $"Am lansat versiunea '{GetDataValue(log.Data, "version")}' pentru repozitory-ul '{GetDataValue(log.Data, "repository")}' pe {GetPlatform(log.Data)}";
 
         public string BuildGitRepositoryArchivalLogText(PersonalLog log)
-            => $"Am arhivat repozitory-ul '{GetDataValue(log.Data, "repository_name")}' de pe {GetPlatform(log.Data)}";
+            => $"Am arhivat repozitory-ul '{GetDataValue(log.Data, "repository")}' de pe {GetPlatform(log.Data)}";
 
         public string BuildGitRepositoryDeletionLogText(PersonalLog log)
-            => $"Am șters repozitory-ul '{GetDataValue(log.Data, "repository_name")}' de pe {GetPlatform(log.Data)}";
+            => $"Am șters repozitory-ul '{GetDataValue(log.Data, "repository")}' de pe {GetPlatform(log.Data)}";
 
         public string BuildGitRepositoryCreationLogText(PersonalLog log)
-            => $"Am creat repozitory-ul '{GetDataValue(log.Data, "repository_name")}' pe {GetPlatform(log.Data)}";
+            => $"Am creat repozitory-ul '{GetDataValue(log.Data, "repository")}' pe {GetPlatform(log.Data)}";
 
         public string BuildGitRepositoryRenameLogText(PersonalLog log)
-            => $"Am redenumit repozitory-ul '{GetDataValue(log.Data, "old_repository_name")}' de pe {GetPlatform(log.Data)} în '{GetDataValue(log.Data, "new_repository_name")}'";
+            => $"Am redenumit repozitory-ul '{GetDataValue(log.Data, "old_repository")}' de pe {GetPlatform(log.Data)} în '{GetDataValue(log.Data, "new_repository")}'";
 
         public string BuildGoingToSleepLogText(PersonalLog log)
         {

Service/TextBuilding/PersonalLogTextBuilderBase.cs

@@ -302,35 +302,45 @@ protected bool TryGetDevice(Dictionary<string, string> data, out string device)
         {
             device = GetDevice(data);
 
-            return !MissingValue.Equals(device);
+            return
+                !string.IsNullOrWhiteSpace(device) &&
+                !MissingValue.Equals(device);
         }
 
         protected bool TryGetByPerson(Dictionary<string, string> data, out string byPerson)
         {
             byPerson = GetByPerson(data);
 
-            return !MissingValue.Equals(byPerson);
+            return
+                !string.IsNullOrWhiteSpace(byPerson) &&
+                !MissingValue.Equals(byPerson);
         }
 
         public bool TryGetDataValue(Dictionary<string, string> data, string key, out string value)
         {
             value = GetDataValue(data, key, null);
 
-            return !string.IsNullOrWhiteSpace(value);
+            return
+                !string.IsNullOrWhiteSpace(value) &&
+                !MissingValue.Equals(value);
         }
 
         protected bool TryGetPlatform(Dictionary<string, string> data, out string platform)
         {
             platform = GetPlatform(data);
 
-            return !string.IsNullOrWhiteSpace(platform);
+            return
+                !string.IsNullOrWhiteSpace(platform) &&
+                !MissingValue.Equals(platform);
         }
 
         protected bool TryGetSide(Dictionary<string, string> data, out string side)
         {
             side = GetSide(data);
 
-            return !string.IsNullOrWhiteSpace(side);
+            return
+                !string.IsNullOrWhiteSpace(side) &&
+                !MissingValue.Equals(side);
         }
     }
 }