X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=settings%2FAddress.setting.php;h=417788353b6a4509d6ba132b702ccf5f26ac91d2;hb=2db35bf6ee39bf6d611681a9163515fa89115765;hp=0a10075532a7de4e3117cdd577c05c05c5b04456;hpb=4fd26f71c62960fbbb738a549bb595926f1eb70b;p=civicrm-core.git

diff --git a/settings/Address.setting.php b/settings/Address.setting.php
index 0a10075532..417788353b 100644
--- a/settings/Address.setting.php
+++ b/settings/Address.setting.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.6                                                |
+ | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2017                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -23,31 +23,31 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2017
  * $Id$
  *
  */
 /*
  * Settings metadata file
  */
-return array (
+return array(
   'address_standardization_provider' => array(
     'group_name' => 'Address Preferences',
     'group' => 'address',
     'name' => 'address_standardization_provider',
     'type' => 'String',
     'html_type' => 'Select',
-    'default' => null,
+    'default' => NULL,
     'add' => '4.1',
     'title' => 'Address Standardization Provider.',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => null,
+    'description' => NULL,
     'help_text' => 'CiviCRM includes an optional plugin for interfacing with the United States Postal Services (USPS) Address Standardization web service. You must register to use the USPS service at https://www.usps.com/business/web-tools-apis/address-information.htm. If you are approved, they will provide you with a User ID and the URL for the service. Plugins for other address standardization services may be available from 3rd party developers. If installed, they will be included in the drop-down below. ',
   ),
   'address_standardization_userid' => array(
@@ -56,13 +56,13 @@ return array (
     'name' => 'address_standardization_userid',
     'type' => 'String',
     'html_type' => 'Text',
-    'default' => null,
+    'default' => NULL,
     'add' => '4.1',
     'title' => 'Web service user ID',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => null,
-    'help_text' => null,
+    'description' => NULL,
+    'help_text' => NULL,
   ),
   'address_standardization_url' => array(
     'group_name' => 'Address Preferences',
@@ -70,13 +70,27 @@ return array (
     'name' => 'address_standardization_url',
     'type' => 'Text',
     'html_type' => 'Text',
-    'default' => null,
+    'default' => NULL,
     'add' => '4.1',
     'title' => 'Web Service URL',
     'is_domain' => 1,
     'is_contact' => 0,
-    'description' => null,
+    'description' => NULL,
     'help_text' => 'Web Service URL',
     'validate_callback' => 'CRM_Utils_Rule::url',
   ),
+  'hideCountryMailingLabels' => array(
+    'group_name' => 'Address Preferences',
+    'group' => 'address',
+    'name'  => 'hideCountryMailingLabels',
+    'type' => 'Boolean',
+    'quick_form_type' => 'YesNo',
+    'default' => 0,
+    'add' => '4.7',
+    'title' => 'Hide Country in Mailing Labels when same as domain country',
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'description' => 'Do not display the country field in mailing labels when the country is the same as that of the domain',
+    'help_text' => NULL,
+  ),
 );