From 869677615736b6240257ebe4daacfce0149902b3 Mon Sep 17 00:00:00 2001 From: wildsight Date: Wed, 23 May 2018 13:25:02 -0600 Subject: [PATCH 1/4] Update Mapping.tpl --- templates/CRM/Admin/Form/Setting/Mapping.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/CRM/Admin/Form/Setting/Mapping.tpl b/templates/CRM/Admin/Form/Setting/Mapping.tpl index 498744d2130c..bba466888468 100644 --- a/templates/CRM/Admin/Form/Setting/Mapping.tpl +++ b/templates/CRM/Admin/Form/Setting/Mapping.tpl @@ -37,12 +37,12 @@ {$form.mapAPIKey.label} {$form.mapAPIKey.html|crmAddClass:huge}
- {ts}Enter your API Key or Application ID. An API Key is currently optional for Google Maps API, but may be helpful diagnosing any problems and required for higher volumes of requests. Refer to developers.google.com for the latest information.{/ts} + {ts}Enter your API Key or Application ID. An API Key is required for the Google Maps API.{/ts} {$form.geoProvider.label} {$form.geoProvider.html}
- {ts}You may choose a different webservice for geocoding. This is required if there is no geo-coding plugin for your selected mapping provider. You can leave the Geocoding fields blank if you are using Google as your mapping provider.{/ts} + {ts}You may choose a different webservice for geocoding or select the same service.{/ts} {$form.geoAPIKey.label} From 7811b8169ed77fc8f1470a91cc0f05328c8b8eb0 Mon Sep 17 00:00:00 2001 From: wildsight Date: Wed, 23 May 2018 13:32:45 -0600 Subject: [PATCH 2/4] Update Mapping.tpl --- templates/CRM/Admin/Form/Setting/Mapping.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/CRM/Admin/Form/Setting/Mapping.tpl b/templates/CRM/Admin/Form/Setting/Mapping.tpl index bba466888468..15b7a2a5beba 100644 --- a/templates/CRM/Admin/Form/Setting/Mapping.tpl +++ b/templates/CRM/Admin/Form/Setting/Mapping.tpl @@ -37,7 +37,7 @@ {$form.mapAPIKey.label} {$form.mapAPIKey.html|crmAddClass:huge}
- {ts}Enter your API Key or Application ID. An API Key is required for the Google Maps API.{/ts} + {ts}Enter your API Key or Application ID. An API Key is required for the Google Maps API. Refer to developers.google.com for the latest information.{/ts} {$form.geoProvider.label} From 3301f200381dec8381dc34412276744b80c9486e Mon Sep 17 00:00:00 2001 From: wildsight Date: Wed, 23 May 2018 13:34:38 -0600 Subject: [PATCH 3/4] Update Map.setting.php --- settings/Map.setting.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/settings/Map.setting.php b/settings/Map.setting.php index a465b253e0cc..aee9fdfae347 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. This is required if there is no geo-coding plugin for your selected mapping provider. You can leave the Geocoding fields blank if you are using Google as your mapping provider.', + 'description' => 'You may choose a different webservice for geocoding or select the same service.', ), 'mapAPIKey' => array( 'add' => '4.7', @@ -91,7 +91,7 @@ ), 'default' => NULL, 'title' => 'Map Provider Key', - 'description' => 'Enter your API Key or Application ID. An API Key is currently optional for Google Maps API, but may be helpful diagnosing any problems and required for higher volumes of requests. Refer to developers.google.com for the latest information.', + 'description' => 'Enter your API Key or Application ID. An API Key is required for the Google Maps API. Refer to developers.google.com for the latest information.', ), 'mapProvider' => array( 'add' => '4.7', From 226a9d68974c0c64368bca68c127fafd34e8f375 Mon Sep 17 00:00:00 2001 From: wildsight Date: Wed, 23 May 2018 13:39:51 -0600 Subject: [PATCH 4/4] Update GetFields.php --- api/v3/examples/Setting/GetFields.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/v3/examples/Setting/GetFields.php b/api/v3/examples/Setting/GetFields.php index 3d2c08eaf8b3..365244a18de5 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. This is required if there is no geo-coding plugin for your selected mapping provider. You can leave the Geocoding fields blank if you are using Google as your mapping provider.', + 'description' => 'You may choose a different webservice for geocoding or select the same service.', ), 'mapAPIKey' => array( 'add' => '4.7', @@ -2332,7 +2332,7 @@ function setting_getfields_expectedresult() { ), 'default' => '', 'title' => 'Map Provider Key', - 'description' => 'Enter your API Key or Application ID. An API Key is currently optional for Google Maps API, but may be helpful diagnosing any problems and required for higher volumes of requests. Refer to developers.google.com for the latest information.', + 'description' => 'Enter your API Key or Application ID. An API Key is required for the Google Maps API. Refer to developers.google.com for the latest information.', ), 'mapProvider' => array( 'add' => '4.7',