Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jOg2i-0001ol-3m for pgadmin-hackers@arkaria.postgresql.org; Wed, 15 Apr 2020 11:17:20 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1jOg2h-0005GX-0R for pgadmin-hackers@arkaria.postgresql.org; Wed, 15 Apr 2020 11:17:19 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jOg2g-0005GQ-Hz for pgadmin-hackers@lists.postgresql.org; Wed, 15 Apr 2020 11:17:18 +0000 Received: from mail-il1-x141.google.com ([2607:f8b0:4864:20::141]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1jOg2e-0002Pd-1t for pgadmin-hackers@postgresql.org; Wed, 15 Apr 2020 11:17:17 +0000 Received: by mail-il1-x141.google.com with SMTP id i2so2866865ils.12 for ; Wed, 15 Apr 2020 04:17:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Oa/tQFqtRuMXBYkgFi4bH6plWEwfa43ZjJYI25s6VP0=; b=Nc/wie0/5EQzh9J+hxAYwlvn6TraE4cDv9zrKT6q0X4k2Fcl5wMEVz4dZmEihm9ZH8 VnNbvgLINb1zKxwpqn2nyAyFqfnsVlnOQsSZjJkWObWSuQlWYyKtEpeq1UaLCByrKfd5 5HFuzh/CIQRrejP+9Xbxf0DFE0KHbKN8QZDPCBgfVlEGuf+ePaOPn0S0VJXESJdgcvGp wRi+9Hj7NR1AzvU1HH2+md0hLQ/ltIZBvssYseE9C97IVZagiTgbYNvlNCunaKFwb/lV zq1SK+BqwE/2TqB03XWYAL+Y9sC4VtRkCBqvqfzTyXH/HRSBw+SnVM9Hw4iaHtPQ7pVD o7LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Oa/tQFqtRuMXBYkgFi4bH6plWEwfa43ZjJYI25s6VP0=; b=C84cVSK7pPpcL9QSmR1ZKxIoO81G6cJSaS3gJEt+Bz8Rb8hSGW4SxJ9DSNzquLlKCR Tozrhfv8g02DDmLLDnLLrTfwyc3UjG2K7ZgjAmXNIfC+Iv7Dbuc2no9cPvvEgdQhWzkH bzEdymN7O5esX9QxBsnl/m7awAMujNoX/r0bxJzkw0eePh+HpgptriMLotI3eG2YdZJa VxazQ1m0/Ba5wiRus8etfUv78Lgnc1YF7f9hJ9DSXdKYt2mrbLfXqz2ZuvfiRZdunpgh GiBVZ/sM48jCtFhMFFyBZfytVUqQJT4pGWwg7GEHHbLjpH2X338LvaVeeJ2vDbHt7BqQ +R+g== X-Gm-Message-State: AGi0PuaSNd/e6nL2n2jwlcbqw2YAoaMryUZ7v+0tSEq5VD+TqSLdsGUE jEO7MkU/foS/t2MML6J4CuojUCMgFGtwSDoWcF/BfleoOUbdXbb7J4wPFo/g5v+0VtN275ayfLI 9DOtLULKKJuzwe/mbJ/ZxfYSrLpwqi2eMPObz6jTOJygFsmUS0K2379249Y11eyXo0wgJFXPeI/ 8JZqQySsuSmK0dOSnc4tq7NE2VxLCGJRzjKpKeBojDEGY5JJrLJyA= X-Google-Smtp-Source: APiQypIVWGMh66no25F+bGjikuPHq9hFM5puEJAGHSCTeMWco2zVU0g32qu5bUWZzy1Wi+InRnezW2QVDi+Lnx63yTc= X-Received: by 2002:a05:6e02:5cb:: with SMTP id l11mr4983786ils.236.1586949435201; Wed, 15 Apr 2020 04:17:15 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Akshay Joshi Date: Wed, 15 Apr 2020 16:47:04 +0530 Message-ID: Subject: Re: pgAdmin 4 - next gettext usage fixes To: Aditya Toshniwal Cc: "Libor M." , pgadmin-hackers Content-Type: multipart/alternative; boundary="0000000000005cb30905a352752d" X-CLOUD-SEC-AV-Info: edb,google_mail,monitor X-CLOUD-SEC-AV-Sent: true X-Gm-Spam: 0 X-Gm-Phishy: 0 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --0000000000005cb30905a352752d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Thanks, patch applied. On Wed, Apr 15, 2020 at 2:55 PM Aditya Toshniwal < aditya.toshniwal@enterprisedb.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 >> gettext() 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@enterprisedb.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 >>> format() instead. >>> Please review. >>> >>> On Fri, Apr 10, 2020 at 2:57 PM Akshay Joshi < >>> akshay.joshi@enterprisedb.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. 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 sente= nce 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" > --=20 *Thanks & Regards* *Akshay Joshi* *Sr. Software Architect* *EnterpriseDB Software India Private Limited* *Mobile: +91 976-788-8246* --0000000000005cb30905a352752d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Thanks, patch applied.

On Wed, Apr 15, 2020 at 2:55 PM = Aditya Toshniwal <a= ditya.toshniwal@enterprisedb.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=C2=A0Aditya

I think = the fix is incorrect. .format method should be applied after gettext() 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.tosh= niwal@enterprisedb.com> wrote:
Hi Hackers/Libor,
<= div class=3D"gmail_default" style=3D"font-family:verdana,sans-serif">
T= he changes like below are incorrect. Try "Count rows" from a tabl= e's context menu.

-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 info=3Dge= ttext("Table rows counted: %s" % count),

+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 info=3Dge= ttext("Table rows counted: %s") % count,

Attached is the patch to fix all such changes in pgAdmin, to use format(= ) instead.
Please review.

On Fri, Apr 10, 2020 at 2:57 PM Akshay Josh= i <ak= shay.joshi@enterprisedb.com> wrote:
Hi=C2=A0Libor

Thanks, patch applied. Please make sure to run the PEP8 checks before sen= ding the patch.
I have fixed and committed the code.
<= br>
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 t= o
be translated in Czech language as 'zru=C5=A1it' but in another sen= tence as
'zru=C5=A1en=C3=AD')
- added gettext for text translations

Diff file is attached.

Best regards,

Libor M.

E-mail: liborm85@gm= ail.com
GitHub: https://github.com/liborm85


--
Thanks & Regards
Akshay Joshi
<= font color=3D"#3333FF">Sr. Software Architect=
<= font color=3D"#000000" face=3D"arial, sans-serif">EnterpriseDB Software = India Private Limited
Mobile: +91 976-788-8246=


--
Thanks and Regards,
Aditya Toshniwal
pgAdmin Hacker | Sr. Software Engineer |=C2=A0Ent= erpriseDB India |=C2=A0Pune<= /span>
"Don't Complain about Heat, Plant a TREE"=


--
Thanks & Regards
Akshay Joshi
<= font color=3D"#3333FF">Sr. Software Architect=
<= font color=3D"#000000" face=3D"arial, sans-serif">EnterpriseDB Software = India Private Limited
Mobile: +91 976-788-8246=


--
Thanks and Regards,
Aditya Toshniwal
pgAdmin Hacker | Sr. Software Engineer |=C2=A0Ent= erpriseDB India |=C2=A0Pune<= /span>
"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
--0000000000005cb30905a352752d--