From 891556328bbfcbef44c5f7241c0e9653032167ea Mon Sep 17 00:00:00 2001
From: Lars SG <lars@wildsight.ca>
Date: Tue, 29 May 2018 16:48:24 -0600
Subject: [PATCH] dev/core#43 - [Update] to Update geocoding setting text to
 reflect need for Google API key (#12232)

dev/core#43 - [Update] to Update geocoding setting text to reflect need for Google API key
---
 api/v3/examples/Setting/GetFields.php        | 2 +-
 settings/Map.setting.php                     | 2 +-
 templates/CRM/Admin/Form/Setting/Mapping.tpl | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/api/v3/examples/Setting/GetFields.php b/api/v3/examples/Setting/GetFields.php
index 365244a18de5..1a576bab77d2 100644
--- a/api/v3/examples/Setting/GetFields.php
+++ b/api/v3/examples/Setting/GetFields.php
@@ -2313,7 +2313,7 @@ function setting_getfields_expectedresult() {
         ),
         'default' => '',
         'title' => 'Geocoding Provider',
-        'description' => 'You may choose a different webservice for geocoding or select the same service.',
+        'description' => 'This can be the same or different from the mapping provider selected.',
       ),
       'mapAPIKey' => array(
         'add' => '4.7',
diff --git a/settings/Map.setting.php b/settings/Map.setting.php
index aee9fdfae347..77c31f8b8e29 100644
--- a/settings/Map.setting.php
+++ b/settings/Map.setting.php
@@ -72,7 +72,7 @@
     ),
     'default' => NULL,
     'title' => 'Geocoding Provider',
-    'description' => 'You may choose a different webservice for geocoding or select the same service.',
+    'description' => 'This can be the same or different from the mapping provider selected.',
   ),
   'mapAPIKey' => array(
     'add' => '4.7',
diff --git a/templates/CRM/Admin/Form/Setting/Mapping.tpl b/templates/CRM/Admin/Form/Setting/Mapping.tpl
index 15b7a2a5beba..ae4f89952f2e 100644
--- a/templates/CRM/Admin/Form/Setting/Mapping.tpl
+++ b/templates/CRM/Admin/Form/Setting/Mapping.tpl
@@ -42,7 +42,7 @@
          <tr class="crm-map-form-block-geoProvider">
              <td>{$form.geoProvider.label}</td>
              <td>{$form.geoProvider.html}<br />
-             <span class="description">{ts}You may choose a different webservice for geocoding or select the same service.{/ts}</span></td>
+             <span class="description">{ts}This can be the same or different from the mapping provider selected.{/ts}</span></td>
          </tr>
          <tr class="crm-map-form-block-geoAPIKey">
              <td>{$form.geoAPIKey.label}</td>