Common_Calendar.lua | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/Common_Calendar.lua b/Common_Calendar.lua
index 2c3c6b0..de95564 100644
--- a/Common_Calendar.lua
+++ b/Common_Calendar.lua
@@ -34,7 +34,7 @@ local Colors = {
local function Localization()
if far.lang == "Russian" then
return {
- Title = "Календарь";
+ Title = "Календарь"; F1Hint = "F1 - справка по форматам";
DaysOfWeek = { "Пн", "Вт", "Ср", "Чт", "Пт", "Сб", "Вс" }; Mon = "Пн"; Sun = "Вс";
Months = { "&Январь", "&Февраль", "&Март", "&Апрель", "Ма&й", "И&юнь", "Ию&ль", "Ав&густ", "&Сентябрь", "&Октябрь", "&Ноябрь", "&Декабрь" };
Year = '&Г:'; Month = '&М:'; DateFormat = '&Ф:'; Info = '&И:'; FormattedDate = '&Д:';
@@ -42,7 +42,7 @@ local function Localization()
}
else
return {
- Title = "Calendar";
+ Title = "Calendar"; F1Hint = "F1 - help on formats";
DaysOfWeek = { "Mo", "Tu", "We", "Th", "Fr", "Sa", "Su" }; Mon = "M&o"; Sun = "S&u";
Months = { "&January", "&February", "&March", "&April", "Ma&y", "Ju&ne", "Ju&ly", "Au&gust", "&September", "&October", "&November", "&December" };
Year = '&Y:'; Month = '&M:'; DateFormat = '&F:'; Info = '&I:'; FormattedDate = '&D:';
@@ -59,8 +59,6 @@ local F = far.Flags
local SendDlgMessage = far.SendDlgMessage
local fmt = string.format
local band = bit.band
-local tonumber = tonumber
-local tostring = tostring
local floor = math.floor
local sort = table.sort
@@ -195,7 +193,8 @@ local function ExecCalendar()
I[#I + 1] = { F.DI_USERCONTROL, 4, row + 1, 31, row + 6, 0, 0, 0, F.DIF_FOCUS }
ID.userControl = #I
- I[#I + 1] = { F.DI_TEXT, 5, 13, 0, 13, 0, 0, 0, 0, Localization().DateFormat }
+ I[#I + 1] = { F.DI_TEXT, 5, 12, 30, 12, 0, 0, 0, F.DIF_DISABLE + F.DIF_CENTERTEXT, Localization().F1Hint }
+ I[#I + 1] = { F.DI_TEXT, 5, 13, 0, 13, 0, 0, 0, 0, Localization().DateFormat }
I[#I + 1] = { F.DI_EDIT, 7, 13, 15, 13, 0, "Format", 0, F.DIF_HISTORY, Settings.Format }
ID.format = #I
I[#I + 1] = { F.DI_TEXT, 18, 13, 0, 13, 0, 0, 0, 0, Localization().Info }
@@ -264,7 +263,7 @@ local function ExecCalendar()
tableSelected = currentId
elseif dayIsToday then
CF[id] = Colors.Today
- dayFormat = "-%2s-"
+ dayFormat = "‹%2s›"
elseif day:getmonth() ~= dt:getmonth() then
CF[id] = Colors.Disabled
elseif ((Settings.FirstSunday and mod(d - 2, 7) + 1 or d)) > 5 then