MIME-Version: 1.0
References: 
 <CAKtn9dP2TmBCqHxV0szjdmCEVLbJwBNXA6rsumoOKeQJG1qyUw@mail.gmail.com>
 <CA+OCxoxE+OK3_KW_vu_pWY4+t5qyH985_Znp7v+uA2vmYRo2BQ@mail.gmail.com>
In-Reply-To: 
 <CA+OCxoxE+OK3_KW_vu_pWY4+t5qyH985_Znp7v+uA2vmYRo2BQ@mail.gmail.com>
From: Rahul Shirsat <rahul.shirsat@enterprisedb.com>
Date: Tue, 29 Jun 2021 09:08:13 +0530
Message-ID: 
 <CAKtn9dOWXDQo9K_HuqGOmhq=AeVVzcE8d=J+8obRj014G=0jxQ@mail.gmail.com>
Subject: Re: [patch][pgAdmin] Fix for pgadmin4-linux-qa #1651 failure
To: Dave Page <dpage@pgadmin.org>
Cc: pgadmin-hackers <pgadmin-hackers@postgresql.org>
Content-Type: multipart/mixed; boundary="00000000000017709f05c5df5814"
Archived-At: 
 <https://www.postgresql.org/message-id/CAKtn9dOWXDQo9K_HuqGOmhq%3DAeVVzcE8d%3DJ%2B8obRj014G%3D0jxQ%40mail.gmail.com>
Precedence: bulk

--00000000000017709f05c5df5814
Content-Type: multipart/alternative; boundary="00000000000017709c05c5df5812"

--00000000000017709c05c5df5812
Content-Type: text/plain; charset="UTF-8"

I feel gettext sometimes won't escape the characters as it should be.

I now tried to escape those using some utils.

Please find the updated patch.

On Mon, Jun 28, 2021 at 9:33 PM Dave Page <dpage@pgadmin.org> wrote:

> Hi
>
> On Mon, Jun 28, 2021 at 4:57 PM Rahul Shirsat <
> rahul.shirsat@enterprisedb.com> wrote:
>
>> Hi Hackers,
>>
>> Please find the attached patch for fixation of jenkins failure.
>>
>
> That won't work - you can't include variables (or string building
> operations) in the first argument to gettext calls, as there won't be any
> way to extract a complete message into the catalogs. The way it's being
> done at the moment is correct (I don't know why it's failing, but it's the
> correct way to structure the gettext calls).
>
> --
> Dave Page
> Blog: https://pgsnake.blogspot.com
> Twitter: @pgsnake
>
> EDB: https://www.enterprisedb.com
>
>

-- 
*Rahul Shirsat*
Senior Software Engineer | EnterpriseDB Corporation.

--00000000000017709c05c5df5812
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">I feel gettext sometimes won&#39;t escape the characters a=
s it should be.<div><br></div><div>I now tried to escape those using some u=
tils.</div><div><br></div><div>Please=C2=A0find the updated patch.</div></d=
iv><br><div class=3D"gmail_quote"><div dir=3D"ltr" class=3D"gmail_attr">On =
Mon, Jun 28, 2021 at 9:33 PM Dave Page &lt;<a href=3D"mailto:dpage@pgadmin.=
org">dpage@pgadmin.org</a>&gt; wrote:<br></div><blockquote class=3D"gmail_q=
uote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,2=
04);padding-left:1ex"><div dir=3D"ltr"><div>Hi</div><br><div class=3D"gmail=
_quote"><div dir=3D"ltr" class=3D"gmail_attr">On Mon, Jun 28, 2021 at 4:57 =
PM Rahul Shirsat &lt;<a href=3D"mailto:rahul.shirsat@enterprisedb.com" targ=
et=3D"_blank">rahul.shirsat@enterprisedb.com</a>&gt; wrote:<br></div><block=
quote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1=
px solid rgb(204,204,204);padding-left:1ex"><div dir=3D"ltr">Hi Hackers,<di=
v><br></div><div>Please find the attached patch for fixation of jenkins fai=
lure.</div></div></blockquote><div><br></div><div>That won&#39;t work - you=
 can&#39;t include variables (or string building operations) in the first a=
