Merge branch 'master' of chouette.dryade.priv:/srv/git/chouette2

6 files changed, 14 insertions, 11 deletions

diff --git a/Gemfile b/Gemfile
index 683ac2a7e..b13e2f806 100644
--- a/Gemfile
+++ b/Gemfile
@@ -47,14 +47,14 @@ gem 'apartment',:git => 'git://github.com/dryade/apartment.git'
 # some views use coffee script
 gem 'coffee-rails', '~> 3.2.1'
 gem 'coffee-script-source'
+gem 'therubyrhino', :platform => :jruby
+gem 'therubyracer', :platform => :ruby
 
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
   gem 'sass-rails',   '~> 3.2.3'
   gem 'uglifier', '>= 1.0.3'
-  gem 'therubyrhino', :platform => :jruby
-  gem 'therubyracer', :platform => :ruby
 end
 
 group :development do 
diff --git a/Gemfile.lock b/Gemfile.lock
index edc8a2fbd..5e512e990 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://chouette.dryade.priv/ninoxe
-  revision: a11f513671e1d5c31534a0bc989aaad71d3f8cca
+  revision: c00153cdca8d69ed747b383ebcb60585f3ae390f
   specs:
     ninoxe (0.0.8)
       GeoRuby
@@ -188,8 +188,7 @@ GEM
     jruby-rack (1.1.7)
     jruby-rack-worker (0.4-java)
       jruby-rack (>= 1.1.1)
-    json (1.7.3)
-    json (1.7.3-java)
+    json (1.7.5-java)
     json_pure (1.7.3)
     launchy (2.1.0)
       addressable (~> 2.2.6)
@@ -306,7 +305,7 @@ GEM
       activesupport (~> 3.0)
       polyamorous (~> 0.5.0)
     therubyrhino (1.73.4)
-    thor (0.15.4)
+    thor (0.16.0)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
diff --git a/app/views/connection_links/show.html.erb b/app/views/connection_links/show.html.erb
index 767332807..1ae049d99 100644
--- a/app/views/connection_links/show.html.erb
+++ b/app/views/connection_links/show.html.erb
@@ -65,15 +65,15 @@
     </p>
     <p>
       <label><%= @connection_link.human_attribute_name("mobility_restricted_suitability") %>: </label>
-      <%= @connection_link.mobility_restricted_suitability %>
+      <%= t((@connection_link.mobility_restricted_suitability == true).to_s) %>
     </p>
     <p>
       <label><%= @connection_link.human_attribute_name("stairs_availability") %>: </label>
-      <%= @connection_link.stairs_availability %>
+      <%= t((@connection_link.stairs_availability == true).to_s) %>
     </p>
     <p>
       <label><%= @connection_link.human_attribute_name("lift_availability") %>: </label>
-      <%= @connection_link.lift_availability %>
+      <%= t((@connection_link.lift_availability == true).to_s) %>
     </p>
     <p>
       <label><%= @connection_link.human_attribute_name("objectid") %>: </label>
diff --git a/config/locales/connection_links.yml b/config/locales/connection_links.yml
index 3f4a369f1..53d18ff00 100644
--- a/config/locales/connection_links.yml
+++ b/config/locales/connection_links.yml
@@ -41,7 +41,7 @@ en:
         undefined: not yet set
         name: Name
         comment: Comment
-        link_distance: Distance
+        link_distance: Distance (m)
         connection_link_type: Type
         default_duration: Average
         frequent_traveller_duration: Regular passenger
@@ -102,7 +102,7 @@ fr:
         undefined: non défini
         name: Nom
         comment: Commentaire
-        link_distance: Distance
+        link_distance: Distance (m)
         connection_link_type: Type
         default_duration: moyenne
         frequent_traveller_duration: pour un habitué
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 55696eef5..62de85bbc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3,6 +3,8 @@
 
 en:
   hello: "Hello world"
+  "true": "yes"
+  "false": "no"
   time:
     formats:
       hour: "%H:%M"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index e01e30fb4..9e74d5804 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -186,6 +186,8 @@ fr:
         alert: '%{resource_name} ne peut être détruit(e).'
 
 # FIN: https://github.com/svenfuchs/rails-i18n/blob/master/rails/locale/fr.yml
+  "true": "oui"
+  "false": "non"
   or: ou
   back: Revenir
   today: "Aujourd'hui"