paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-28 21:41:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcl: default translator

Browse Source 
- don't use directory separator after ExtractFilePath()
  - convert utf8 path strings to the system encoding when we pass it to the rtl/fcl (fixes bug #0012783)

git-svn-id: trunk@18648 -
This commit is contained in:
paul 2009-02-12 14:44:56 +00:00
parent e2d9e217f5
commit 6285c8757d
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lcl/defaulttranslator.pas
View File

@ -80,19 +80,19 @@ begin
if LANG<>'' then begin if LANG<>'' then begin
//ParamStrUTF8(0) is said not to work properly in linux, but I've tested it //ParamStrUTF8(0) is said not to work properly in linux, but I've tested it
Result:=ExtractFilePath(ParamStrUTF8(0))+DirectorySeparator+LANG+ Result:=ExtractFilePath(ParamStrUTF8(0))+LANG+
DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.mo'); DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.mo');
if FileExistsUTF8(Result) then exit; if FileExistsUTF8(Result) then exit;
Result:=ExtractFilePath(ParamStrUTF8(0))+DirectorySeparator+'languages'+DirectorySeparator+LANG+ Result:=ExtractFilePath(ParamStrUTF8(0))+'languages'+DirectorySeparator+LANG+
DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.mo'); DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.mo');
if FileExistsUTF8(Result) then exit; if FileExistsUTF8(Result) then exit;
Result:=ExtractFilePath(ParamStrUTF8(0))+DirectorySeparator+'locale'+DirectorySeparator Result:=ExtractFilePath(ParamStrUTF8(0))+'locale'+DirectorySeparator
+LANG+DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.mo'); +LANG+DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.mo');
if FileExistsUTF8(Result) then exit; if FileExistsUTF8(Result) then exit;
Result:=ExtractFilePath(ParamStrUTF8(0))+DirectorySeparator+'locale'+DirectorySeparator Result:=ExtractFilePath(ParamStrUTF8(0))+'locale'+DirectorySeparator
+LANG+DirectorySeparator+'LC_MESSAGES'+DirectorySeparator+ +LANG+DirectorySeparator+'LC_MESSAGES'+DirectorySeparator+
ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.mo'); ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.mo');
if FileExistsUTF8(Result) then exit; if FileExistsUTF8(Result) then exit;
@ -106,19 +106,19 @@ begin
//Let us search for reducted files //Let us search for reducted files
lng:=copy(LANG,1,2); lng:=copy(LANG,1,2);
//At first, check all was checked //At first, check all was checked
Result:=ExtractFilePath(ParamStrUTF8(0))+DirectorySeparator+lng+ Result:=ExtractFilePath(ParamStrUTF8(0))+lng+
DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.mo'); DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.mo');
if FileExistsUTF8(Result) then exit; if FileExistsUTF8(Result) then exit;
Result:=ExtractFilePath(ParamStrUTF8(0))+DirectorySeparator+'languages'+DirectorySeparator+lng+ Result:=ExtractFilePath(ParamStrUTF8(0))+'languages'+DirectorySeparator+lng+
DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.mo'); DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.mo');
if FileExistsUTF8(Result) then exit; if FileExistsUTF8(Result) then exit;
Result:=ExtractFilePath(ParamStrUTF8(0))+DirectorySeparator+'locale'+DirectorySeparator Result:=ExtractFilePath(ParamStrUTF8(0))+'locale'+DirectorySeparator
+lng+DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.mo'); +lng+DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.mo');
if FileExistsUTF8(Result) then exit; if FileExistsUTF8(Result) then exit;
Result:=ExtractFilePath(ParamStrUTF8(0))+DirectorySeparator+'locale'+DirectorySeparator Result:=ExtractFilePath(ParamStrUTF8(0))+'locale'+DirectorySeparator
+LANG+DirectorySeparator+'LC_MESSAGES'+DirectorySeparator+ +LANG+DirectorySeparator+'LC_MESSAGES'+DirectorySeparator+
ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.mo'); ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.mo');
if FileExistsUTF8(Result) then exit; if FileExistsUTF8(Result) then exit;
@ -129,10 +129,10 @@ begin
Result:=ExtractFilePath(ParamStrUTF8(0))+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.'+LANG)+'.mo'; Result:=ExtractFilePath(ParamStrUTF8(0))+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.'+LANG)+'.mo';
if FileExistsUTF8(Result) then exit; if FileExistsUTF8(Result) then exit;
//Common location (like in Lazarus) //Common location (like in Lazarus)
Result:=ExtractFilePath(ParamStrUTF8(0))+DirectorySeparator+'locale'+DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.'+LANG)+'.mo'; Result:=ExtractFilePath(ParamStrUTF8(0))+'locale'+DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.'+LANG)+'.mo';
if FileExistsUTF8(Result) then exit; if FileExistsUTF8(Result) then exit;
Result:=ExtractFilePath(ParamStrUTF8(0))+DirectorySeparator+'languages'+DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.'+LANG)+'.mo'; Result:=ExtractFilePath(ParamStrUTF8(0))+'languages'+DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.'+LANG)+'.mo';
if FileExistsUTF8(Result) then exit; if FileExistsUTF8(Result) then exit;
except except
Result:='';//Or do something else (useless) Result:='';//Or do something else (useless)
@ -145,10 +145,10 @@ begin
Result:=ExtractFilePath(ParamStrUTF8(0))+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.'+lng)+'.mo'; Result:=ExtractFilePath(ParamStrUTF8(0))+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.'+lng)+'.mo';
if FileExistsUTF8(Result) then exit; if FileExistsUTF8(Result) then exit;
Result:=ExtractFilePath(ParamStrUTF8(0))+DirectorySeparator+'locale'+DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.'+lng)+'.mo'; Result:=ExtractFilePath(ParamStrUTF8(0))+'locale'+DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.'+lng)+'.mo';
if FileExistsUTF8(Result) then exit; if FileExistsUTF8(Result) then exit;
Result:=ExtractFilePath(ParamStrUTF8(0))+DirectorySeparator+'languages'+DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.'+lng)+'.mo'; Result:=ExtractFilePath(ParamStrUTF8(0))+'languages'+DirectorySeparator+ChangeFileExt(ExtractFileName(ParamStrUTF8(0)),'.'+lng)+'.mo';
if FileExistsUTF8(Result) then exit; if FileExistsUTF8(Result) then exit;
end; end;
Result:=ChangeFileExt(ParamStrUTF8(0),'.mo'); Result:=ChangeFileExt(ParamStrUTF8(0),'.mo');
@ -163,7 +163,7 @@ var lcfn:string;
constructor TDefaultTranslator.Create(MOFileName: string); constructor TDefaultTranslator.Create(MOFileName: string);
begin begin
inherited Create; inherited Create;
FMOFile:=TMOFile.Create(MOFileName); FMOFile:=TMOFile.Create(UTF8ToSys(MOFileName));
end; end;
destructor TDefaultTranslator.Destroy; destructor TDefaultTranslator.Destroy;
@ -205,7 +205,7 @@ initialization
if lcfn<>'' then if lcfn<>'' then
begin begin
TranslateResourceStrings(lcfn); TranslateResourceStrings(UTF8ToSys(lcfn));
LCLPath:=ExtractFileName(lcfn); LCLPath:=ExtractFileName(lcfn);
Dot1:=pos('.',LCLPath); Dot1:=pos('.',LCLPath);
if Dot1>1 then if Dot1>1 then
@ -213,7 +213,7 @@ initialization
Delete(LCLPath,1,Dot1-1); Delete(LCLPath,1,Dot1-1);
LCLPath:=ExtractFilePath(lcfn)+'lcl'+LCLPath; LCLPath:=ExtractFilePath(lcfn)+'lcl'+LCLPath;
if FileExistsUTF8(LCLPath) then if FileExistsUTF8(LCLPath) then
TranslateResourceStrings(LCLPath); TranslateResourceStrings(UTF8ToSys(LCLPath));
end; end;
LRSTranslator:=TDefaultTranslator.Create(lcfn); LRSTranslator:=TDefaultTranslator.Create(lcfn);