monster/JiraTimeBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/aeroclub-monster/JiraTimeBot

Browse Source
This commit is contained in:
rutriff
2019-03-14 12:53:00 +03:00
parent b0793912bb f77326ae74
commit f7505ea07c
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
JiraTimeBotForm/frmMain.cs
+7 -7
View File
@@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
@@ -33,7 +33,7 @@ namespace JiraTimeBotForm
var tokenSource = new CancellationTokenSource(); var tokenSource = new CancellationTokenSource();
tokenSource.Token.Register(() => tokenSource.Token.Register(() =>
{ {
_log.Info("Îïåðàöèÿ îòìåíåíà..."); _log.Info("Операция отменена...");
LockUnlock(true); LockUnlock(true);
}); });
@@ -153,7 +153,7 @@ namespace JiraTimeBotForm
if (!Directory.Exists(settings.RepositoryPath)) if (!Directory.Exists(settings.RepositoryPath))
{ {
MessageBox.Show("Ïàïêà ñ ðåïî íå ñóøåñòâóåò.", "", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show("Папка с репо не сушествует.", "", MessageBoxButtons.OK, MessageBoxIcon.Error);
return; return;
} }
@@ -187,11 +187,11 @@ namespace JiraTimeBotForm
{ {
if (DateTime.Now.DayOfWeek == DayOfWeek.Saturday || DateTime.Now.DayOfWeek == DayOfWeek.Sunday) if (DateTime.Now.DayOfWeek == DayOfWeek.Saturday || DateTime.Now.DayOfWeek == DayOfWeek.Sunday)
{ {
_log.Error("Ñåãîäíÿ ñóááîòà èëè âîñêðåñåíüå. Ðàáîòàòü íåëüçÿ =)"); _log.Error("Сегодня суббота или воскресенье. Работать нельзя =)");
return; return;
} }
_log.Info("Àâòîìàòè÷åñêîå âíåñåíèå âðåìåíè."); _log.Info("Автоматическое внесение времени.");
var settings = ReadSettingsAndLock(); var settings = ReadSettingsAndLock();
@@ -200,7 +200,7 @@ namespace JiraTimeBotForm
if (settings.DummyMode) if (settings.DummyMode)
{ {
settings.DummyMode = false; settings.DummyMode = false;
_log.Info("Âûêëþ÷àåì ðåæèì Òåñòîâîãî ïðîãîíà"); _log.Info("Выключаем режим Тестового прогона");
} }
using (var tokenSource = GetTokenSource()) using (var tokenSource = GetTokenSource())
@@ -218,7 +218,7 @@ namespace JiraTimeBotForm
if (!Directory.Exists(settings.RepositoryPath)) if (!Directory.Exists(settings.RepositoryPath))
{ {
MessageBox.Show("Ïàïêà ñ ðåïî íå ñóøåñòâóåò.", "", MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBox.Show("Папка с репо не сушествует.", "", MessageBoxButtons.OK, MessageBoxIcon.Error);
return; return;
} }