Версия 3.6.3

OneCodeUnit · OneCodeUnit · commit 1d9a0a1d77a9 · 2024-12-30T21:00:21.000+03:00
Обновление кода и исправление ошибок

- Для создания gender-файлов обавлена логика для распределения слов по родам.
- Изменён способ генерации уникальных строк с использованием `Guid.NewGuid()`.
- Изменён способ создания диалога поиска папки.
- В переводе имён упрощена логика замены текста.
- Изменён способ создания текстовых файлов с добавлением кодировки `UTF-8`.
- Изменены имена свойств JSON-объектов для api-запроосов.
- Улучшена обработка ошибок при загрузке XML-файла.
- Обновлена версия пакета `System.Text.Json` с `8.0.5` на `9.0.0`.
diff --git a/DarkTheme/DarkModeCS.cs b/DarkTheme/DarkModeCS.cs
diff --git a/MainForm.cs b/MainForm.cs
@@ -84,7 +84,7 @@ public MainForm()
         // Выбор папки и обработка изменения адреса папки
         private void FolderButton_Click(object sender, EventArgs e)
         {
-            FolderBrowserDialog ofd = new();
+            using FolderBrowserDialog ofd = new();
             DialogResult dr = ofd.ShowDialog();
             if (dr == DialogResult.OK)
             {
@@ -140,7 +140,7 @@ private void UpdateButton_Click(object sender, EventArgs e)
                 LinkLabelGithub.Visible = true;
                 return;
             }
-            string newVersion = json.tag_name.ToString()[1..];
+            string newVersion = json.TagName.ToString()[1..];
             string? oldVersion = System.Reflection.Assembly.GetEntryAssembly()?.GetName().Version?.ToString();
             if (oldVersion is null || oldVersion.Length < 5)
             {
@@ -169,7 +169,7 @@ private void UpdateButton_Click(object sender, EventArgs e)
             else
             {
                 SendToInfoTextBox("Доступна новая версия программы. Её можно скачать на GitHub по ссылке справа");
-                SendToInfoTextBox($"{json.name}. Что нового?{Environment.NewLine}{json.body}");
+                SendToInfoTextBox($"{json.Name}. Что нового?{Environment.NewLine}{json.Body}");
                 UpdateButton.BackgroundImage = Properties.Resources.warn_c;
                 LinkLabelGithub.Visible = true;
             }
@@ -278,7 +278,7 @@ private void ActionHandler(string name, string mask, string code)
                         result = EncodingFixer.EncodingFixerActivity(currentFile);
                         break;
                     case "CommentInserter":
-                        result = CommentInserter.CommentInserterActivity(currentFile);
+                        result = CommentInserter.InsertComments(currentFile);
                         break;
                     default:
                         break;
diff --git a/RimLangKit.csproj b/RimLangKit.csproj
@@ -11,7 +11,7 @@
     <Platforms>x64</Platforms>
     <ApplicationIcon>images\icon.ico</ApplicationIcon>
     <PlatformTarget>x64</PlatformTarget>
-    <Version>$(VersionPrefix)3.6.2</Version>
+    <Version>$(VersionPrefix)3.6.3</Version>
     <RepositoryUrl>https://github.com/OneCodeUnit/RimLangKit</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <NeutralLanguage>ru</NeutralLanguage>
diff --git a/RimLanguageCore/Activities/CaseCreator.cs b/RimLanguageCore/Activities/CaseCreator.cs
@@ -10,7 +10,7 @@ public static class CaseCreator
     {
         private const string CasePath = "\\Languages\\Russian\\WordInfo";
 
-        private static List<string> WordsExtract(string file)
+        private static List<string> ExtractWords(string file)
         {
             XDocument xDoc = XDocument.Load(file, LoadOptions.PreserveWhitespace);
             XElement root = xDoc.Element("LanguageData");
@@ -34,7 +34,7 @@ public static List<string> FindWordsProcessing(string currentFile, string defTyp
             // Если файл соответствует заданному defType, то запускатся в работу
             if (currentFile.Contains(defType, StringComparison.OrdinalIgnoreCase))
             {
-                words.AddRange(WordsExtract(currentFile));
+                words.AddRange(ExtractWords(currentFile));
             }
             return words;
         }
@@ -56,17 +56,17 @@ public static void CreateCase(string directoryPath, Dictionary<string, string> w
                 }
 
                 string tempWord = word.Key;
-                Words result = MorpherHttpClient.GetMorpherWords(tempWord);
+                WordForms result = MorpherHttpClient.GetMorpherWords(tempWord);
                 // Case.txt
                 string tempStringCase = result is null
                     ? $"{tempWord}; {tempWord}; {tempWord}; {tempWord}; {tempWord}; {tempWord}"
-                    : $"{tempWord}; {result.Р}; {result.Д}; {result.В}; {result.Т}; {result.П}";
+                    : $"{tempWord}; {result.Genitive}; {result.Dative}; {result.Accusative}; {result.Instrumental}; {result.Prepositional}";
                 writerCase.WriteLine(tempStringCase);
 
                 // Plural.txt
                 tempStringCase = result is null
                     ? $"{tempWord}; {tempWord}"
-                    : result.множественное is null ? string.Empty : $"{tempWord}; {result.множественное.И}";
+                    : result.Plural is null ? string.Empty : $"{tempWord}; {result.Plural.Nominative}";
                 writerPlural.WriteLine(tempStringCase);
             }
             writerCase.WriteLine();
@@ -83,27 +83,79 @@ public static void CreateGender(string directoryPath, Dictionary<string, string>
             string pathGenderFemale = pathGender + "\\Female.txt";
             StreamWriter writerFemale = new(pathGenderFemale, true, System.Text.Encoding.UTF8);
             writerFemale.WriteLine("// " + defType);
+            foreach (var word in words)
+            {
+                if (word.Value != defType)
+                {
+                    continue;
+                }
+                else if (word.Key.EndsWith("а", StringComparison.OrdinalIgnoreCase) || word.Key.EndsWith("я", StringComparison.OrdinalIgnoreCase))
+                {
+                    writerFemale.WriteLine(word.Key);
+                    words.Remove(word.Key);
+                }
+            }
             writerFemale.WriteLine();
             writerFemale.Close();
 
             string pathGenderMale = pathGender + "\\Male.txt";
             StreamWriter writerMale = new(pathGenderMale, true, System.Text.Encoding.UTF8);
             writerMale.WriteLine("// " + defType);
+            foreach (var word in words)
+            {
+                if (word.Value != defType)
+                {
+                    continue;
+                }
+                else if ((!word.Key.EndsWith("а", StringComparison.OrdinalIgnoreCase)) && (!word.Key.EndsWith("я", StringComparison.OrdinalIgnoreCase))
+                && (!word.Key.EndsWith("о", StringComparison.OrdinalIgnoreCase)) && (!word.Key.EndsWith("е", StringComparison.OrdinalIgnoreCase))
+                && (!word.Key.EndsWith("ы", StringComparison.OrdinalIgnoreCase)) && (!word.Key.EndsWith("и", StringComparison.OrdinalIgnoreCase)))
+                {
+                    writerMale.WriteLine(word.Key);
+                    words.Remove(word.Key);
+                }
+            }
             writerMale.WriteLine();
             writerMale.Close();
 
             string pathGenderNeuter = pathGender + "\\Neuter.txt";
             StreamWriter writerNeuter = new(pathGenderNeuter, true, System.Text.Encoding.UTF8);
             writerNeuter.WriteLine("// " + defType);
+            foreach (var word in words)
+            {
+                if (word.Value != defType)
+                {
+                    continue;
+                }
+                else if (word.Key.EndsWith("о", StringComparison.OrdinalIgnoreCase) || word.Key.EndsWith("е", StringComparison.OrdinalIgnoreCase))
+                {
+                    writerNeuter.WriteLine(word.Key);
+                    words.Remove(word.Key);
+                }
+            }
             writerNeuter.WriteLine();
             writerNeuter.Close();
 
             string pathGenderPlural = pathGender + "\\Plural.txt";
             StreamWriter writerPlural = new(pathGenderPlural, true, System.Text.Encoding.UTF8);
             writerPlural.WriteLine("// " + defType);
+            foreach (var word in words)
+            {
+                if (word.Value != defType)
+                {
+                    continue;
+                }
+                else if (word.Key.EndsWith("ы", StringComparison.OrdinalIgnoreCase) || word.Key.EndsWith("и", StringComparison.OrdinalIgnoreCase))
+                {
+                    writerPlural.WriteLine(word.Key);
+                    words.Remove(word.Key);
+                }
+            }
             writerPlural.WriteLine();
             writerPlural.Close();
 
+            if (words.Count < 1)
+                return;
             string pathGenderUndefined = pathGender + "\\Undefined.txt";
             StreamWriter writerUndefined = new(pathGenderUndefined, true, System.Text.Encoding.UTF8);
             writerUndefined.WriteLine("// " + defType);
diff --git a/RimLanguageCore/Activities/ChangesFinder.cs b/RimLanguageCore/Activities/ChangesFinder.cs
@@ -70,9 +70,7 @@ public static (bool, string) GetModData(string currentFile)
                 bool unique = ModData.TryAdd(node.Name.ToString(), node.Value);
                 if (!unique)
                 {
-                    DateTime time = DateTime.Now;
-                    string uniqueString = time.ToString("ffff", CultureInfo.InvariantCulture);
-                    TranslationData.TryAdd(node.Name.ToString() + uniqueString, node.Value);
+                    TranslationData.TryAdd(node.Name.ToString() + Guid.NewGuid(), node.Value);
                 }
             }
 
diff --git a/RimLanguageCore/Activities/CommentInserter.cs b/RimLanguageCore/Activities/CommentInserter.cs
@@ -4,9 +4,14 @@
 
 namespace RimLanguageCore.Activities
 {
+    /// <summary>
+    /// Вставляет комментарий с содержимым тега перед каждым элементом в указанном XML-файле.
+    /// </summary>
+    /// <param name="currentFile">Путь к текущему XML-файлу.</param>
+    /// <returns>Кортеж, содержащий статус операции (true - успех, false - ошибка) и сообщение об ошибке.</returns>
     public static class CommentInserter
     {
-        public static (bool, string) CommentInserterActivity(string currentFile)
+        public static (bool, string) InsertComments(string currentFile)
         {
             (bool, string) result = XmlErrorChecker.XmlErrorCheck(currentFile);
             if (!result.Item1)
diff --git a/RimLanguageCore/Activities/FileFixer.cs b/RimLanguageCore/Activities/FileFixer.cs
@@ -52,7 +52,7 @@ public static string BrokenFilesWriterActivity()
             }
 
             string currentDirectory = Directory.GetCurrentDirectory();
-            StreamWriter sw = new(Path.Combine(currentDirectory + "\\BrokenFiles.txt"), false);
+            StreamWriter sw = new(Path.Combine(currentDirectory, "BrokenFiles.txt"), false);
             foreach (var file in BrokenFiles)
             {
                 sw.WriteLine($"{file.Value}: {file.Key}");
diff --git a/RimLanguageCore/Activities/LanguageUpdater.cs b/RimLanguageCore/Activities/LanguageUpdater.cs
@@ -22,15 +22,15 @@ public static (bool, string) TranslationVersionCheckActivity(string sha, string
             {
                 return (false, "Проверка версии: Ошибка получения данных с GitHub. Что-то с интернетом?");
             }
-            if (json.sha == sha)
+            if (json.Sha == sha)
             {
                 TempSha = string.Empty;
-                return (false, $"Ваша версия - {sha[..6]}, доступная версия - {json.sha[..6]}. Обновление не требуется");
+                return (false, $"Ваша версия - {sha[..6]}, доступная версия - {json.Sha[..6]}. Обновление не требуется");
             }
             else
             {
-                TempSha = json.sha;
-                return (true, $"Ваша версия - {sha[..6]}, доступная версия - {json.sha[..6]}. Требуется обновление");
+                TempSha = json.Sha;
+                return (true, $"Ваша версия - {sha[..6]}, доступная версия - {json.Sha[..6]}. Требуется обновление");
             }
         }
 
diff --git a/RimLanguageCore/Activities/NamesTranslator.cs b/RimLanguageCore/Activities/NamesTranslator.cs
@@ -73,13 +73,8 @@ public static (bool, string) NamesTranslatorActivity(string currentFile)
                     }
                 }
 
-                for (int i = 0; i < sourceLine.Length; i++)
-                {
-                    if (sourceLine[i] == '=')
-                    {
-                        sourceLine = sourceLine.Replace(sourceLine[i].ToString(), string.Empty);
-                    }
-                }
+                sourceLine = sourceLine.Replace("=", string.Empty);
+
                 if (sourceLine.Length > 1)
                 {
                     sourceLine = char.ToUpper(sourceLine[0], CultureInfo.InvariantCulture) + sourceLine[1..];
diff --git a/RimLanguageCore/Activities/TagCollector.cs b/RimLanguageCore/Activities/TagCollector.cs
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text;
 using System.Xml.Linq;
 
 namespace RimLanguageCore.Activities
@@ -21,7 +22,7 @@ public static class TagCollector
         private static Dictionary<string, int> DefsSpread = new();
 
         // Предобработка файла. Сбор данных о тегах в переводе
-        private static string CheckDef(string currentFile)
+        private static string ParseDefName(string currentFile)
         {
             string[] path = currentFile.Split('\\');
             string def = path[^2];
@@ -56,7 +57,7 @@ public static (bool, string) TagCollectorActivity(string currentFile)
             XElement root = xDoc.Element("LanguageData");
 
             // DefName текущего файла
-            string def = CheckDef(currentFile);
+            string def = ParseDefName(currentFile);
             if (def == "Keyed")
             {
                 return (false, "Keyed-файл");
@@ -107,7 +108,7 @@ public static string TagWriterActivity()
             string directory = Directory.GetCurrentDirectory();
 
             // Запись в файл
-            StreamWriter sw = new(Path.Combine(directory + "\\TagsByDefs.txt"), false);
+            StreamWriter sw = new(Path.Combine(directory, "TagsByDefs.txt"), false, Encoding.UTF8);
             foreach (string def in Defs)
             {
                 sw.WriteLine($"**{def}**");
@@ -116,18 +117,18 @@ public static string TagWriterActivity()
                 sw.WriteLine();
             }
             sw.Close();
-            StreamWriter swTags = new(Path.Combine(directory + "\\UniqueTags.txt"), false);
+            StreamWriter swTags = new(Path.Combine(directory, "UniqueTags.txt"), false, Encoding.UTF8);
             Tags.ForEach(swTags.WriteLine);
             swTags.Close();
-            StreamWriter swDefs = new(Path.Combine(directory + "\\UniqueDefs.txt"), false);
+            StreamWriter swDefs = new(Path.Combine(directory, "UniqueDefs.txt"), false, Encoding.UTF8);
             Defs.ForEach(swDefs.WriteLine);
             swDefs.Close();
 
             // Статистика по тегам
             var spreadList = TagSpread.ToList();
             spreadList.Sort((pair1, pair2) => pair1.Value.CompareTo(pair2.Value));
             spreadList.Reverse();
-            StreamWriter swSpread = new(Path.Combine(directory + "\\SpreadTags.txt"), false);
+            StreamWriter swSpread = new(Path.Combine(directory, "SpreadTags.txt"), false, Encoding.UTF8);
             foreach (var spread in spreadList)
             {
                 if (spread.Value > 1)
@@ -141,7 +142,7 @@ public static string TagWriterActivity()
             var defSpreadList = DefsSpread.ToList();
             defSpreadList.Sort((pair1, pair2) => pair1.Value.CompareTo(pair2.Value));
             defSpreadList.Reverse();
-            StreamWriter swDefSpread = new(Path.Combine(directory + "\\SpreadDefs.txt"), false);
+            StreamWriter swDefSpread = new(Path.Combine(directory, "SpreadDefs.txt"), false, Encoding.UTF8);
             foreach (var spread in defSpreadList)
             {
                 if (spread.Value > 1)
@@ -174,7 +175,7 @@ public static string DefsClassGeneratorActivity()
             string directory = Directory.GetCurrentDirectory();
             string text = string.Empty;
             // Создание файла
-            StreamWriter sw = new(Path.Combine(directory + "\\defsClass.cs"), false);
+            StreamWriter sw = new(Path.Combine(directory, "defsClass.cs"), false, Encoding.UTF8);
 
             // Заголовок
             text += "using System.Xml.Serialization;\n\n";
diff --git a/RimLanguageCore/Misc/GitHubHttpClient.cs b/RimLanguageCore/Misc/GitHubHttpClient.cs
@@ -1,6 +1,7 @@
 ﻿using System.IO;
 using System.Net.Http;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace RimLanguageCore.Misc
 {
@@ -18,6 +19,7 @@ public static Root GetGithubJson()
             try
             {
                 response = Client.GetAsync("https://api.github.com/repos/OneCodeUnit/RimLangKit/releases/latest").Result;
+                response.EnsureSuccessStatusCode();
             }
             catch
             {
@@ -34,6 +36,7 @@ public static Root GetGithubSha(string repo)
             try
             {
                 response = Client.GetAsync($"https://api.github.com/repos/{repo}/commits/master").Result;
+                response.EnsureSuccessStatusCode();
             }
             catch
             {
@@ -44,12 +47,13 @@ public static Root GetGithubSha(string repo)
             return json;
         }
 
-        public static Stream GetGithubArchive(string repo)
+        public static Stream GetGithubArchive(string repo, string branch = "master")
         {
             HttpResponseMessage response;
             try
             {
-                response = Client.GetAsync($"https://github.com/{repo}/archive/refs/heads/master.zip").Result;
+                response = Client.GetAsync($"https://github.com/{repo}/archive/refs/heads/{branch}.zip").Result;
+                response.EnsureSuccessStatusCode();
                 Stream stream = response.Content.ReadAsStreamAsync().Result;
                 return stream;
             }
@@ -62,11 +66,16 @@ public static Stream GetGithubArchive(string repo)
 
     public class Root
     {
-#pragma warning disable IDE1006, CA1707
-        public string sha { get; set; }
-        public string tag_name { get; set; }
-        public string name { get; set; }
-        public string body { get; set; }
-#pragma warning restore IDE1006, CA1707
+        [JsonPropertyName("sha")]
+        public string Sha { get; set; }
+
+        [JsonPropertyName("tag_name")]
+        public string TagName { get; set; }
+
+        [JsonPropertyName("name")]
+        public string Name { get; set; }
+
+        [JsonPropertyName("body")]
+        public string Body { get; set; }
     }
 }
diff --git a/RimLanguageCore/Misc/MorpherHttpClient.cs b/RimLanguageCore/Misc/MorpherHttpClient.cs
diff --git a/RimLanguageCore/Misc/TimeSetter.cs b/RimLanguageCore/Misc/TimeSetter.cs
diff --git a/RimLanguageCore/Misc/XmlErrorChecker.cs b/RimLanguageCore/Misc/XmlErrorChecker.cs
diff --git a/RimLanguageCore/RimLanguageCore.csproj b/RimLanguageCore/RimLanguageCore.csproj

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public MainForm()`
`84`	`84`	`// Выбор папки и обработка изменения адреса папки`
`85`	`85`	`private void FolderButton_Click(object sender, EventArgs e)`
`86`	`86`	`{`
`87`		`- FolderBrowserDialog ofd = new();`
	`87`	`+ using FolderBrowserDialog ofd = new();`
`88`	`88`	`DialogResult dr = ofd.ShowDialog();`
`89`	`89`	`if (dr == DialogResult.OK)`
`90`	`90`	`{`
`@@ -140,7 +140,7 @@ private void UpdateButton_Click(object sender, EventArgs e)`
`140`	`140`	`LinkLabelGithub.Visible = true;`
`141`	`141`	`return;`
`142`	`142`	`}`
`143`		`- string newVersion = json.tag_name.ToString()[1..];`
	`143`	`+ string newVersion = json.TagName.ToString()[1..];`
`144`	`144`	`string? oldVersion = System.Reflection.Assembly.GetEntryAssembly()?.GetName().Version?.ToString();`
`145`	`145`	`if (oldVersion is null \|\| oldVersion.Length < 5)`
`146`	`146`	`{`
`@@ -169,7 +169,7 @@ private void UpdateButton_Click(object sender, EventArgs e)`
`169`	`169`	`else`
`170`	`170`	`{`
`171`	`171`	`SendToInfoTextBox("Доступна новая версия программы. Её можно скачать на GitHub по ссылке справа");`
`172`		`- SendToInfoTextBox($"{json.name}. Что нового?{Environment.NewLine}{json.body}");`
	`172`	`+ SendToInfoTextBox($"{json.Name}. Что нового?{Environment.NewLine}{json.Body}");`
`173`	`173`	`UpdateButton.BackgroundImage = Properties.Resources.warn_c;`
`174`	`174`	`LinkLabelGithub.Visible = true;`
`175`	`175`	`}`
`@@ -278,7 +278,7 @@ private void ActionHandler(string name, string mask, string code)`
`278`	`278`	`result = EncodingFixer.EncodingFixerActivity(currentFile);`
`279`	`279`	`break;`
`280`	`280`	`case "CommentInserter":`
`281`		`- result = CommentInserter.CommentInserterActivity(currentFile);`
	`281`	`+ result = CommentInserter.InsertComments(currentFile);`
`282`	`282`	`break;`
`283`	`283`	`default:`
`284`	`284`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,7 @@ public static (bool, string) GetModData(string currentFile)`
`70`	`70`	`bool unique = ModData.TryAdd(node.Name.ToString(), node.Value);`
`71`	`71`	`if (!unique)`
`72`	`72`	`{`
`73`		`- DateTime time = DateTime.Now;`
`74`		`- string uniqueString = time.ToString("ffff", CultureInfo.InvariantCulture);`
`75`		`- TranslationData.TryAdd(node.Name.ToString() + uniqueString, node.Value);`
	`73`	`+ TranslationData.TryAdd(node.Name.ToString() + Guid.NewGuid(), node.Value);`
`76`	`74`	`}`
`77`	`75`	`}`
`78`	`76`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,14 @@`
`4`	`4`
`5`	`5`	`namespace RimLanguageCore.Activities`
`6`	`6`	`{`
	`7`	`+ /// <summary>`
	`8`	`+ /// Вставляет комментарий с содержимым тега перед каждым элементом в указанном XML-файле.`
	`9`	`+ /// </summary>`
	`10`	`+ /// <param name="currentFile">Путь к текущему XML-файлу.</param>`
	`11`	`+ /// <returns>Кортеж, содержащий статус операции (true - успех, false - ошибка) и сообщение об ошибке.</returns>`
`7`	`12`	`public static class CommentInserter`
`8`	`13`	`{`
`9`		`- public static (bool, string) CommentInserterActivity(string currentFile)`
	`14`	`+ public static (bool, string) InsertComments(string currentFile)`
`10`	`15`	`{`
`11`	`16`	`(bool, string) result = XmlErrorChecker.XmlErrorCheck(currentFile);`
`12`	`17`	`if (!result.Item1)`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public static string BrokenFilesWriterActivity()`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`string currentDirectory = Directory.GetCurrentDirectory();`
`55`		`- StreamWriter sw = new(Path.Combine(currentDirectory + "\\BrokenFiles.txt"), false);`
	`55`	`+ StreamWriter sw = new(Path.Combine(currentDirectory, "BrokenFiles.txt"), false);`
`56`	`56`	`foreach (var file in BrokenFiles)`
`57`	`57`	`{`
`58`	`58`	`sw.WriteLine($"{file.Value}: {file.Key}");`
Original file line number	Diff line number	Diff line change
`@@ -22,15 +22,15 @@ public static (bool, string) TranslationVersionCheckActivity(string sha, string`
`22`	`22`	`{`
`23`	`23`	`return (false, "Проверка версии: Ошибка получения данных с GitHub. Что-то с интернетом?");`
`24`	`24`	`}`
`25`		`- if (json.sha == sha)`
	`25`	`+ if (json.Sha == sha)`
`26`	`26`	`{`
`27`	`27`	`TempSha = string.Empty;`
`28`		`- return (false, $"Ваша версия - {sha[..6]}, доступная версия - {json.sha[..6]}. Обновление не требуется");`
	`28`	`+ return (false, $"Ваша версия - {sha[..6]}, доступная версия - {json.Sha[..6]}. Обновление не требуется");`
`29`	`29`	`}`
`30`	`30`	`else`
`31`	`31`	`{`
`32`		`- TempSha = json.sha;`
`33`		`- return (true, $"Ваша версия - {sha[..6]}, доступная версия - {json.sha[..6]}. Требуется обновление");`
	`32`	`+ TempSha = json.Sha;`
	`33`	`+ return (true, $"Ваша версия - {sha[..6]}, доступная версия - {json.Sha[..6]}. Требуется обновление");`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -73,13 +73,8 @@ public static (bool, string) NamesTranslatorActivity(string currentFile)`
`73`	`73`	`}`
`74`	`74`	`}`
`75`	`75`
`76`		`- for (int i = 0; i < sourceLine.Length; i++)`
`77`		`- {`
`78`		`- if (sourceLine[i] == '=')`
`79`		`- {`
`80`		`- sourceLine = sourceLine.Replace(sourceLine[i].ToString(), string.Empty);`
`81`		`- }`
`82`		`- }`
	`76`	`+ sourceLine = sourceLine.Replace("=", string.Empty);`
	`77`	`+`
`83`	`78`	`if (sourceLine.Length > 1)`
`84`	`79`	`{`
`85`	`80`	`sourceLine = char.ToUpper(sourceLine[0], CultureInfo.InvariantCulture) + sourceLine[1..];`