Merge branch 'master' of github.com:dryade/chouette2

5 files changed, 15 insertions, 5 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
diff --git a/app/views/group_of_lines/_form.erb b/app/views/group_of_lines/_form.erb
index 0dcdc9379..087d90a9f 100644
--- a/app/views/group_of_lines/_form.erb
+++ b/app/views/group_of_lines/_form.erb
@@ -20,7 +20,7 @@
           $( "#group_of_line_line_tokens" ).tokenInput('<%= name_filter_referential_lines_path(@referential, :format => :json) %>', { 
        crossDomain: false, 
        prePopulate: $('#line_tokens').data('pre'),
-       minChars: 3,
+       minChars: 1,
        preventDuplicates: true,
     });
 	});
diff --git a/app/views/lines/show.html.erb b/app/views/lines/show.html.erb
index 668eaebdc..1b30aff49 100644
--- a/app/views/lines/show.html.erb
+++ b/app/views/lines/show.html.erb
@@ -37,7 +37,7 @@
       <%= @line.number %>
     </p>
     <p>
-      <label><%= @line.human_attribute_name("transport_mode_name") %>: </label>
+      <label><%= @line.human_attribute_name("transport_mode") %>: </label>
       <%= t("transport_modes.label.#{@line.transport_mode}") %>
     </p>
     <p>