MIME-Version: 1.0
References: 
 <CAMavuw0OE=bo6a3Pf+cXUTa0UDrFSyQxsffUrf5uXcvLnTSajg@mail.gmail.com>
 <CANxoLDcg=Jpkj5+16KNgAG171mz1bSF-+oFLRb_B4KAEO8Lb4w@mail.gmail.com>
 <CAM9w-_kyiCB-FFtkXpvUNYKsz2iauZcm-vDs30dgW7rXDdDD-A@mail.gmail.com>
 <CANxoLDdedErpGjjAs0GgywptNGpn8DzeL7v6=CsYDG+Wt59cPw@mail.gmail.com>
 <CAM9w-_mMS=oe0WzeU49Ox2utU_n2Nr4BXe0_2RkXt01acLQQUg@mail.gmail.com>
 <CANxoLDeezR6piQbCMXw7QChLJXROQ0FFQpu9+1zyZTc1O03wNQ@mail.gmail.com>
In-Reply-To: 
 <CANxoLDeezR6piQbCMXw7QChLJXROQ0FFQpu9+1zyZTc1O03wNQ@mail.gmail.com>
From: "Libor M." <liborm85@gmail.com>
Date: Wed, 15 Apr 2020 13:46:49 +0200
Message-ID: 
 <CAMavuw0m+GPUmD2Nd=po2AYazQb6eZp-F_2FxMpoHZN15MLS+A@mail.gmail.com>
Subject: Re: pgAdmin 4 - next gettext usage fixes
To: Akshay Joshi <akshay.joshi@enterprisedb.com>
Cc: Aditya Toshniwal <aditya.toshniwal@enterprisedb.com>,
	pgadmin-hackers <pgadmin-hackers@postgresql.org>
Content-Type: multipart/mixed; boundary="000000000000b74c0f05a352df82"
Precedence: bulk

--000000000000b74c0f05a352df82
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

Hi,
next minor gettext and format fixes in patch.

Best regards,

Libor M.

E-mail: liborm85@gmail.com
GitHub: https://github.com/liborm85

st 15. 4. 2020 v 13:17 odes=C3=ADlatel Akshay Joshi
<akshay.joshi@enterprisedb.com> napsal:
>
> Thanks, patch applied.
>
> On Wed, Apr 15, 2020 at 2:55 PM Aditya Toshniwal <aditya.toshniwal@enterp=
risedb.com> wrote:
>>
>> Hi,
>>
>> Please find the updated patch.
>>
>> On Wed, Apr 15, 2020 at 1:33 PM Akshay Joshi <akshay.joshi@enterprisedb.=
com> wrote:
>>>
>>> Hi Aditya
>>>
>>> I think the fix is incorrect. .format method should be applied after ge=
ttext() like gettext().format(). Please check for other places too and send=
 the updated patch.
>>>
>>> On Wed, Apr 15, 2020 at 11:38 AM Aditya Toshniwal <aditya.toshniwal@ent=
erprisedb.com> wrote:
>>>>
>>>> Hi Hackers/Libor,
>>>>
>>>> The changes like below are incorrect. Try "Count rows" from a table's =
context menu.
>>>>
>>>> -            info=3Dgettext("Table rows counted: %s" % count),
>>>>
>>>> +            info=3Dgettext("Table rows counted: %s") % count,
>>>>
>>>>
>>>> Attached is the patch to fix all such changes in pgAdmin, to use forma=
t() instead.
>>>> Please review.
>>>>
>>>> On Fri, Apr 10, 2020 at 2:57 PM Akshay Joshi <akshay.joshi@enterprised=
b.com> wrote:
>>>>>
>>>>> Hi Libor
>>>>>
>>>>> Thanks, patch applied. Please make sure to run the PEP8 checks before=
 sending the patch.
