[Koha-patches] [PATCH 3/3] (bug #3945) Add Windows and Mac file support in CSV profiles

[paul.poulain at biblibre.com]

From: Jean-André Santoni <jeanandre.santoni at biblibre.com>

CR and CRLF
---
 .../prog/en/modules/tools/csv-profiles.tmpl        |   41 ++++++++++++++++----
 1 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tmpl
index fd8ed2e..90626bf 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/csv-profiles.tmpl
@@ -68,7 +68,9 @@ function reloadPage(p) {
 							<option value="#">Sharp (#)</option>
 							<option value=" ">Space ( )</option>
 							<option value="\t">Tabulation (\t)</option>
-							<option value="\n">New line (\n)</option>
+							<option value="\n">Line Feed (\n)</option>
+							<option value="\r">Carriage return (\r)</option>
+							<option value="\r\n">CRLF (\r\n)</option>
 						    </select>
                             </li>
 
@@ -81,7 +83,9 @@ function reloadPage(p) {
 							<option value="#" selected="selected">Sharp (#)</option>
 							<option value=" ">Space ( )</option>
 							<option value="\t">Tabulation (\t)</option>
-							<option value="\n">New line (\n)</option>
+							<option value="\n">Line Feed (\n)</option>
+							<option value="\r">Carriage return (\r)</option>
+							<option value="\r\n">CRLF (\r\n)</option>
 						    </select>
                             </li>
 
@@ -95,6 +99,9 @@ function reloadPage(p) {
 							<option value=" ">Space ( )</option>
 							<option value="\t">Tabulation (\t)</option>
 							<option value="\n">New line (\n)</option>
+							<option value="\n">Line Feed (\n)</option>
+							<option value="\r">Carriage return (\r)</option>
+							<option value="\r\n">CRLF (\r\n)</option>
 						    </select>
                             </li>
 					
@@ -174,9 +181,15 @@ function reloadPage(p) {
 								<option value="\t">Tabulation (\t)</option>
 								<!-- /TMPL_IF -->
 						    	<!-- TMPL_IF EXPR="selected_csv_separator eq '\n'" -->
-								<option value="\n" selected="selected">New line (\n)</option>
+								<option value="\n" selected="selected">Line feed (\n)</option>
+								<!--TMPL_ELSE -->
+								<!-- TMPL_IF EXPR="selected_csv_separator eq '\n'" -->
+								<option value="\r" selected="selected">Carriage return (\r)</option>
+								<!--TMPL_ELSE -->
+								<!-- TMPL_IF EXPR="selected_csv_separator eq '\n'" -->
+								<option value="\r\n" selected="selected">CRLF (\r\n)</option>
 								<!--TMPL_ELSE -->
-								<option value="\n">New line (\n)</option>
+								<option value="\n">Line feed (\n)</option>
 								<!-- /TMPL_IF -->
                             </select></li>
 
@@ -220,9 +233,15 @@ function reloadPage(p) {
                                 <option value="\t">Tabulation (\t)</option>
                                 <!-- /TMPL_IF -->
 						    	<!-- TMPL_IF EXPR="selected_field_separator eq '\n'" -->
-								<option value="\n" selected="selected">New line (\n)</option>
+								<option value="\n" selected="selected">Line feed (\n)</option>
 								<!--TMPL_ELSE -->
-								<option value="\n">New line (\n)</option>
+								<!-- TMPL_IF EXPR="selected_field_separator eq '\n'" -->
+								<option value="\r" selected="selected">Carriage return (\r)</option>
+								<!--TMPL_ELSE -->
+								<!-- TMPL_IF EXPR="selected_field_separator eq '\n'" -->
+								<option value="\r\n" selected="selected">CRLF (\r\n)</option>
+								<!--TMPL_ELSE -->
+								<option value="\n">Line feed (\n)</option>
 								<!-- /TMPL_IF -->
 						    </select></li>
 
@@ -268,9 +287,15 @@ function reloadPage(p) {
                                 <option value="\t">Tabulation (\t)</option>
                                 <!-- /TMPL_IF -->
 						    	<!-- TMPL_IF EXPR="selected_subfield_separator eq '\n'" -->
-								<option value="\n" selected="selected">New line (\n)</option>
+								<option value="\n" selected="selected">Line feed (\n)</option>
+								<!--TMPL_ELSE -->
+								<!-- TMPL_IF EXPR="selected_subfield_separator eq '\n'" -->
+								<option value="\r" selected="selected">Carriage return (\r)</option>
+								<!--TMPL_ELSE -->
+								<!-- TMPL_IF EXPR="selected_subfield_separator eq '\n'" -->
+								<option value="\r\n" selected="selected">CRLF (\r\n)</option>
 								<!--TMPL_ELSE -->
-								<option value="\n">New line (\n)</option>
+								<option value="\n">Line feed (\n)</option>
                                 <!-- /TMPL_IF -->
 	
 						    </select></li>
-- 
1.7.1