Merge pull request #8914 from totten/master-soap

[civicrm-core.git] / settings / Localization.setting.php

diff --git a/settings/Localization.setting.php b/settings/Localization.setting.php
index 609e30d866a5994c25e2620ca50ff338899b272f..e375d92f3a9a3f72e377a65ce3394eec0c67fdf7 100644 (file)
--- a/settings/Localization.setting.php
+++ b/settings/Localization.setting.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2016                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2015
+ * @copyright CiviCRM LLC (c) 2004-2016
  * $Id$
  *
  */
@@ -188,13 +188,14 @@ return array(
     'group' => 'localization',
     'name' => 'countryLimit',
     'type' => 'Array',
-    'quick_form_type' => 'Select',
-    'html_type' => 'Select',
+    'quick_form_type' => 'Element',
+    'html_type' => 'advmultiselect',
     'html_attributes' => array(
-      'multiple' => 1,
-      'class' => 'crm-select2',
+      'size' => 5,
+      'style' => 'width:150px',
+      'class' => 'advmultiselect',
     ),
-    'default' => array('1228'),
+    'default' => array(),
     'add' => '4.3',
     'title' => 'Available Countries',
     'is_domain' => 1,
@@ -210,15 +211,16 @@ return array(
     'group' => 'localization',
     'name' => 'provinceLimit',
     'type' => 'Array',
-    'quick_form_type' => 'Select',
-    'html_type' => 'Select',
+    'quick_form_type' => 'Element',
+    'html_type' => 'advmultiselect',
     'html_attributes' => array(
-      'multiple' => 1,
-      'class' => 'crm-select2',
+      'size' => 5,
+      'style' => 'width:150px',
+      'class' => 'advmultiselect',
     ),
-    'default' => array('1228'),
+    'default' => array(),
     'add' => '4.3',
-    'title' => 'Available States and Provinces',
+    'title' => 'Available States and Provinces (by Country)',
     'is_domain' => 1,
     'is_contact' => 0,
     'description' => '',
@@ -324,6 +326,25 @@ return array(
     'title' => 'Date Format: Year Only',
     'description' => '',
   ),
+  'dateformatFinancialBatch' => array(
+    'add' => '4.7',
+    'help_text' => NULL,
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'group_name' => 'Localization Preferences',
+    'group' => 'localization',
+    'name' => 'dateformatFinancialBatch',
+    'type' => 'String',
+    'quick_form_type' => 'Element',
+    'html_type' => 'text',
+    'html_attributes' => array(
+      'size' => '12',
+      'maxlength' => '60',
+    ),
+    'default' => '%m/%d/%Y',
+    'title' => 'Date Format: Financial Batch',
+    'description' => '',
+  ),
   'dateInputFormat' => array(
     'add' => '4.7',
     'help_text' => NULL,