Merge branch 'master' into bump-deck-8.6

NEWS.md

@@ -30,6 +30,7 @@ Development
 - Use the organization user's data while editing a user from organization settings [#16280](https://github.com/CartoDB/cartodb/pull/16280)
 - Fix schema name in layers created by free users [#16307](https://github.com/CartoDB/cartodb/pull/16307)
 - Limit start parameter of Dropbox connector [#16264](https://github.com/CartoDB/cartodb/pull/16264)
+- Fix messages about layer limit being reached [#16360](https://github.com/CartoDB/cartodb/pull/16360)
 - Fix deck.gl dependency conflicts [#16339](https://github.com/CartoDB/cartodb/pull/16339)
 - Migrate Redis DO subscription information in inter-cloud migrations [#16315](https://github.com/CartoDB/cartodb/pull/16315)
 - OauthApps restricted by default [#16304](https://github.com/CartoDB/cartodb/pull/16304)

lib/assets/javascripts/builder/editor/editor-pane.js

@@ -265,7 +265,8 @@ module.exports = CoreView.extend({
           infoboxOpts.action = { label: _t('editor.layers.max-layers-infowindow.org.upgrade') };
         }
 
-        baseState.onAction = function () { window.open('mailto:' + this._userModel.upgradeContactEmail()); };
+        const contactEmail = this._userModel.upgradeContactEmail();
+        baseState.onAction = function () { window.open('mailto:' + contactEmail); };
       } else {
         baseState.onAction = function () { window.open(_t('editor.layers.max-layers-infowindow.pricing')); };
         infoboxOpts.body = _t('editor.layers.max-layers-infowindow.regular.body', { maxLayers: this._getMaxCount() });

lib/assets/javascripts/locale/en.json

@@ -2367,7 +2367,7 @@
                     "upgrade": "Upgrade your account"
                 },
                 "org": {
-                    "body": "Increase your layer limit by contacting the account's administrator.",
+                    "body": "Ask your account's administrator to contact CARTO Support in order to increase the layer limit for your organization.",
                     "upgrade": "Contact admin"
                 },
                 "org-admin": {