Thread: pgAdmin 4 - next gettext usage fixes

pgAdmin 4 - next gettext usage fixes

From

"Libor M."

Date:

08 April 2020, 18:41:22

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šit' but in another sentence as
'zrušení')
- added gettext for text translations

Diff file is attached.

Best regards,

Libor M.

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

Attachment

pgadmin4_gettext_fixes2.diff

Re: pgAdmin 4 - next gettext usage fixes

From

Akshay Joshi

Date:

10 April 2020, 12:27:35

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šit' but in another sentence as
'zrušení')
- 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

Re: pgAdmin 4 - next gettext usage fixes

From

Aditya Toshniwal

Date:

15 April 2020, 09:08:11

Hi Hackers/Libor,

The changes like below are incorrect. Try "Count rows" from a table's context menu.

- info=gettext("Table rows counted: %s" % count),

+ info=gettext("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. <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šit' but in another sentence as
'zrušení')
- 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"

Attachment

gettext_format_fixes.patch

Re: pgAdmin 4 - next gettext usage fixes

From

Ashesh Vashi

Date:

15 April 2020, 09:17:57

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=gettext("Table rows counted: %s" % count),
+ info=gettext("Table rows counted: %s") % count,

I would also avoid using this syntax, when multiple variables need to be replaced.

e.g.

gettext("Test(#%s) -> %s") % test_no % test_result

Each language has different semantics, and the position of these variables may change based on them.

We should use the 'format' function with proper variables in such cases.

e.g.

gettext("Test(#{test_no}) ->{test_result}").format(test_no, test_result).

I've not reviewed the patch, but - please look at this aspect while reviewing the patch.

-- Thanks, Ashesh

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. <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šit' but in another sentence as
'zrušení')
- 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"

Re: pgAdmin 4 - next gettext usage fixes

From

Akshay Joshi

Date:

15 April 2020, 11:03:31

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=gettext("Table rows counted: %s" % count),
+ info=gettext("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. <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šit' but in another sentence as
'zrušení')
- 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

Re: pgAdmin 4 - next gettext usage fixes

From

Aditya Toshniwal

Date:

15 April 2020, 12:25:11

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=gettext("Table rows counted: %s" % count),
+ info=gettext("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. <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šit' but in another sentence as
'zrušení')
- 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"

Attachment

gettext_format_fixes_v2.patch

Re: pgAdmin 4 - next gettext usage fixes

From

Akshay Joshi

Date:

15 April 2020, 14:17:04

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=gettext("Table rows counted: %s" % count),
+ info=gettext("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. <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šit' but in another sentence as
'zrušení')
- 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

Re: pgAdmin 4 - next gettext usage fixes

From

"Libor M."

Date:

15 April 2020, 14:46:49

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ílatel Akshay Joshi
<akshay.joshi@enterprisedb.com> napsal:
>
> 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
checkfor 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=gettext("Table rows counted: %s" % count),
>>>>
>>>> +            info=gettext("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. <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šit' but in another sentence as
>>>>>> 'zrušení')
>>>>>> - 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

Attachment

pgadmin4_gettext.diff

Re: pgAdmin 4 - next gettext usage fixes

From

Akshay Joshi

Date:

16 April 2020, 10:50:50

Thanks, patch applied.

On Wed, Apr 15, 2020 at 5:17 PM Libor M. <liborm85@gmail.com> wrote:

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ílatel Akshay Joshi
<akshay.joshi@enterprisedb.com> napsal:
>
> 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=gettext("Table rows counted: %s" % count),
>>>>
>>>> + info=gettext("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. <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šit' but in another sentence as
>>>>>> 'zrušení')
>>>>>> - 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

Thanks & Regards

Akshay Joshi

Sr. Software Architect

EnterpriseDB Software India Private Limited

Mobile: +91 976-788-8246

Re: pgAdmin 4 - next gettext usage fixes

From

"Libor M."

Date:

19 April 2020, 15:20:39

Hi,
I sending patch for slightly modified the use of gettext:
- fixed `%` vs. `.format()`
- unified texts and usage `%s` vs. `{}`/`{0}`
- improved text sentences for translate
- added gettext for next texts

Best regards,

Libor M.

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

čt 16. 4. 2020 v 9:51 odesílatel Akshay Joshi
<akshay.joshi@enterprisedb.com> napsal:
>
> Thanks, patch applied.
>
> On Wed, Apr 15, 2020 at 5:17 PM Libor M. <liborm85@gmail.com> wrote:
>>
>> 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ílatel Akshay Joshi
>> <akshay.joshi@enterprisedb.com> napsal:
>> >
>> > 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
checkfor 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=gettext("Table rows counted: %s" % count),
>> >>>>
>> >>>> +            info=gettext("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. <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šit' but in another sentence as
>> >>>>>> 'zrušení')
>> >>>>>> - 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
>
>
>
> --
> Thanks & Regards
> Akshay Joshi
> Sr. Software Architect
> EnterpriseDB Software India Private Limited
> Mobile: +91 976-788-8246

Attachment

pgadmin4_gettext_fix.diff

Re: pgAdmin 4 - next gettext usage fixes

From

Akshay Joshi

Date:

20 April 2020, 16:47:59

Thanks, patch applied.

On Sun, Apr 19, 2020 at 5:50 PM Libor M. <liborm85@gmail.com> wrote:

Hi,
I sending patch for slightly modified the use of gettext:
- fixed `%` vs. `.format()`
- unified texts and usage `%s` vs. `{}`/`{0}`
- improved text sentences for translate
- added gettext for next texts

Best regards,

Libor M.

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

čt 16. 4. 2020 v 9:51 odesílatel Akshay Joshi
<akshay.joshi@enterprisedb.com> napsal:
>
> Thanks, patch applied.
>
> On Wed, Apr 15, 2020 at 5:17 PM Libor M. <liborm85@gmail.com> wrote:
>>
>> 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ílatel Akshay Joshi
>> <akshay.joshi@enterprisedb.com> napsal:
>> >
>> > 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=gettext("Table rows counted: %s" % count),
>> >>>>
>> >>>> + info=gettext("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. <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šit' but in another sentence as
>> >>>>>> 'zrušení')
>> >>>>>> - 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
>
>
>
> --
> Thanks & Regards
> Akshay Joshi
> Sr. Software Architect
> EnterpriseDB Software India Private Limited
> Mobile: +91 976-788-8246

Thanks & Regards

Akshay Joshi

Sr. Software Architect

EnterpriseDB Software India Private Limited

Mobile: +91 976-788-8246