Adds a key in lang files (general_csv_decimal_separator) to set the decimal separator...

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1591 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index e8f21e9a4c1c3324376173304dbb7f89ca578a80..f42002ec8b0c8f4b481af65b87ab78010d2caf08 100644 (file)
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -126,6 +126,7 @@ module IssuesHelper
   
   def issues_to_csv(issues, project = nil)
     ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')    
+    decimal_separator = l(:general_csv_decimal_separator)
     export = StringIO.new
     CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
       # csv header fields
@@ -168,7 +169,7 @@ module IssuesHelper
                   format_date(issue.start_date),
                   format_date(issue.due_date),
                   issue.done_ratio,
-                  issue.estimated_hours,
+                  issue.estimated_hours.to_s.gsub('.', decimal_separator),
                   format_time(issue.created_on),  
                   format_time(issue.updated_on)
                   ]

diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index db13556a1fa41705955a210721a3c4778f06d84f..7fd70e744071ed627d8ccc66000b329348059cce 100644 (file)
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -44,6 +44,7 @@ module TimelogHelper
   
   def entries_to_csv(entries)
     ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')    
+    decimal_separator = l(:general_csv_decimal_separator)
     export = StringIO.new
     CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
       # csv header fields
@@ -67,7 +68,7 @@ module TimelogHelper
                   (entry.issue ? entry.issue.id : nil),
                   (entry.issue ? entry.issue.tracker : nil),
                   (entry.issue ? entry.issue.subject : nil),
-                  entry.hours,
+                  entry.hours.to_s.gsub('.', decimal_separator),
                   entry.comments
                   ]
         csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }

diff --git a/lang/bg.yml b/lang/bg.yml
index 1339d9a839a92a61b1dc4dbb3b5432c29d73ae8c..fd6e7e6cf4a19c531b626b7fb6f212e77f2d4cbd 100644 (file)
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -48,6 +48,7 @@ general_text_no: 'не'
 general_text_yes: 'да'
 general_lang_name: 'Bulgarian'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: UTF-8
 general_pdf_encoding: UTF-8
 general_day_names: Понеделник,Вторник,Сряда,Четвъртък,Петък,Събота,Неделя

diff --git a/lang/cs.yml b/lang/cs.yml
index 00d0642de7bb53d0d8502f5f419dd5524059f1d0..2c760722bc352271a26122b411c53eb1ccd987f6 100644 (file)
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -51,6 +51,7 @@ general_text_no: 'ne'
 general_text_yes: 'ano'
 general_lang_name: 'Čeština'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: UTF-8
 general_pdf_encoding: UTF-8
 general_day_names: Pondělí,Úterý,Středa,Čtvrtek,Pátek,Sobota,Neděle

diff --git a/lang/da.yml b/lang/da.yml
index b8546ab209af573d106ad42c6b2ba5121df1661f..d51d30817527d27769e258d1981c699febdc256e 100644 (file)
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -48,6 +48,7 @@ general_text_no: 'nej'
 general_text_yes: 'ja'
 general_lang_name: 'Danish (Dansk)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Mandag,Tirsdag,Onsdag,Torsdag,Fredag,Lørdag,Søndag

diff --git a/lang/de.yml b/lang/de.yml
index 6bc7919f9f054d9076c32015a37e47958d48c092..2bc0a16f706f1bee6a0e5d34477c19f290f91e3d 100644 (file)
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -48,6 +48,7 @@ general_text_no: 'nein'
 general_text_yes: 'ja'
 general_lang_name: 'Deutsch'
 general_csv_separator: ';'
+general_csv_decimal_separator: ','
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Montag,Dienstag,Mittwoch,Donnerstag,Freitag,Samstag,Sonntag

diff --git a/lang/en.yml b/lang/en.yml
index 7ab73f051248a12240fc51a85f6f100bb9230ec2..180a705656034ae81564660ed1615b45973b1738 100644 (file)
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -48,6 +48,7 @@ general_text_no: 'no'
 general_text_yes: 'yes'
 general_lang_name: 'English'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday

diff --git a/lang/es.yml b/lang/es.yml
index 2615d8f61b0ccc92367d100d3d568ab41f5bcce3..44d48190b56abb09092ddfce1122f036e7b8507e 100644 (file)
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -48,6 +48,7 @@ general_text_no: 'no'
 general_text_yes: 'sí'
 general_lang_name: 'Español'
 general_csv_separator: ';'
+general_csv_decimal_separator: ','
 general_csv_encoding: ISO-8859-15
 general_pdf_encoding: ISO-8859-15
 general_day_names: Lunes,Martes,Miércoles,Jueves,Viernes,Sábado,Domingo

diff --git a/lang/fi.yml b/lang/fi.yml
index 51b0c04a0548a7c12a1bc3737f9395d620bd36ec..ad719dd6c1ce2e94d2c5a356c20b7cf0bd81d97c 100644 (file)
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -48,6 +48,7 @@ general_text_no: 'ei'
 general_text_yes: 'kyllä'
 general_lang_name: 'Finnish (Suomi)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Maanantai,Tiistai,Keskiviikko,Torstai,Perjantai,Lauantai,Sunnuntai

