Skip to content

Commit

Permalink
Combined Russian and English changelogs into a single file.
Browse files Browse the repository at this point in the history
  • Loading branch information
MKadaner committed Jan 17, 2021
1 parent 13d47a5 commit 8c7f3d5
Show file tree
Hide file tree
Showing 16 changed files with 27,923 additions and 29,335 deletions.
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
*.cs text diff=csharp
*.sh text eol=lf
[Cc]hangelog text
changelog_eng text

# Custom for Visual Studio
*.sln text merge=union eol=crlf
Expand Down
21 changes: 6 additions & 15 deletions CONTRIBUTING-RU.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,23 +43,14 @@
может быть непонятен для "будущих поколений".
2. Изменения добавляются в начало файла.
3. Каждая запись начинается с шапки вида:
> warp 05.12.2006 01:39:38 +0300 - build 2149
```
--------------------------------------------------------------------------------
warp 05.12.2006 01:39:38 +0300 - build 2149
```
4. Изменениям может не присваиваться билд, например, была косметика или
изменения не в коде.
5. Пример макроса для создания шапки:

```lua
Macro {
area="Editor"; key="Ctrl`"; action = function()
Keys("CtrlHome End CtrlLeft")
build=mf.int(mf.substr(Editor.Value,Editor.RealPos-1))+1;
Keys("CtrlHome")
print(mf.date("name %d.%m0.%Y %H:%M:%S %z - build ")) print(build)
for RCounter=4,1,-1 do Keys("Enter") end
Keys("Up Up 1 . Space")
end;
}
```
5. Пример макроса для создания шапки: [ChangelogHeader.lua](./misc/changelog/ChangelogHeader.lua)

#### farversion.m4

1. Этот файл содержит информацию для генерирования версии Far:
Expand Down
19 changes: 5 additions & 14 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,13 @@ cd far
not self-explanatory and won't be understood by "future generations".
2. Recent changes go on top.
3. Each entry starts with a header of the form:
> warp 05.12.2006 01:39:38 +0300 - build 2149
```
--------------------------------------------------------------------------------
warp 05.12.2006 01:39:38 +0300 - build 2149
```
4. Changes not always require a build increase (i.e. cosmetic or non code
related changes).
5. Sample macro to generate the header:
```lua
Macro {
area="Editor"; key="Ctrl`"; action = function()
Keys("CtrlHome End CtrlLeft")
build=mf.int(mf.substr(Editor.Value,Editor.RealPos-1))+1;
Keys("CtrlHome")
print(mf.date("name %d.%m0.%Y %H:%M:%S %z - build ")) print(build)
for RCounter=4,1,-1 do Keys("Enter") end
Keys("Up Up 1 . Space")
end;
}
```
5. Sample macro to generate the header: [ChangelogHeader.lua](./misc/changelog/ChangelogHeader.lua)

#### farversion.m4

Expand Down
Loading

0 comments on commit 8c7f3d5

Please sign in to comment.