paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-16 23:49:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazUtils: merge LazTrimLanguageID to LazGetLanguageIDs, it is used only there now

Browse Source
This commit is contained in:
Maxim Ganetsky 2023-06-06 03:00:26 +03:00
parent d8f4c3990b
commit e13533d1e1
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
components/lazutils/lazutf8.pas
View File

@ -210,7 +210,6 @@ function UTF16ToUTF8(const P: PWideChar; WideCnt: SizeUInt): AnsiString; overloa
// locale // locale
procedure LazGetLanguageIDs(var Lang, FallbackLang: String); procedure LazGetLanguageIDs(var Lang, FallbackLang: String);
procedure LazGetShortLanguageID(var Lang: String); procedure LazGetShortLanguageID(var Lang: String);
procedure LazTrimLanguageID(var Lang: String);
var var
FPUpChars: array[char] of char; FPUpChars: array[char] of char;
@ -4064,6 +4063,8 @@ procedure LazGetLanguageIDs(var Lang, FallbackLang: String);
end; end;
end; end;
{$ENDIF} {$ENDIF}
var
p: SizeInt;
begin begin
{$IFDEF DARWIN} {$IFDEF DARWIN}
if not GetLanguage then if not GetLanguage then
@ -4071,7 +4072,12 @@ begin
{$ELSE} {$ELSE}
GetLanguageIDs(Lang, FallbackLang); GetLanguageIDs(Lang, FallbackLang);
{$ENDIF} {$ENDIF}
LazTrimLanguageID(Lang); //Language ID e. g. on Linux can be in a form of `ru_RU.utf8`, which will prevent
//loading files with name in a form of `project1.ru_RU.po`.
//Trim this trailing encoding.
p := Pos('.', Lang);
if p > 0 then
Lang := Copy(Lang, 1, p - 1);
end; end;
{ {
@ -4089,20 +4095,6 @@ begin
Lang:=FallbackLang; Lang:=FallbackLang;
end; end;
{
Language ID sometimes can be in a form of `ru_RU.utf8`, which will prevent
loading files with language in a form of `.ru_RU.po`.
This procedure trims this encoding.
}
procedure LazTrimLanguageID(var Lang: String);
var
p: SizeInt;
begin
p := Pos('.', Lang);
if p > 0 then
Lang := Copy(Lang, 1, p - 1);
end;
procedure InitFPUpchars; procedure InitFPUpchars;
var var
c: Char; c: Char;