Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update language support for new locale codes #30

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@ trim_trailing_whitespace = true
end_of_line = lf
insert_final_newline = true

[*.{asm,inc}]
[*.{asm,inc,ASM,INC}]
indent_size = 8

[kernel/**.{asm,inc}]
[kernel/**.{asm,inc,ASM,INC}]
charset = utf-8

[*.{bat,cmd}]
[*.{bat,cmd,BAT,CMD}]
# Prefer Windows line endings
end_of_line = crlf
4 changes: 2 additions & 2 deletions kernel/trunk/boot/bootcode.inc
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ end if
int 0x10

if lang eq ru_RU
; Load & set russian VGA font (RU.INC)
; Load & set Russian VGA font 'bootfont-ru_RU'
mov bp, RU_FNT1 ; RU_FNT1 - First part
mov bx, 1000h ; 768 bytes
mov cx, 30h ; 48 symbols
Expand All @@ -329,8 +329,8 @@ if lang eq ru_RU
mov dx, 0E0h ; 224 - position of first symbol
mov ax, 1100h
int 10h
; End set VGA russian font
else if lang eq et_EE
; Load & set Estonian VGA font 'bootfont-et_EE'
mov bp, ET_FNT ; ET_FNT1
mov bx, 1000h ;
mov cx, 255 ; 256 symbols
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
17 changes: 9 additions & 8 deletions kernel/trunk/bootbios.inc
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,25 @@ org 0
; struct kernel_header
jmp start_of_code ; jump
db 'KolibriOS ' ; signature
db 'v0.7.7.0+ ',13,10,13,10,0 ; version
db 'v0.7.7.0 ',13,10,13,10,0 ; FIXME: get distribution version from git tag
dd B32-KERNEL_BASE ; offset of the kernel's 32-bit entry point

include "boot/bootstr.inc" ; language-independent boot messages
include "boot/preboot.inc"

; Language support for locales: de_DE, es_ES, ru_RU (CP866), et_EE, en_US.
if lang eq de_DE
include "boot/bootge.inc" ; german system boot messages
include "boot/bootstr-de_DE.inc" ; German system boot messages
else if lang eq es_ES
include "boot/bootsp.inc" ; spanish system boot messages
include "boot/bootstr-es_ES.inc" ; Spanish system boot messages
else if lang eq ru_RU
include "boot/bootru.inc" ; russian system boot messages
include "boot/ru.inc" ; Russian font
include "boot/bootstr-ru_RU.inc" ; Russian system boot messages
include "boot/bootfont-ru_RU.inc" ; Russian font
else if lang eq et_EE
include "boot/bootet.inc" ; estonian system boot messages
include "boot/et.inc" ; Estonian font
include "boot/bootstr-et_EE.inc" ; Estonian system boot messages
include "boot/bootfont-et_EE.inc" ; Estonian font
else
include "boot/booten.inc" ; english system boot messages
include "boot/bootstr-en_US.inc" ; English system boot messages (default)
end if

include "boot/bootcode.inc" ; 16 bit system boot code
Expand Down
25 changes: 13 additions & 12 deletions kernel/trunk/data32.inc
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ keymap_alt:
db 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'


; Language support for locales: ru_RU (UTF-8), es_ES (data32sp.inc), et_EE (data32et.inc), en_US.

if lang eq ru_RU
boot_initirq cp866 'Инициализация IRQ',0
Expand Down Expand Up @@ -92,7 +93,7 @@ else if lang eq es_ES
include 'data32sp.inc'
else if lang eq et_EE
include 'data32et.inc'
else
else ; Default to en_US
boot_initirq db 'Initialize IRQ',0
boot_picinit db 'Initialize PIC',0
boot_v86machine db 'Initialize system V86 machine',0
Expand Down Expand Up @@ -198,27 +199,27 @@ MIN_DEFAULT_DLL_ADDR = 0x70000000
dll_cur_addr dd MIN_DEFAULT_DLL_ADDR


if lang eq en_US
if lang eq en_US ; English (American)
SYSLANG = 1
else if lang eq fi_FI
else if lang eq fi_FI ; Finnish
SYSLANG = 2
else if lang eq de_DE
else if lang eq de_DE ; German
SYSLANG = 3
else if lang eq ru_RU
else if lang eq ru_RU ; Russian
SYSLANG = 4
else if lang eq fr_FR
else if lang eq fr_FR ; French
SYSLANG = 5
else if lang eq et_EE
else if lang eq et_EE ; Estonian
SYSLANG = 6
else if lang eq uk_UA
else if lang eq uk_UA ; Ukrainian
SYSLANG = 7
else if lang eq it_IT
else if lang eq it_IT ; Italian
SYSLANG = 8
else if lang eq nl_BE
else if lang eq nl_BE ; Flemish
SYSLANG = 9
else if lang eq es_ES
else if lang eq es_ES ; Spanish
SYSLANG = 10
else if lang eq ca_ES
else if lang eq ca_ES ; Catalan
SYSLANG = 11
else
display 'unsupported language specified',13,10
Expand Down
2 changes: 1 addition & 1 deletion kernel/trunk/kernel.asm
Original file line number Diff line number Diff line change
Expand Up @@ -2288,7 +2288,7 @@ endg

iglobal
version_inf:
db 0,7,7,0 ; version 0.7.7.0
db 0,7,7,0 ; FIXME: Get distribution version from git tag
db 0
.rev dd __REV__
.size = $ - version_inf
Expand Down
2 changes: 1 addition & 1 deletion kernel/trunk/kernelsp.inc
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@

; Éste archivo debe ser editado con codificación CP866

version cp850 'KolibriOS versión 0.7.7.0+ ',13,10,13,10,0
version cp850 'KolibriOS versión 0.7.7.0 ',13,10,13,10,0 ; FIXME: Get distribution version from git tag
diff16 "fin del código del kernel",0,$
Loading