>>>>> I have fixed and committed the code.
>>>>>
>>>>> On Wed, Apr 8, 2020 at 9:30 PM Libor M. <liborm85@gmail.com> wrote:
>>>>>>
>>>>>> Hello,
>>>>>> I fixed next gettext usage:
>>>>>>
>>>>>> - fixed gettext usage with .format() only for original text with %s
>>>>>> - fixed typos
>>>>>> - fixed translation yes/no buttons in dialog
>>>>>> - improved translating sentences without "connecting" words (eg. see
>>>>>> web/pgadmin/dashboard/static/js/dashboard.js, word 'cancel' needs to
>>>>>> be translated in Czech language as 'zru=C5=A1it' but in another sent=
ence as
>>>>>> 'zru=C5=A1en=C3=AD')
>>>>>> - added gettext for text translations
>>>>>>
>>>>>> Diff file is attached.
>>>>>>
>>>>>> Best regards,
>>>>>>
>>>>>> Libor M.
>>>>>>
>>>>>> E-mail: liborm85@gmail.com
>>>>>> GitHub: https://github.com/liborm85
>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> Thanks & Regards
>>>>> Akshay Joshi
>>>>> Sr. Software Architect
>>>>> EnterpriseDB Software India Private Limited
>>>>> Mobile: +91 976-788-8246
>>>>
>>>>
>>>>
>>>> --
>>>> Thanks and Regards,
>>>> Aditya Toshniwal
>>>> pgAdmin Hacker | Sr. Software Engineer | EnterpriseDB India | Pune
>>>> "Don't Complain about Heat, Plant a TREE"
>>>
>>>
>>>
>>> --
>>> Thanks & Regards
>>> Akshay Joshi
>>> Sr. Software Architect
>>> EnterpriseDB Software India Private Limited
>>> Mobile: +91 976-788-8246
>>
>>
>>
>> --
>> Thanks and Regards,
>> Aditya Toshniwal
>> pgAdmin Hacker | Sr. Software Engineer | EnterpriseDB India | Pune
>> "Don't Complain about Heat, Plant a TREE"
>
>
>
> --
> Thanks & Regards
> Akshay Joshi
> Sr. Software Architect
> EnterpriseDB Software India Private Limited
> Mobile: +91 976-788-8246

