KolibriOS/kolibrios
12
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

[Boot] Update for locales

Browse Source 
- Fixes for new locale codes.
- Some whitespace clean-up.

Reviewed-on: #73
Reviewed-by: Gleb Zaharov <sweetbread@coders-squad.com>
This commit is contained in:
Andrew 2024-06-05 13:45:06 +02:00
commit 415eaef8db
12 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/trunk/boot/bootcode.inc
View File

@ -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
@ -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

0
kernel/trunk/boot/et.inc → kernel/trunk/boot/bootfont-et_EE.inc
View File

0
kernel/trunk/boot/ru.inc → kernel/trunk/boot/bootfont-ru_RU.inc
View File

0
kernel/trunk/boot/bootge.inc → kernel/trunk/boot/bootstr-de_DE.inc
View File

0
kernel/trunk/boot/booten.inc → kernel/trunk/boot/bootstr-en_US.inc
View File

0
kernel/trunk/boot/bootsp.inc → kernel/trunk/boot/bootstr-es_ES.inc
View File

0
kernel/trunk/boot/bootet.inc → kernel/trunk/boot/bootstr-et_EE.inc
View File

0
kernel/trunk/boot/bootru.inc → kernel/trunk/boot/bootstr-ru_RU.inc
View File

17
kernel/trunk/bootbios.inc
View File

@ -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

25
kernel/trunk/data32.inc
View File

@ -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
@ -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
@ -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

2
kernel/trunk/kernel.asm
View File

@ -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

2
kernel/trunk/kernelsp.inc
View File

@ -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,$