paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-20 08:29:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazUtils: Make LazGetLanguageIDs and LazGetShortLanguageID procedures use results of GetLanguageID function from Translations unit. Also deprecate LazGetLanguageIDs and LazGetShortLanguageID.

Browse Source
This commit is contained in:
Maxim Ganetsky 2023-06-12 03:19:19 +03:00
parent bb19283344
commit 65ed61c3ba
1 changed files with 10 additions and 15 deletions

25
components/lazutils/lazutf8.pas
View File

@ -208,8 +208,8 @@ function UTF16ToUTF8(const S: UnicodeString): AnsiString; overload; inline;
function UTF16ToUTF8(const P: PWideChar; WideCnt: SizeUInt): AnsiString; overload;
// locale
procedure LazGetLanguageIDs(var Lang, FallbackLang: String);
procedure LazGetShortLanguageID(var Lang: String);
procedure LazGetLanguageIDs(var Lang, FallbackLang: String); deprecated 'Use GetLanguageID function from Translations unit instead'; // Lazarus 2.3.0
procedure LazGetShortLanguageID(var Lang: String); deprecated 'Use GetLanguageID function from Translations unit instead'; // Lazarus 2.3.0
var
FPUpChars: array[char] of char;
@ -217,7 +217,7 @@ var
implementation
uses
gettext;
Translations;
{$IFDEF WinCE}
// CP_UTF8 is missing in the windows unit of the Windows CE RTL
@ -4019,15 +4019,11 @@ end;
procedure LazGetLanguageIDs(var Lang, FallbackLang: String);
var
p: SizeInt;
LangID: TLanguageID;
begin
GetLanguageIDs(Lang, FallbackLang);
//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);
LangID := GetLanguageID;
Lang := LangID.LanguageID;
FallbackLang := LangID.LanguageCode;
end;
{
@ -4038,11 +4034,10 @@ or ISO 639-2, if the language has no code in ISO 639-1.
}
procedure LazGetShortLanguageID(var Lang: String);
var
FallbackLang: String;
LangID: TLanguageID;
begin
FallbackLang:='';
LazGetLanguageIDs(Lang, FallbackLang);
Lang:=FallbackLang;
LangID := GetLanguageID;
Lang:=LangID.LanguageCode;
end;
procedure InitFPUpchars;