rgument=C2=A0to gettext calls, as there won&#39;t be any way to extract a c=
omplete message into the catalogs. The way it&#39;s being done at the momen=
t is correct (I don&#39;t know why it&#39;s failing, but it&#39;s the corre=
ct way to structure the gettext calls).</div><div>=C2=A0</div></div>-- <br>=
<div dir=3D"ltr"><div dir=3D"ltr">Dave Page<br>Blog: <a href=3D"https://pgs=
nake.blogspot.com" target=3D"_blank">https://pgsnake.blogspot.com</a><br>Tw=
itter: @pgsnake<br><br>EDB: <a href=3D"https://www.enterprisedb.com" target=
=3D"_blank">https://www.enterprisedb.com</a><br><br></div></div></div>
</blockquote></div><br clear=3D"all"><div><br></div>-- <br><div dir=3D"ltr"=
 class=3D"gmail_signature"><div dir=3D"ltr"><div><div dir=3D"ltr"><div dir=
=3D"ltr"><div style=3D"color:rgb(0,0,0);font-family:Helvetica;font-size:12p=
x"><b style=3D"color:rgb(96,96,97)">Rahul Shirsat</b><br></div><div style=
=3D"color:rgb(0,0,0);font-family:Helvetica;font-size:12px"><font color=3D"#=
5f5e5f">Senior Software Engineer=C2=A0|=C2=A0EnterpriseDB=C2=A0Corporation.=
</font></div></div></div></div></div></div>

--00000000000017709c05c5df5812--

