From d29176158b4a446c0099718a201e5b966595cbcf Mon Sep 17 00:00:00 2001 From: jekkos Date: Fri, 18 Mar 2016 08:16:02 +0100 Subject: [PATCH] Strip eol characters at end of last column (#311) --- generate_languages.php | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/generate_languages.php b/generate_languages.php index f630dcbcf..dede98777 100755 --- a/generate_languages.php +++ b/generate_languages.php @@ -48,7 +48,7 @@ function csvstring_to_array(&$string, $CSV_SEPARATOR = ',', $CSV_ENCLOSURE = '"' $o [$num] .= $CSV_ENCLOSURE; $escesc = false; } - $o [$num] .= preg_replace("/\r|\n/", "", $s);; + $o [$num] .= $s; } $i ++; } @@ -109,13 +109,9 @@ foreach ($dir as $fileinfo) { $lfh = fopen ( $output_base . $l . '/' . $index_file_name . '.php', 'w' ); fwrite ( $lfh, ' 2) { - // yes -- add to file we're working on - fwrite ( $lfh, '$lang["' . $key_name . '"] = "' . str_replace ( '"', '\"', $line [($key + 1)] ) . '";' . PHP_EOL ); - } } + $newline = preg_replace("/\r|\n/", "", $line [ $key + 1 ]); + fwrite ( $lfh, '$lang["' . $key_name . '"] = "' . str_replace ( '"', '\"', $newline ) . '";' . PHP_EOL ); } } }