diff --git a/lang/fr.yml b/lang/fr.yml
index 1fd86dd07be330f802aafe7d75e2743600831b8c..89b0b4c86aef34088bdcead8075f12910ed2b15e 100644 (file)
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -48,6 +48,7 @@ general_text_no: 'non'
 general_text_yes: 'oui'
 general_lang_name: 'Français'
 general_csv_separator: ';'
+general_csv_decimal_separator: ','
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Lundi,Mardi,Mercredi,Jeudi,Vendredi,Samedi,Dimanche

diff --git a/lang/he.yml b/lang/he.yml
index 7455fc3956d65fea274b7aea82657efad3dd4117..501cfdc9b2f1eb3e3197ed98e7c48ea06972c4ef 100644 (file)
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -48,6 +48,7 @@ general_text_no: 'לא'
 general_text_yes: 'כן'
 general_lang_name: 'Hebrew (עברית)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-8-I
 general_pdf_encoding: ISO-8859-8-I
 general_day_names: שני,שלישי,רביעי,חמישי,שישי,שבת,ראשון

diff --git a/lang/hu.yml b/lang/hu.yml
index 1810e93d8e05b219b6b7667eb1f82089344d28d9..6f88eb9629121412a4556ed81a5253ef186e507e 100644 (file)
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -48,6 +48,7 @@ general_text_no: 'nem'
 general_text_yes: 'igen'
 general_lang_name: 'Magyar'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-2
 general_pdf_encoding: ISO-8859-2
 general_day_names: Hétfő,Kedd,Szerda,Csütörtök,Péntek,Szombat,Vasárnap

diff --git a/lang/it.yml b/lang/it.yml
index 867c73f9a3cb225be4bf6bbd65d6e8044f7ac48e..14dc86fff508f34555060597acfb322182ba7f5c 100644 (file)
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -48,6 +48,7 @@ general_text_no: 'no'
 general_text_yes: 'si'
 general_lang_name: 'Italiano'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Lunedì,Martedì,Mercoledì,Giovedì,Venerdì,Sabato,Domenica

diff --git a/lang/ja.yml b/lang/ja.yml
index aa4320c3a615d866cdeb8b27f809b21369b92004..5bdc3b554f038419d6c72616f67a89de7385b7e6 100644 (file)
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -49,6 +49,7 @@ general_text_no: 'いいえ'
 general_text_yes: 'はい'
 general_lang_name: 'Japanese (日本語)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: SJIS
 general_pdf_encoding: UTF-8
 general_day_names: 月曜日,火曜日,水曜日,木曜日,金曜日,土曜日,日曜日

diff --git a/lang/ko.yml b/lang/ko.yml
index f945537a928f1d775b8b4fcbfad83229bfcd9deb..8e0d35ef4355833a945c2f1be101ad24556c2190 100644 (file)
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -48,6 +48,7 @@ general_text_no: '아니오'
 general_text_yes: '예'
 general_lang_name: 'Korean (한국어)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: CP949
 general_pdf_encoding: CP949
 general_day_names: 월요일,화요일,수요일,목요일,금요일,토요일,일요일

diff --git a/lang/lt.yml b/lang/lt.yml
index 355f473c86f363d41f690a5157136ae6107268bd..df2e2b4711745f6bd4fce95796c3cc885a7900b3 100644 (file)
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -48,6 +48,7 @@ general_text_no: 'ne'
 general_text_yes: 'taip'
 general_lang_name: 'Lithuanian (lietuvių)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: UTF-8
 general_pdf_encoding: UTF-8
 general_day_names: pirmadienis,antradienis,trečiadienis,ketvirtadienis,penktadienis,šeštadienis,sekmadienis

diff --git a/lang/nl.yml b/lang/nl.yml
index 89b8a57367e558fe59ae5577b49890cc4ceffa17..d1facc7a6b23791cc9b61b949e8f6c38c28d28cc 100644 (file)
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -48,6 +48,7 @@ general_text_no: 'nee'
 general_text_yes: 'ja'
 general_lang_name: 'Nederlands'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Maandag, Dinsdag, Woensdag, Donderdag, Vrijdag, Zaterdag, Zondag

diff --git a/lang/no.yml b/lang/no.yml
index 5e4bdcca3d589b768274551bb2aef614239fa7d1..bf25a15a5ef2a327ed4942af2df8f92974978150 100644 (file)
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -48,6 +48,7 @@ general_text_no: 'nei'
 general_text_yes: 'ja'
 general_lang_name: 'Norwegian (Norsk bokmål)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Mandag,Tirsdag,Onsdag,Torsdag,Fredag,Lørdag,Søndag

diff --git a/lang/pl.yml b/lang/pl.yml
index 0b0f87b6f984d92f098dc70f755091f1acd5854d..28c5f19d4fcfbe7ff54d1a40a695ebc89bf067e1 100644 (file)
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -48,6 +48,7 @@ general_text_no: 'nie'
 general_text_yes: 'tak'
 general_lang_name: 'Polski'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-2
 general_pdf_encoding: ISO-8859-2
 general_day_names: Poniedziałek,Wtorek,Środa,Czwartek,Piątek,Sobota,Niedziela

diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index e2036afdee74dec8b39def3485116c92913e6c05..04c3b347c42134ffd4c81d6ab7ccb8ceabf73a17 100644 (file)
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -48,6 +48,7 @@ general_text_no: 'não'
 general_text_yes: 'sim'\r
 general_lang_name: 'Português(Brasil)'\r
 general_csv_separator: ','\r
+general_csv_decimal_separator: '.'\r
 general_csv_encoding: ISO-8859-1\r
 general_pdf_encoding: ISO-8859-1\r
 general_day_names: Segunda,Terça,Quarta,Quinta,Sexta,Sabado,Domingo\r

diff --git a/lang/pt.yml b/lang/pt.yml
index 543743cabb4f7e5d522ea4a891b395b8c4f0ee81..5a1ffc2e0bd8a1f85f6b95608238caec3b8a8966 100644 (file)
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -48,6 +48,7 @@ general_text_no: 'não'
 general_text_yes: 'sim'
 general_lang_name: 'Português'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Segunda,Terça,Quarta,Quinta,Sexta,Sábado,Domingo

diff --git a/lang/ro.yml b/lang/ro.yml
index 16c2ea10458ea4c6809326dd41e2e8dbb3dc3032..3a1696c7b6bfef8b1f68d59e3d7b78869e989710 100644 (file)
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -48,6 +48,7 @@ general_text_no: 'nu'
 general_text_yes: 'da'
 general_lang_name: 'Română'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Luni,Marti,Miercuri,Joi,Vineri,Sambata,Duminica

diff --git a/lang/ru.yml b/lang/ru.yml
index 10ea1aad643f2536d3e2967810caeb4dbd9ab668..7d0707f7fbdcd65b58636da2be50b0b6c469c8bb 100644 (file)
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -48,6 +48,7 @@ general_text_no: 'Нет'
 general_text_yes: 'Да'
 general_lang_name: 'Russian (Русский)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: UTF-8
 general_pdf_encoding: UTF-8
 general_day_names: Понедельник,Вторник,Среда,Четверг,Пятница,Суббота,Воскресенье

diff --git a/lang/sr.yml b/lang/sr.yml
index 83bfdf43c7248822c361a997107c84cb400209f0..5b8e5d934756119f9f1c908c1c814b6cc7c647e4 100644 (file)
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -48,6 +48,7 @@ general_text_no: 'ne'
 general_text_yes: 'da'
 general_lang_name: 'Srpski'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Ponedeljak, Utorak, Sreda, četvrtak, Petak, Subota, Nedelja

diff --git a/lang/sv.yml b/lang/sv.yml
index 375970f3ef3d9847cca15d67f73d52bfeb5900b3..4c6170f4a7154a5480235e608d9d2be3987e51db 100644 (file)
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -48,6 +48,7 @@ general_text_no: 'nej'
 general_text_yes: 'ja'
 general_lang_name: 'Svenska'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Måndag,Tisdag,Onsdag,Torsdag,Fredag,Lördag,Söndag

diff --git a/lang/th.yml b/lang/th.yml
index acbf146cf593d6035f831d730de2542b64f7ac84..e7f276a34f8662980f358cb3e0182af5dcfd8121 100644 (file)
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -48,6 +48,7 @@ general_text_no: 'ไม่'
 general_text_yes: 'ใช่'
 general_lang_name: 'Thai (ไทย)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: Windows-874
 general_pdf_encoding: cp874
 general_day_names: จันทร์,อังคาร,พุธ,พฤหัสบดี,ศุกร์,เสาร์,อาทิตย์

diff --git a/lang/uk.yml b/lang/uk.yml
index d70916b1e2d7aad503b19cdb5a9f5909ae99891c..275de0e4b9f0724e6fae4bb300d3bc2472399d8a 100644 (file)
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -48,6 +48,7 @@ general_text_no: 'Ні'
 general_text_yes: 'Так'
 general_lang_name: 'Ukrainian (Українська)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: UTF-8
 general_pdf_encoding: UTF-8
 general_day_names: Понеділок,Вівторок,Середа,Четвер,П'ятниця,Субота,Неділя

diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 4626335756ff48470c45b10b12f85fa0d3ce3c23..26ffa94615965f3636eb666c9e687f040a991cb8 100644 (file)
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -48,6 +48,7 @@ general_text_no: '否'
 general_text_yes: '是'
 general_lang_name: 'Traditional Chinese (繁體中文)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: Big5
 general_pdf_encoding: Big5
 general_day_names: 星期一,星期二,星期三,星期四,星期五,星期六,星期日

diff --git a/lang/zh.yml b/lang/zh.yml
index f412f848c774683e2d506ce436057fb41a99db2c..2bd0880a583ab4e3430a9a4bee6269a029f1314f 100644 (file)
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -48,6 +48,7 @@ general_text_no: '否'
 general_text_yes: '是'
 general_lang_name: 'Simplified Chinese (简体中文)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: gb2312
 general_pdf_encoding: gb2312
 general_day_names: 星期一,星期二,星期三,星期四,星期五,星期六,星期日