summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authormarco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2>2010-08-21 05:18:29 +0000
committermarco <marco@3ad0048d-3df7-0310-abae-a5850022a9f2>2010-08-21 05:18:29 +0000
commitf03bd163f65fe7a1346864fb0c01f8d6f2fc0917 (patch)
tree821296a7cfd6f77c1f84f27b33eae2eb40c3c3f9 /packages
parent0e5a6cedee287eb076669a463c759aa835127698 (diff)
downloadfpc-f03bd163f65fe7a1346864fb0c01f8d6f2fc0917.tar.gz
* 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
Diffstat (limited to 'packages')
-rw-r--r--packages/fcl-base/src/gettext.pp8
1 files changed, 7 insertions, 1 deletions
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;