--000000000000b74c0f05a352df82
Content-Type: application/octet-stream; name="pgadmin4_gettext.diff"
Content-Disposition: attachment; filename="pgadmin4_gettext.diff"
Content-Transfer-Encoding: base64
Content-ID: <f_k919piho0>
X-Attachment-Id: f_k919piho0

ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh
dGFiYXNlcy9ldmVudF90cmlnZ2Vycy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIv
c2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9ldmVudF90cmlnZ2Vycy9fX2luaXRfXy5w
eQppbmRleCBhYTM1ZmI1ZDQuLjgzYmVjMzBjYSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJv
d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2V2ZW50X3RyaWdnZXJzL19faW5p
dF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh
dGFiYXNlcy9ldmVudF90cmlnZ2Vycy9fX2luaXRfXy5weQpAQCAtMzc4LDcgKzM3OCw3IEBAIGNs
YXNzIEV2ZW50VHJpZ2dlclZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgICAgICBz
dGF0dXM9NDAwLAogICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICBl
cnJvcm1zZz1nZXR0ZXh0KAotICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhl
IHJlcXVpcmVkIHBhcmFtZXRlciB7fS4iLmZvcm1hdChlcnIpKQorICAgICAgICAgICAgICAgICAg
ICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciB7fS4iKS5mb3JtYXQoZXJy
KQogICAgICAgICAgICAgKQogICAgICAgICB0cnk6CiAgICAgICAgICAgICBzcWwgPSByZW5kZXJf
dGVtcGxhdGUoCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv
c2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvaW5kZXhfY29uc3Ry
YWludC9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2
ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb25zdHJhaW50cy9pbmRleF9jb25zdHJhaW50
L19faW5pdF9fLnB5CmluZGV4IDQ0NGVkMGIyYi4uOGJkNDc5MGZiIDEwMDY0NAotLS0gYS93ZWIv
cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90
YWJsZXMvY29uc3RyYWludHMvaW5kZXhfY29uc3RyYWludC9fX2luaXRfXy5weQorKysgYi93ZWIv
cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90
YWJsZXMvY29uc3RyYWludHMvaW5kZXhfY29uc3RyYWludC9fX2luaXRfXy5weQpAQCAtNzM3LDcg
KzczNyw3IEBAIGNsYXNzIEluZGV4Q29uc3RyYWludFZpZXcoUEdDaGlsZE5vZGVWaWV3KToKIAog
ICAgICAgICAgICAgcmV0dXJuIG1ha2VfanNvbl9yZXNwb25zZSgKICAgICAgICAgICAgICAgICBz
dWNjZXNzPTEsCi0gICAgICAgICAgICAgICAgaW5mbz1fKCJ7MH0gZHJvcHBlZC4iLmZvcm1hdChz
ZWxmLm5vZGVfbGFiZWwpKSwKKyAgICAgICAgICAgICAgICBpbmZvPV8oInswfSBkcm9wcGVkLiIp
LmZvcm1hdChzZWxmLm5vZGVfbGFiZWwpLAogICAgICAgICAgICAgICAgIGRhdGE9ewogICAgICAg
ICAgICAgICAgICAgICAnaWQnOiBjaWQsCiAgICAgICAgICAgICAgICAgICAgICdzaWQnOiBzaWQs
CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9z
dGF0aWMvanMvc2VydmVyLmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3Nl
cnZlcnMvc3RhdGljL2pzL3NlcnZlci5qcwppbmRleCA0MDk0ODg1ODcuLjU3Zjg5OTE5YSAxMDA2
NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvc3RhdGlj
L2pzL3NlcnZlci5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2Vy
dmVycy9zdGF0aWMvanMvc2VydmVyLmpzCkBAIC00MjUsNyArNDI1LDcgQEAgZGVmaW5lKCdwZ2Fk
bWluLm5vZGUuc2VydmVyJywgWwogICAgICAgICAgICAgQWxlcnRpZnkuZGlhbG9nKCdjaGFuZ2VT
ZXJ2ZXJQYXNzd29yZCcgLGZ1bmN0aW9uIGZhY3RvcnkoKSB7CiAgICAgICAgICAgICAgIHJldHVy
biB7CiAgICAgICAgICAgICAgICAgbWFpbjogZnVuY3Rpb24ocGFyYW1zKSB7Ci0gICAgICAgICAg
ICAgICAgICB2YXIgdGl0bGUgPSBnZXR0ZXh0KCdDaGFuZ2UgUGFzc3dvcmQgJyk7CisgICAgICAg
ICAgICAgICAgICB2YXIgdGl0bGUgPSBnZXR0ZXh0KCdDaGFuZ2UgUGFzc3dvcmQnKTsKICAgICAg
ICAgICAgICAgICAgIHRoaXMuc2V0KCd0aXRsZScsIHRpdGxlKTsKICAgICAgICAgICAgICAgICAg
IHRoaXMudXNlcl9uYW1lID0gcGFyYW1zLnVzZXIubmFtZTsKICAgICAgICAgICAgICAgICB9LApk
aWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvX19pbml0X18ucHkgYi93
ZWIvcGdhZG1pbi9taXNjL2ZpbGVfbWFuYWdlci9fX2luaXRfXy5weQppbmRleCBlMzRhNjlhNjgu
LjUzMTEwMzRmNCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvX19p
bml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvX19pbml0X18ucHkK
QEAgLTkxMCw3ICs5MTAsNyBAQCBjbGFzcyBGaWxlbWFuYWdlcihvYmplY3QpOgogICAgICAgICAg
ICAgRmlsZW1hbmFnZXIuY2hlY2tfYWNjZXNzX3Blcm1pc3Npb24oZGlyLCBwYXRoKQogICAgICAg
ICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CiAgICAgICAgICAgICByZXMgPSB7Ci0gICAgICAgICAg
ICAgICAgJ0Vycm9yJzogZ2V0dGV4dCh1IkVycm9yOiB7MH0iLmZvcm1hdChlKSksCisgICAgICAg
ICAgICAgICAgJ0Vycm9yJzogZ2V0dGV4dCh1IkVycm9yOiB7MH0iKS5mb3JtYXQoZSksCiAgICAg
ICAgICAgICAgICAgJ0NvZGUnOiAwCiAgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm4g
cmVzCkBAIC0xMTMxLDcgKzExMzEsNyBAQCBjbGFzcyBGaWxlbWFuYWdlcihvYmplY3QpOgogICAg
ICAgICAgICAgICAgIHBhdGgsIG5hbWUpKQogICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6
CiAgICAgICAgICAgICByZXMgPSB7Ci0gICAgICAgICAgICAgICAgJ0Vycm9yJzogZ2V0dGV4dCh1
IkVycm9yOiB7MH0iLmZvcm1hdChlKSksCisgICAgICAgICAgICAgICAgJ0Vycm9yJzogZ2V0dGV4
dCh1IkVycm9yOiB7MH0iKS5mb3JtYXQoZSksCiAgICAgICAgICAgICAgICAgJ0NvZGUnOiAwCiAg
ICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1cm4gcmVzCg==
--000000000000b74c0f05a352df82--