From f03bd163f65fe7a1346864fb0c01f8d6f2fc0917 Mon Sep 17 00:00:00 2001 From: marco Date: Sat, 21 Aug 2010 05:18:29 +0000 Subject: * slightly adapted patch from Mantis 17224 from Maxim Ganetsky also look ups with gettext-context if given. git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@15865 3ad0048d-3df7-0310-abae-a5850022a9f2 --- packages/fcl-base/src/gettext.pp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'packages/fcl-base') diff --git a/packages/fcl-base/src/gettext.pp b/packages/fcl-base/src/gettext.pp index 58fce69a46..861dac0e13 100644 --- a/packages/fcl-base/src/gettext.pp +++ b/packages/fcl-base/src/gettext.pp @@ -261,8 +261,14 @@ end; function Translate (Name,Value : AnsiString; Hash : Longint; arg:pointer) : AnsiString; +var contextempty : boolean; begin - Result:=TMOFile(arg).Translate(Value,Hash); + contextempty:=name=''; + Result:=''; + if not contextempty then + Result:=TMOFile(arg).Translate(Name+#4+Value); + if contextempty or (Result='') then + Result:=TMOFile(arg).Translate(Value,Hash); end; -- cgit v1.2.1