--00000000000017709f05c5df5814
Content-Type: application/octet-stream; name="jenkins_failure_fix_v2.patch"
Content-Disposition: attachment; filename="jenkins_failure_fix_v2.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_kqhi23im0>
X-Attachment-Id: f_kqhi23im0

ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3Jv
bGVzL3N0YXRpYy9qcy9yb2xlLmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz
L3NlcnZlcnMvcm9sZXMvc3RhdGljL2pzL3JvbGUuanMKaW5kZXggNTU3ZTQ0YjdhLi40YzJjYjA0
YWIgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJz
L3JvbGVzL3N0YXRpYy9qcy9yb2xlLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVy
X2dyb3Vwcy9zZXJ2ZXJzL3JvbGVzL3N0YXRpYy9qcy9yb2xlLmpzCkBAIC03NDgsNiArNzQ4LDQx
IEBAIGRlZmluZSgncGdhZG1pbi5ub2RlLnJvbGUnLCBbCiAgICAgICAgICAgICAgICAgLy8gc2V0
IGRlZmF1bHQgcm9sZSBvcGVyYXRpb24gYXMgcmVhc3NpZ24KICAgICAgICAgICAgICAgICB0aGlz
LnZpZXcubW9kZWwuc2V0KHsncm9sZV9vcCc6ICdyZWFzc2lnbid9KTsKICAgICAgICAgICAgICAg
fSwKKyAgICAgICAgICAgICAgY29uZmlybURpYWxvZzogZnVuY3Rpb24oZGF0YSwgdXJsKSB7CisK
KyAgICAgICAgICAgICAgICB2YXIgcm9sZU9wID0gZGF0YS5yb2xlX29wLAorICAgICAgICAgICAg
ICAgICAgY29uZmlybUJveFRpdGxlID0gdXRpbHMudGl0bGVpemUocm9sZU9wKSwKKyAgICAgICAg
ICAgICAgICAgIHRpdGxlID0gdXRpbHMuc3ByaW50ZignJXMgT2JqZWN0cycsIGNvbmZpcm1Cb3hU
aXRsZSksCisgICAgICAgICAgICAgICAgICBtc2cgPSB1dGlscy5zcHJpbnRmKCdBcmUgeW91IHN1
cmUgeW91IHdpc2ggdG8gJXMgYWxsIHRoZSBvYmplY3RzIG93bmVkIGJ5IHRoZSBzZWxlY3RlZCBy
b2xlPycsIHJvbGVPcCk7CisKKyAgICAgICAgICAgICAgICBhbGVydGlmeS5jb25maXJtKAorICAg
ICAgICAgICAgICAgICAgZ2V0dGV4dCh0aXRsZSksCisgICAgICAgICAgICAgICAgICBnZXR0ZXh0
KG1zZyksCisgICAgICAgICAgICAgICAgICBmdW5jdGlvbigpIHsKKyAgICAgICAgICAgICAgICAg
ICAgYXhpb3MucG9zdCgKKyAgICAgICAgICAgICAgICAgICAgICB1cmwsCisgICAgICAgICAgICAg
ICAgICAgICAgZGF0YQorICAgICAgICAgICAgICAgICAgICApLnRoZW4oZnVuY3Rpb24gKHJlc3Bv
bnNlKSB7CisgICAgICAgICAgICAgICAgICAgICAgaWYocmVzcG9uc2UuZGF0YSkKKyAgICAgICAg
ICAgICAgICAgICAgICAgIGFsZXJ0aWZ5LnN1Y2Nlc3MocmVzcG9uc2UuZGF0YS5pbmZvKTsKKyAg
ICAgICAgICAgICAgICAgICAgfSkuY2F0Y2goZnVuY3Rpb24gKGVycm9yKSB7CisgICAgICAgICAg
ICAgICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0IGVyciA9IGVy
cm9yLnJlc3BvbnNlLmRhdGE7CisgICAgICAgICAgICAgICAgICAgICAgICBhbGVydGlmeS5hbGVy
dCgKKyAgICAgICAgICAgICAgICAgICAgICAgICAgZ2V0dGV4dCgnUm9sZSByZWFzc2lnbi9kcm9w
IGZhaWxlZC4nKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgZXJyLmVycm9ybXNnCisgICAg
ICAgICAgICAgICAgICAgICAgICApOworICAgICAgICAgICAgICAgICAgICAgIH0gY2F0Y2ggKGUp
IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnNvbGUud2FybihlLnN0YWNrIHx8IGUpOwor
ICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgfSk7CisgICAgICAg
ICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgICAgZnVuY3Rpb24oKSB7IHJldHVybiB0cnVl
OyB9CisgICAgICAgICAgICAgICAgKS5zZXQoJ2xhYmVscycsIHsKKyAgICAgICAgICAgICAgICAg
IG9rOiBnZXR0ZXh0KCdZZXMnKSwKKyAgICAgICAgICAgICAgICAgIGNhbmNlbDogZ2V0dGV4dCgn
Tm8nKSwKKyAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgICAgfSwKICAgICAgICAgICAg
ICAgLy8gQ2FsbGJhY2sgZnVuY3Rpb25zIHdoZW4gY2xpY2sgb24gdGhlIGJ1dHRvbnMgb2YgdGhl
IGFsZXJ0aWZ5IGRpYWxvZ3MKICAgICAgICAgICAgICAgY2FsbGJhY2s6IGZ1bmN0aW9uKGUpIHsK
ICAgICAgICAgICAgICAgICBpZiAoZS5idXR0b24uZWxlbWVudC5uYW1lID09ICdkaWFsb2dfaGVs
cCcpIHsKQEAgLTc1NywzOCArNzkyLDggQEAgZGVmaW5lKCdwZ2FkbWluLm5vZGUucm9sZScsIFsK
ICAgICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAg
ICAgICAgaWYgKGUuYnV0dG9uLnRleHQgPT09IGdldHRleHQoJ09LJykpIHsKLQotICAgICAgICAg
ICAgICAgICAgbGV0IHJvbGVSZWFzc2lnbkRhdGEgPSB0aGlzLnZpZXcubW9kZWwudG9KU09OKCks
Ci0gICAgICAgICAgICAgICAgICAgIHJvbGVPcCA9IHJvbGVSZWFzc2lnbkRhdGEucm9sZV9vcCwK
LSAgICAgICAgICAgICAgICAgICAgY29uZmlybUJveFRpdGxlID0gdXRpbHMudGl0bGVpemUocm9s
ZU9wKTsKLQotICAgICAgICAgICAgICAgICAgYWxlcnRpZnkuY29uZmlybSgKLSAgICAgICAgICAg
ICAgICAgICAgZ2V0dGV4dCgnJXMgT2JqZWN0cycsIGNvbmZpcm1Cb3hUaXRsZSksCi0gICAgICAg
ICAgICAgICAgICAgIGdldHRleHQoJ0FyZSB5b3Ugc3VyZSB5b3Ugd2lzaCB0byAlcyBhbGwgdGhl
IG9iamVjdHMgb3duZWQgYnkgdGhlIHNlbGVjdGVkIHJvbGU/Jywgcm9sZU9wKSwKLSAgICAgICAg
ICAgICAgICAgICAgZnVuY3Rpb24oKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgYXhpb3MucG9z
dCgKLSAgICAgICAgICAgICAgICAgICAgICAgIGZpbmFsVXJsLAotICAgICAgICAgICAgICAgICAg
ICAgICAgcm9sZVJlYXNzaWduRGF0YQotICAgICAgICAgICAgICAgICAgICAgICkudGhlbihmdW5j
dGlvbiAocmVzcG9uc2UpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlmKHJlc3BvbnNlLmRh
dGEpCi0gICAgICAgICAgICAgICAgICAgICAgICAgIGFsZXJ0aWZ5LnN1Y2Nlc3MocmVzcG9uc2Uu
ZGF0YS5pbmZvKTsKLSAgICAgICAgICAgICAgICAgICAgICB9KS5jYXRjaChmdW5jdGlvbiAoZXJy
b3IpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHRyeSB7Ci0gICAgICAgICAgICAgICAgICAg
ICAgICAgIGNvbnN0IGVyciA9IGVycm9yLnJlc3BvbnNlLmRhdGE7Ci0gICAgICAgICAgICAgICAg
ICAgICAgICAgIGFsZXJ0aWZ5LmFsZXJ0KAotICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdl
dHRleHQoJ1JvbGUgcmVhc3NpZ24vZHJvcCBmYWlsZWQuJyksCi0gICAgICAgICAgICAgICAgICAg
ICAgICAgICAgZXJyLmVycm9ybXNnCi0gICAgICAgICAgICAgICAgICAgICAgICAgICk7Ci0gICAg
ICAgICAgICAgICAgICAgICAgICB9IGNhdGNoIChlKSB7Ci0gICAgICAgICAgICAgICAgICAgICAg
ICAgIGNvbnNvbGUud2FybihlLnN0YWNrIHx8IGUpOwotICAgICAgICAgICAgICAgICAgICAgICAg
fQotICAgICAgICAgICAgICAgICAgICAgIH0pOwotICAgICAgICAgICAgICAgICAgICB9LAotICAg
ICAgICAgICAgICAgICAgICBmdW5jdGlvbigpIHsgcmV0dXJuIHRydWU7IH0KLSAgICAgICAgICAg
ICAgICAgICkuc2V0KCdsYWJlbHMnLCB7Ci0gICAgICAgICAgICAgICAgICAgIG9rOiBnZXR0ZXh0
KCdZZXMnKSwKLSAgICAgICAgICAgICAgICAgICAgY2FuY2VsOiBnZXR0ZXh0KCdObycpLAotICAg
ICAgICAgICAgICAgICAgfSk7CisgICAgICAgICAgICAgICAgICBsZXQgcm9sZVJlYXNzaWduRGF0
YSA9IHRoaXMudmlldy5tb2RlbC50b0pTT04oKTsKKyAgICAgICAgICAgICAgICAgIHRoaXMuY29u
ZmlybURpYWxvZyhyb2xlUmVhc3NpZ25EYXRhLCBmaW5hbFVybCk7CiAgICAgICAgICAgICAgICAg
fQogICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgfTsK
--00000000000017709f05c5df5814--