From b7c8991e95cb23520294676e43da3a7073fe7397 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Mon, 17 Aug 2015 16:58:44 -0700
Subject: [PATCH] CRM-16373 - Config - Declare settings for fieldSeparator,
 legacyEncoding

---
 settings/Localization.setting.php | 42 +++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/settings/Localization.setting.php b/settings/Localization.setting.php
index 6ec4c809ef..d3ad1814a8 100644
--- a/settings/Localization.setting.php
+++ b/settings/Localization.setting.php
@@ -280,6 +280,27 @@ return array(
     'description' => '',
     'help_text' => NULL,
   ),
+  'fieldSeparator' => array(
+    'add' => '4.7',
+    'prefetch' => 1,
+    'config_only' => 1,
+    'help_text' => NULL,
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'group_name' => 'Localization Preferences',
+    'group' => 'localization',
+    'name' => 'fieldSeparator',
+    'type' => 'String',
+    'quick_form_type' => 'Element',
+    'html_type' => 'text',
+    'html_attributes' => array(
+      'size' => '2',
+      'maxlength' => '8',
+    ),
+    'default' => ',',
+    'title' => 'Import / Export Field Separator',
+    'description' => 'Global CSV separator character. Modify this setting to enable import and export of different kinds of CSV files (for example: \',\' \';\' \':\' \'|\' ).',
+  ),
   'lcMessages' => array(
     'group_name' => 'Localization Preferences',
     'group' => 'localization',
@@ -297,6 +318,27 @@ return array(
     'description' => '',
     'help_text' => NULL,
   ),
+  'legacyEncoding' => array(
+    'add' => '4.7',
+    'prefetch' => 1,
+    'config_only' => 1,
+    'help_text' => NULL,
+    'is_domain' => 1,
+    'is_contact' => 0,
+    'group_name' => 'Localization Preferences',
+    'group' => 'localization',
+    'name' => 'legacyEncoding',
+    'type' => 'String',
+    'quick_form_type' => 'Element',
+    'html_type' => 'text',
+    'html_attributes' => array(
+      'size' => '12',
+      'maxlength' => '30',
+    ),
+    'default' => 'Windows-1252',
+    'title' => 'Legacy Encoding',
+    'description' => 'If import files are NOT encoded as UTF-8, specify an alternate character encoding for these files. The default of Windows-1252 will work for Excel-created .CSV files on many computers.',
+  ),
   'weekBegins' => array(
     'group_name' => 'Localization Preferences',
     'group' => 'localization',
-- 
2.25.1