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 1lUSyG-0008Ii-F4 for pgadmin-hackers@arkaria.postgresql.org; Thu, 08 Apr 2021 11:37:12 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1lUSyF-000102-7a for pgadmin-hackers@arkaria.postgresql.org; Thu, 08 Apr 2021 11:37:11 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lUSyE-0000zv-Sr for pgadmin-hackers@lists.postgresql.org; Thu, 08 Apr 2021 11:37:11 +0000 Received: from mail-lj1-x229.google.com ([2a00:1450:4864:20::229]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1lUSyB-0004sH-Dc for pgadmin-hackers@postgresql.org; Thu, 08 Apr 2021 11:37:10 +0000 Received: by mail-lj1-x229.google.com with SMTP id z8so1825187ljm.12 for ; Thu, 08 Apr 2021 04:37:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=MXBEeSlHCmO8vx1V9V06pbvo0lkvxRe4C3BjCnnx9sk=; b=11lXn5gYybQLd7uErvB+chWRfOo05TxJRDwjoFnCz+6i9U449CDiQ9jUact5DoFavX XCPM5zmMbdC3GB5b1Jw8eGocg/Ye9YMgHEppe1Sbhhoa7XP6DcSRuj5kHCGw+MufXKl4 t7XegvyjqjbdcElLg5wt1bzqgz9LDaistT2rCq0DxQB6GPU8vjy4T053qvZCvx6P1D/f J6qr1YGS3/pmfHvdu+Uts2Vf2YpEvxr6UfTO7X5Mnt2O7zWWNdbEOxddNEWE9hvpiCnr vzyIkIzgFwsC9/3ws9Pv8FIz8n+3znhhoLvHr4msuGyOQw0DSqsfmRg81zZYgGxSosMN Hk6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=MXBEeSlHCmO8vx1V9V06pbvo0lkvxRe4C3BjCnnx9sk=; b=KV19m6M3yJZ91owAdEWRkNlvXFIMSuUWT0lexs/kJ68ZDwuCPWfk/+rfOsL1S9D4+o ivfdt8j0FWLaNXWC0cLw77/v4mX36CzXArdLt2SFjLICIFcriCqgbMXHBkoGcrBL9Crs +adrDGoS0bW0l77EExee4PI6Zke6bT6pK8TGIJA5pRU9hB5D/OdN7CBBoxjjcvPHBe8o GuBbyB2FwQGoYFXvAX3leEcoo5vtNfSRtXQClDYsgLSWVWo2sCNriN/Dtej92CNmo9fm 7DTT54aTpJWNV3m+wv/i3S34B6KaNBrAoHK9uQq3/xpgONM/6p1Iv59CW4mU7qy0c4zQ inbQ== X-Gm-Message-State: AOAM5327HG5MdeujJpNZfepzE98EcQqbmITYG6u1m5dn+Y8tjlTb/Oyi T6CaqoCr6q2xPjv/eph32uN9fOURM+LpsgJu3vtodbsTSBprJDbivqRA51uqnidnwfu8PS9av2n EAD8gDQSmb7ykbGqH/Aw4Pr6ifJUQdgsN4e+AJMwDr8hCKl0t26pC6/aW4EtisK5ytBVktumVnp R7CFxzqFwG4yV3J/5dIgr6fS+sm5m+VLJNZ4p1RDJLmWwurk8odj63wP5ycUwFwvgC7A== X-Google-Smtp-Source: ABdhPJx0t/HaxHAUyi4qGGu3ABw6ilvOu+7eIG4p/wXdxrnbcJaqiaN0O/yL4KocFyvo7FcHPs4r4OtbvM0A/sNfybo= X-Received: by 2002:a2e:3010:: with SMTP id w16mr5184311ljw.118.1617881825220; Thu, 08 Apr 2021 04:37:05 -0700 (PDT) MIME-Version: 1.0 From: Khushboo Vashi Date: Thu, 8 Apr 2021 17:07:07 +0530 Message-ID: Subject: [pgAdmin4][Patch] - RM 6274 - LDAP auth module is not translatable To: pgadmin-hackers Content-Type: multipart/mixed; boundary="0000000000007c1b7405bf7477ee" X-CLOUD-SEC-AV-Info: enterprisedb,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: Archived-At: Precedence: bulk --0000000000007c1b7405bf7477ee Content-Type: multipart/alternative; boundary="0000000000007c1b7305bf7477ec" --0000000000007c1b7305bf7477ec Content-Type: text/plain; charset="UTF-8" Hi, Please find the attached patch to fix RM #6274 - LDAP auth module is not translatable. Thanks, Khushboo --0000000000007c1b7305bf7477ec Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

Please find the at= tached=C2=A0patch to fix RM #6274 -=C2=A0LDAP auth module is not translatable.

Thanks,
Khushboo

--0000000000007c1b7305bf7477ec-- --0000000000007c1b7405bf7477ee Content-Type: application/octet-stream; name="RM_6274.patch" Content-Disposition: attachment; filename="RM_6274.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kn8t1dcq0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2F1dGhlbnRpY2F0ZS9fX2luaXRfXy5weSBiL3dlYi9w Z2FkbWluL2F1dGhlbnRpY2F0ZS9fX2luaXRfXy5weQppbmRleCBiYzA4NjhkZGYuLjkxNjZjMmZm ZCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYXV0aGVudGljYXRlL19faW5pdF9fLnB5CisrKyBi L3dlYi9wZ2FkbWluL2F1dGhlbnRpY2F0ZS9fX2luaXRfXy5weQpAQCAtMTMsNyArMTMsNiBAQCBp bXBvcnQgZmxhc2sKIGltcG9ydCBwaWNrbGUKIGZyb20gZmxhc2sgaW1wb3J0IGN1cnJlbnRfYXBw LCBmbGFzaCwgUmVzcG9uc2UsIHJlcXVlc3QsIHVybF9mb3IsXAogICAgIHJlbmRlcl90ZW1wbGF0 ZQotZnJvbSBmbGFza19iYWJlbGV4IGltcG9ydCBnZXR0ZXh0CiBmcm9tIGZsYXNrX3NlY3VyaXR5 IGltcG9ydCBjdXJyZW50X3VzZXIKIGZyb20gZmxhc2tfc2VjdXJpdHkudmlld3MgaW1wb3J0IF9z ZWN1cml0eSwgX2N0eAogZnJvbSBmbGFza19zZWN1cml0eS51dGlscyBpbXBvcnQgY29uZmlnX3Zh bHVlLCBnZXRfcG9zdF9sb2dvdXRfcmVkaXJlY3QsIFwKQEAgLTkwLDcgKzg5LDcgQEAgZGVmIGxv Z2luKCk6CiAgICAgICAgICAgICAgICAgcmV0dXJuIGZsYXNrLnJlZGlyZWN0KCd7MH0/bmV4dD17 MX0nLmZvcm1hdCh1cmxfZm9yKAogICAgICAgICAgICAgICAgICAgICAnYXV0aGVudGljYXRlLmtl cmJlcm9zX2xvZ2luJyksIHVybF9mb3IoJ2Jyb3dzZXIuaW5kZXgnKSkpCiAKLSAgICAgICAgICAg IGZsYXNoKGdldHRleHQobXNnKSwgJ2RhbmdlcicpCisgICAgICAgICAgICBmbGFzaChtc2csICdk YW5nZXInKQogICAgICAgICAgICAgcmV0dXJuIGZsYXNrLnJlZGlyZWN0KGdldF9wb3N0X2xvZ291 dF9yZWRpcmVjdCgpKQogCiAgICAgICAgIHNlc3Npb25bJ19hdXRoX3NvdXJjZV9tYW5hZ2VyX29i aiddID0gY3VycmVudF9hdXRoX29iagpAQCAtOTgsNyArOTcsNyBAQCBkZWYgbG9naW4oKToKIAog ICAgIGVsaWYgaXNpbnN0YW5jZShtc2csIFJlc3BvbnNlKToKICAgICAgICAgcmV0dXJuIG1zZwot ICAgIGZsYXNoKGdldHRleHQobXNnKSwgJ2RhbmdlcicpCisgICAgZmxhc2gobXNnLCAnZGFuZ2Vy JykKICAgICByZXNwb25zZSA9IGZsYXNrLnJlZGlyZWN0KGdldF9wb3N0X2xvZ291dF9yZWRpcmVj dCgpKQogICAgIHJldHVybiByZXNwb25zZQogCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9hdXRo ZW50aWNhdGUvbGRhcC5weSBiL3dlYi9wZ2FkbWluL2F1dGhlbnRpY2F0ZS9sZGFwLnB5CmluZGV4 IDJmMGY2MWI3Yy4uZjUzYzg0M2NjIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9hdXRoZW50aWNh dGUvbGRhcC5weQorKysgYi93ZWIvcGdhZG1pbi9hdXRoZW50aWNhdGUvbGRhcC5weQpAQCAtMjYs NyArMjYsOCBAQCBmcm9tIHBnYWRtaW4udG9vbHMudXNlcl9tYW5hZ2VtZW50IGltcG9ydCBjcmVh dGVfdXNlcgogZnJvbSBwZ2FkbWluLnV0aWxzLmNvbnN0YW50cyBpbXBvcnQgTERBUAogCiAKLUVS Uk9SX1NFQVJDSElOR19MREFQX0RJUkVDVE9SWSA9ICJFcnJvciBzZWFyY2hpbmcgdGhlIExEQVAg ZGlyZWN0b3J5OiB7fSIKK0VSUk9SX1NFQVJDSElOR19MREFQX0RJUkVDVE9SWSA9IGdldHRleHQo CisgICAgIkVycm9yIHNlYXJjaGluZyB0aGUgTERBUCBkaXJlY3Rvcnk6IHt9IikKIAogCiBjbGFz cyBMREFQQXV0aGVudGljYXRpb24oQmFzZUF1dGhlbnRpY2F0aW9uKToKQEAgLTUzLDcgKzU0LDgg QEAgY2xhc3MgTERBUEF1dGhlbnRpY2F0aW9uKEJhc2VBdXRoZW50aWNhdGlvbik6CiAgICAgICAg IHNlbGYuYW5vbnltb3VzX2JpbmQgPSBnZXRhdHRyKGNvbmZpZywgJ0xEQVBfQU5PTllNT1VTX0JJ TkQnLCBGYWxzZSkKIAogICAgICAgICBpZiBzZWxmLmJpbmRfdXNlciBhbmQgbm90IHNlbGYuYmlu ZF9wYXNzOgotICAgICAgICAgICAgcmV0dXJuIEZhbHNlLCAiTERBUCBjb25maWd1cmF0aW9uIGVy cm9yOiBTZXQgdGhlIGJpbmQgcGFzc3dvcmQuIgorICAgICAgICAgICAgcmV0dXJuIEZhbHNlLCBn ZXR0ZXh0KAorICAgICAgICAgICAgICAgICJMREFQIGNvbmZpZ3VyYXRpb24gZXJyb3I6IFNldCB0 aGUgYmluZCBwYXNzd29yZC4iKQogCiAgICAgICAgICMgaWYgbm8gZGVkaWNhdGVkIGxkYXAgdXNl ciBpcyBjb25maWd1cmVkIHRoZW4gdXNlIHRoZSBsb2dpbgogICAgICAgICAjIHVzZXJuYW1lIGFu ZCBwYXNzd29yZApAQCAtMTIxLDE3ICsxMjMsMTcgQEAgY2xhc3MgTERBUEF1dGhlbnRpY2F0aW9u KEJhc2VBdXRoZW50aWNhdGlvbik6CiAgICAgICAgIGV4Y2VwdCBMREFQU29ja2V0T3BlbkVycm9y IGFzIGU6CiAgICAgICAgICAgICBjdXJyZW50X2FwcC5sb2dnZXIuZXhjZXB0aW9uKAogICAgICAg ICAgICAgICAgICJFcnJvciBjb25uZWN0aW5nIHRvIHRoZSBMREFQIHNlcnZlcjoge31cbiIuZm9y bWF0KGUpKQotICAgICAgICAgICAgcmV0dXJuIEZhbHNlLCAiRXJyb3IgY29ubmVjdGluZyB0byB0 aGUgTERBUCBzZXJ2ZXI6IiBcCi0gICAgICAgICAgICAgICAgICAgICAgICAgICIge31cbiIuZm9y bWF0KGUuYXJnc1swXSkKKyAgICAgICAgICAgIHJldHVybiBGYWxzZSwgZ2V0dGV4dCgiRXJyb3Ig Y29ubmVjdGluZyB0byB0aGUgTERBUCBzZXJ2ZXI6IHt9XG4iCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgKS5mb3JtYXQoZS5hcmdzWzBdKQogICAgICAgICBleGNlcHQgTERBUEJp bmRFcnJvciBhcyBlOgogICAgICAgICAgICAgY3VycmVudF9hcHAubG9nZ2VyLmV4Y2VwdGlvbigK ICAgICAgICAgICAgICAgICAiRXJyb3IgYmluZGluZyB0byB0aGUgTERBUCBzZXJ2ZXIuIikKLSAg ICAgICAgICAgIHJldHVybiBGYWxzZSwgIkVycm9yIGJpbmRpbmcgdG8gdGhlIExEQVAgc2VydmVy LiIKKyAgICAgICAgICAgIHJldHVybiBGYWxzZSwgZ2V0dGV4dCgiRXJyb3IgYmluZGluZyB0byB0 aGUgTERBUCBzZXJ2ZXIuIikKICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgogICAgICAg ICAgICAgY3VycmVudF9hcHAubG9nZ2VyLmV4Y2VwdGlvbigKICAgICAgICAgICAgICAgICAiRXJy b3IgY29ubmVjdGluZyB0byB0aGUgTERBUCBzZXJ2ZXI6IHt9XG4iLmZvcm1hdChlKSkKLSAgICAg ICAgICAgIHJldHVybiBGYWxzZSwgIkVycm9yIGNvbm5lY3RpbmcgdG8gdGhlIExEQVAgc2VydmVy OiIgXAotICAgICAgICAgICAgICAgICAgICAgICAgICAiIHt9XG4iLmZvcm1hdChlLmFyZ3NbMF0p CisgICAgICAgICAgICByZXR1cm4gRmFsc2UsIGdldHRleHQoIkVycm9yIGNvbm5lY3RpbmcgdG8g dGhlIExEQVAgc2VydmVyOiB7fVxuIgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICkuZm9ybWF0KGUuYXJnc1swXSkKIAogICAgICAgICAjIEVuYWJsZSBUTFMgaWYgU1RBUlRUTFMg aXMgY29uZmlndXJlZAogICAgICAgICBpZiBzZWxmLnN0YXJ0X3RsczoKQEAgLTE0MCw3ICsxNDIs OCBAQCBjbGFzcyBMREFQQXV0aGVudGljYXRpb24oQmFzZUF1dGhlbnRpY2F0aW9uKToKICAgICAg ICAgICAgIGV4Y2VwdCBMREFQU3RhcnRUTFNFcnJvciBhcyBlOgogICAgICAgICAgICAgICAgIGN1 cnJlbnRfYXBwLmxvZ2dlci5leGNlcHRpb24oCiAgICAgICAgICAgICAgICAgICAgICJFcnJvciBz dGFydGluZyBUTFM6IHt9XG4iLmZvcm1hdChlKSkKLSAgICAgICAgICAgICAgICByZXR1cm4gRmFs c2UsICJFcnJvciBzdGFydGluZyBUTFM6IHt9XG4iLmZvcm1hdChlLmFyZ3NbMF0pCisgICAgICAg ICAgICAgICAgcmV0dXJuIEZhbHNlLCBnZXR0ZXh0KCJFcnJvciBzdGFydGluZyBUTFM6IHt9XG4i CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICkuZm9ybWF0KGUuYXJnc1sw XSkKIAogICAgICAgICByZXR1cm4gVHJ1ZSwgTm9uZQogCkBAIC0xNzksNyArMTgyLDcgQEAgY2xh c3MgTERBUEF1dGhlbnRpY2F0aW9uKEJhc2VBdXRoZW50aWNhdGlvbik6CiAgICAgICAgIGV4Y2Vw dCBMREFQU1NMQ29uZmlndXJhdGlvbkVycm9yIGFzIGU6CiAgICAgICAgICAgICBjdXJyZW50X2Fw cC5sb2dnZXIuZXhjZXB0aW9uKAogICAgICAgICAgICAgICAgICJMREFQIGNvbmZpZ3VyYXRpb24g ZXJyb3I6IHt9XG4iLmZvcm1hdChlKSkKLSAgICAgICAgICAgIHJldHVybiBGYWxzZSwgIkxEQVAg Y29uZmlndXJhdGlvbiBlcnJvcjoge31cbiIuZm9ybWF0KAorICAgICAgICAgICAgcmV0dXJuIEZh bHNlLCBnZXR0ZXh0KCJMREFQIGNvbmZpZ3VyYXRpb24gZXJyb3I6IHt9XG4iKS5mb3JtYXQoCiAg ICAgICAgICAgICAgICAgZS5hcmdzWzBdKQogICAgICAgICByZXR1cm4gVHJ1ZSwgdGxzCiAKQEAg LTE5NCw3ICsxOTcsOCBAQCBjbGFzcyBMREFQQXV0aGVudGljYXRpb24oQmFzZUF1dGhlbnRpY2F0 aW9uKToKICAgICAgICAgdGxzID0gTm9uZQogCiAgICAgICAgIGlmIGlzaW5zdGFuY2UodXJpLCBz dHIpOgotICAgICAgICAgICAgcmV0dXJuIEZhbHNlLCAiTERBUCBjb25maWd1cmF0aW9uIGVycm9y OiBTZXQgdGhlIHByb3BlciBMREFQIFVSSS4iCisgICAgICAgICAgICByZXR1cm4gRmFsc2UsIGdl dHRleHQoCisgICAgICAgICAgICAgICAgIkxEQVAgY29uZmlndXJhdGlvbiBlcnJvcjogU2V0IHRo ZSBwcm9wZXIgTERBUCBVUkkuIikKIAogICAgICAgICBpZiB1cmkuc2NoZW1lID09ICdsZGFwcycg b3IgY29uZmlnLkxEQVBfVVNFX1NUQVJUVExTOgogICAgICAgICAgICAgc3RhdHVzLCB0bHMgPSBz ZWxmLl9fY29uZmlndXJlX3RscygpCkBAIC0yMjQsOCArMjI4LDggQEAgY2xhc3MgTERBUEF1dGhl bnRpY2F0aW9uKEJhc2VBdXRoZW50aWNhdGlvbik6CiAgICAgICAgICAgICBzZWFyY2hfYmFzZV9k biA9IGNvbmZpZy5MREFQX1NFQVJDSF9CQVNFX0ROCiAgICAgICAgICAgICBpZiAobm90IHNlYXJj aF9iYXNlX2RuIG9yIHNlYXJjaF9iYXNlX2RuID09ICc8U2VhcmNoLUJhc2UtRE4+JylcCiAgICAg ICAgICAgICAgICAgICAgIGFuZCAoc2VsZi5hbm9ueW1vdXNfYmluZCBvciBzZWxmLmRlZGljYXRl ZF91c2VyKToKLSAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UsICJMREFQIGNvbmZpZ3VyYXRp b24gZXJyb3I6IiBcCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiIFNldCB0aGUgU2Vh cmNoIERvbWFpbi4iCisgICAgICAgICAgICAgICAgcmV0dXJuIEZhbHNlLCBnZXR0ZXh0KCJMREFQ IGNvbmZpZ3VyYXRpb24gZXJyb3I6ICIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIlNldCB0aGUgU2VhcmNoIERvbWFpbi4iKQogICAgICAgICAgICAgZWxpZiBub3Qgc2Vh cmNoX2Jhc2VfZG4gb3Igc2VhcmNoX2Jhc2VfZG4gPT0gJzxTZWFyY2gtQmFzZS1ETj4nOgogICAg ICAgICAgICAgICAgIHNlYXJjaF9iYXNlX2RuID0gY29uZmlnLkxEQVBfQkFTRV9ETgogCkBAIC0y NjAsOCArMjY0LDggQEAgY2xhc3MgTERBUEF1dGhlbnRpY2F0aW9uKEJhc2VBdXRoZW50aWNhdGlv bik6CiAgICAgICAgIHJlc3VsdHMgPSBsZW4oc2VsZi5jb25uLmVudHJpZXMpCiAgICAgICAgIGlm IHJlc3VsdHMgPiAxOgogICAgICAgICAgICAgcmV0dXJuIEZhbHNlLCBFUlJPUl9TRUFSQ0hJTkdf TERBUF9ESVJFQ1RPUlkuZm9ybWF0KAotICAgICAgICAgICAgICAgICJNb3JlIHRoYW4gb25lIHJl c3VsdCBmb3VuZC4iKQorICAgICAgICAgICAgICAgIGdldHRleHQoIk1vcmUgdGhhbiBvbmUgcmVz dWx0IGZvdW5kLiIpKQogICAgICAgICBlbGlmIHJlc3VsdHMgPCAxOgogICAgICAgICAgICAgcmV0 dXJuIEZhbHNlLCBFUlJPUl9TRUFSQ0hJTkdfTERBUF9ESVJFQ1RPUlkuZm9ybWF0KAotICAgICAg ICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgc3BlY2lmaWVkIHVzZXIuIikKKyAgICAgICAg ICAgICAgICBnZXR0ZXh0KCJDb3VsZCBub3QgZmluZCB0aGUgc3BlY2lmaWVkIHVzZXIuIikpCiAg ICAgICAgIHJldHVybiBUcnVlLCBzZWxmLmNvbm4uZW50cmllc1swXQo= --0000000000007c1b7405bf7477ee--