Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev/core#43 - Update geocoding setting text to reflect need for Google API key #12188

Merged
merged 4 commits into from
May 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/v3/examples/Setting/GetFields.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe change to 'or select the same service as you use for Map Provider.'

),
'mapAPIKey' => array(
'add' => '4.7',
Expand All @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions settings/Map.setting.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe change to 'or select the same service as you use for Map Provider.'

),
'mapAPIKey' => array(
'add' => '4.7',
Expand All @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions templates/CRM/Admin/Form/Setting/Mapping.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
<tr class="crm-map-form-block-mapAPIKey">
<td>{$form.mapAPIKey.label}</td>
<td>{$form.mapAPIKey.html|crmAddClass:huge}<br />
<span class="description">{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}</span></td>
<span class="description">{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}</span></td>
</tr>
<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. 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}</span></td>
<span class="description">{ts}You may choose a different webservice for geocoding or select the same service.{/ts}</span></td>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe change to 'or select the same service as you use for Map Provider.'

</tr>
<tr class="crm-map-form-block-geoAPIKey">
<td>{$form.geoAPIKey.label}</td>
Expand Down