diff options
| author | Marc Florisson | 2013-06-24 16:55:10 +0200 |
|---|---|---|
| committer | Marc Florisson | 2013-06-24 16:55:10 +0200 |
| commit | 6d74cc620d0ed64036e7fd600cfc744ff9dd3ffc (patch) | |
| tree | d54390dfd899cdab1028746ffc82b7b1ddaed91a /app/models | |
| parent | d6e1fb95a05bcbd1d7c3bbc7133da06001f6af6b (diff) | |
| parent | 70fcdb424efd0478a384ef856775faec84cc2598 (diff) | |
| download | chouette-core-6d74cc620d0ed64036e7fd600cfc744ff9dd3ffc.tar.bz2 | |
Merge branch 'master' of github.com:dryade/chouette2
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/export_log_message.rb | 7 | ||||
| -rw-r--r-- | app/models/file_validation_log_message.rb | 2 | ||||
| -rw-r--r-- | app/models/import_log_message.rb | 7 |
3 files changed, 13 insertions, 3 deletions
diff --git a/app/models/export_log_message.rb b/app/models/export_log_message.rb index 8d6a09a6b..4bb9d3cc7 100644 --- a/app/models/export_log_message.rb +++ b/app/models/export_log_message.rb @@ -32,6 +32,11 @@ class ExportLogMessage < ActiveRecord::Base def full_message last_key=key.rpartition("|").last - I18n.translate last_key, arguments.symbolize_keys.merge(:scope => "export_log_messages.messages").merge(:default => :undefined).merge(:key => last_key) + begin + I18n.translate last_key, arguments.symbolize_keys.merge(:scope => "export_log_messages.messages").merge(:default => :undefined).merge(:key => last_key) + rescue => e + Rails.logger.error "missing arguments for message "+last_key + I18n.translate "WRONG_DATA",{"0"=>last_key}.symbolize_keys.merge(:scope => "export_log_messages.messages").merge(:default => :undefined).merge(:key => "WRONG_DATA") + end end end diff --git a/app/models/file_validation_log_message.rb b/app/models/file_validation_log_message.rb index 4159bb7d0..589327110 100644 --- a/app/models/file_validation_log_message.rb +++ b/app/models/file_validation_log_message.rb @@ -36,7 +36,7 @@ class FileValidationLogMessage < ActiveRecord::Base if last_key == 'TooMuchDetails' 4 else - last_key.count("_") + 1 + [last_key.count("_") + 1,4].min end end diff --git a/app/models/import_log_message.rb b/app/models/import_log_message.rb index ae331eb20..4b56f03bd 100644 --- a/app/models/import_log_message.rb +++ b/app/models/import_log_message.rb @@ -31,7 +31,12 @@ class ImportLogMessage < ActiveRecord::Base def full_message last_key=key.rpartition("|").last - I18n.translate last_key, arguments.symbolize_keys.merge(:scope => "import_log_messages.messages").merge(:default => :undefined).merge(:key => last_key) + begin + I18n.translate last_key, arguments.symbolize_keys.merge(:scope => "import_log_messages.messages").merge(:default => :undefined).merge(:key => last_key) + rescue => e + Rails.logger.error "missing arguments for message "+last_key + I18n.translate "WRONG_DATA",{"0"=>last_key}.symbolize_keys.merge(:scope => "import_log_messages.messages").merge(:default => :undefined).merge(:key => "WRONG_DATA") + end end end |