equal
deleted
inserted
replaced
397 ControllerInit(); // has to happen before InitKbdKeyTable to map keys |
397 ControllerInit(); // has to happen before InitKbdKeyTable to map keys |
398 InitKbdKeyTable(); |
398 InitKbdKeyTable(); |
399 if not allOK then exit; |
399 if not allOK then exit; |
400 |
400 |
401 LoadLocale(cPathz[ptLocale] + '/en.txt'); // Do an initial load with english |
401 LoadLocale(cPathz[ptLocale] + '/en.txt'); // Do an initial load with english |
402 if cLocaleFName <> 'en.txt' then |
402 if cLanguageFName <> 'en.txt' then |
403 begin |
403 begin |
404 // Try two letter locale first before trying specific locale overrides |
404 // Try two letter locale first before trying specific locale overrides |
405 if (Length(cLocale) > 3) and (Copy(cLocale, 1, 2) <> 'en') then |
405 if (Length(cLanguage) > 3) and (Copy(cLanguage, 1, 2) <> 'en') then |
406 begin |
406 begin |
407 LoadLocale(cPathz[ptLocale] + '/' + Copy(cLocale, 1, 2) + '.txt') |
407 LoadLocale(cPathz[ptLocale] + '/' + Copy(cLanguage, 1, 2) + '.txt') |
408 end; |
408 end; |
409 LoadLocale(cPathz[ptLocale] + '/' + cLocaleFName) |
409 LoadLocale(cPathz[ptLocale] + '/' + cLanguageFName) |
410 end |
410 end |
411 else cLocale := 'en'; |
411 else cLanguage := 'en'; |
412 |
412 |
413 if not allOK then exit; |
413 if not allOK then exit; |
414 WriteLnToConsole(msgGettingConfig); |
414 WriteLnToConsole(msgGettingConfig); |
415 |
415 |
416 LoadFonts(); |
416 LoadFonts(); |