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

18 files changed, 100 insertions, 47 deletions

diff --git a/Gemfile b/Gemfile
index dc2577d76..560716172 100644
--- a/Gemfile
+++ b/Gemfile
@@ -28,6 +28,7 @@ gem 'cocoon'
 gem 'formtastic', '2.0.2'
 gem 'inherited_resources'
 gem 'will_paginate', '~> 3.0'
+# gem 'will-paginate-i18n','~> 0.1.5'
 gem 'ransack'
 gem 'squeel'
 gem 'RedCloth'
@@ -43,7 +44,7 @@ gem 'delayed_job_active_record'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '~> 3.1.5'
+  gem 'sass-rails',   '= 3.1.4'
   gem 'coffee-rails', '~> 3.1.1'
   gem 'coffee-script-source'
   gem 'uglifier', '>= 1.0.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index c22c33aa1..03062f915 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://chouette.dryade.priv/ninoxe
-  revision: dcf5c4e0f9d1abf7524d1ae9bf672276ab978052
+  revision: f6423a2f1911989a1d13cc47d9922613b1767864
   specs:
     ninoxe (0.0.8)
       GeoRuby
@@ -71,7 +71,6 @@ GEM
   remote: http://rubygems.org/
   specs:
     GeoRuby (1.3.4)
-    RedCloth (4.2.9)
     RedCloth (4.2.9-java)
     SyslogLogger (1.4.1)
     actionmailer (3.1.3)
@@ -108,7 +107,6 @@ GEM
     acts_as_list (0.1.6)
     addressable (2.2.8)
     arel (2.2.3)
-    bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
@@ -159,7 +157,6 @@ GEM
     factory_girl_rails (1.7.0)
       factory_girl (~> 2.6.0)
       railties (>= 3.0.0)
-    ffi (1.0.11)
     ffi (1.0.11-java)
     ffi-geos (0.0.4)
       ffi (~> 1.0.0)
@@ -190,8 +187,6 @@ GEM
     jruby-rack (1.1.5)
     json (1.7.3-java)
     json_pure (1.7.3)
-    launchy (2.1.0)
-      addressable (~> 2.2.6)
     launchy (2.1.0-java)
       addressable (~> 2.2.6)
       ffi (~> 1.0.9)
@@ -212,7 +207,6 @@ GEM
     net-ssh (2.3.0)
     net-ssh-gateway (1.1.0)
       net-ssh (>= 1.99.1)
-    nokogiri (1.5.2)
     nokogiri (1.5.2-java)
     orm_adapter (0.0.7)
     polyamorous (0.5.0)
@@ -275,11 +269,12 @@ GEM
       railties (>= 3.0)
       rspec (~> 2.10.0)
     rubyzip (0.9.8)
-    sass (3.1.16)
-    sass-rails (3.1.6)
+    sass (3.1.18)
+    sass-rails (3.1.4)
       actionpack (~> 3.1.0)
       railties (~> 3.1.0)
-      sass (>= 3.1.10)
+      sass (>= 3.1.4)
+      sprockets (~> 2.0.0)
       tilt (~> 1.3.2)
     selenium-webdriver (2.21.2)
       childprocess (>= 0.2.5)
@@ -361,7 +356,7 @@ DEPENDENCIES
   remarkable_activerecord (~> 4.0.0.alpha4)
   rspec
   rspec-rails
-  sass-rails (~> 3.1.5)
+  sass-rails (= 3.1.4)
   shoulda!
   sqlite3
   squeel
diff --git a/config/locales/companies.yml b/config/locales/companies.yml
index 86af20ab2..8c91bec4a 100644
--- a/config/locales/companies.yml
+++ b/config/locales/companies.yml
@@ -17,7 +17,10 @@ en:
 
   activerecord:
     models:
-      company: Company
+      company:
+        zero:  company
+        one:   company
+        other: companies
     attributes:
       company:
         registrationnumber: "Registration number"
@@ -58,7 +61,10 @@ fr:
 
   activerecord:
     models:
-      company: Transporteur
+      company: 
+        zero:  transporteur
+        one:   transporteur
+        other: transporteurs
     attributes:
       company:
         registrationnumber: "Numéro d'enregistrement"
diff --git a/config/locales/connection_links.yml b/config/locales/connection_links.yml
index 43602d5dd..469eae937 100644
--- a/config/locales/connection_links.yml
+++ b/config/locales/connection_links.yml
@@ -27,7 +27,10 @@ en:
       title: "Select start and end stops for %{connection_link}"
   activerecord:        
     models:        
-      connection_link: Connection link
+      connection_link: 
+        zero:  connection link
+        one:   connection link
+        other: connection links
     attributes:
       connection_link:
         departure: Start of link
@@ -84,7 +87,10 @@ fr:
       title: "Sélection des arrêts de départ et d'arrivée de %{connection_link}"
   activerecord:        
     models:        
-      connection_link: Correspondance
+      connection_link: 
+        zero:  correspondance
+        one:   correspondance
+        other: correspondances
     attributes:
       connection_link:
         departure: Arrêt de départ
diff --git a/config/locales/imports.yml b/config/locales/imports.yml
index 2c30e30d6..d4c8b2d7c 100644
--- a/config/locales/imports.yml
+++ b/config/locales/imports.yml
@@ -9,6 +9,11 @@ en:
     index:
       title: Imports
   activerecord:        
+    models:        
+      import:
+        zero:  import
+        one:   import
+        other: imports
     attributes:
       import:
         resources: File to import
@@ -23,6 +28,11 @@ fr:
     index:
       title: Imports
   activerecord:        
+    models:        
+      import:
+        zero:  import
+        one:   import
+        other: imports
     attributes:
       import:
         resources: Fichier à importer
diff --git a/config/locales/lines.yml b/config/locales/lines.yml
index 9b58eeeac..186a09f71 100644
--- a/config/locales/lines.yml
+++ b/config/locales/lines.yml
@@ -22,12 +22,15 @@ en:
       multi_selection_enable: Enable multiple selection
       multi_selection_disable: Disable multiple selection
       delete_selected: Delete lines
-      export_selected: Export linges
+      export_selected: Export lines
       select_all: Select all
       deselect_all: Deselect all
   activerecord:        
     models:        
-      line: Line
+      line: 
+        zero:  line
+        one:   line
+        other: lines
     attributes:
       line:
         network: Network
@@ -77,7 +80,10 @@ fr:
       deselect_all: Tout désélectionner
   activerecord:        
     models:        
-      line: Ligne
+      line:
+        zero:  ligne
+        one:   ligne
+        other: lignes
     attributes:
       line:
         network: Réseau
@@ -97,4 +103,3 @@ fr:
       line:
         registrationnumber: "caractères autorisés : alphanumériques et 'souligné'" 
         objectid: "[prefixe]:Line:[clé_unique]  caractères autorisés : alphanumériques et 'souligné' pour le préfixe, la clé unique accepte en plus le 'moins'"
-
diff --git a/config/locales/networks.yml b/config/locales/networks.yml
index 06c7396cf..7f24081a6 100644
--- a/config/locales/networks.yml
+++ b/config/locales/networks.yml
@@ -17,7 +17,10 @@ en:
 
   activerecord:
     models:
-      network: Network
+      network: 
+        zero:  network
+        one:   network
+        other: networks
     attributes:
       network:
         registrationnumber: "Registration number"
@@ -56,7 +59,10 @@ fr:
       name: Nom
   activerecord:
     models:
-      network: Réseau
+      network: 
+        zero:  réseau
+        one:   réseau
+        other: réseaux
     attributes:
       network:
         registrationnumber: "Numéro d'enregistrement"
diff --git a/config/locales/routes.yml b/config/locales/routes.yml
index 35bc2cd12..fbea68a7d 100644
--- a/config/locales/routes.yml
+++ b/config/locales/routes.yml
@@ -20,7 +20,10 @@ en:
       selection_all: All
   activerecord:        
     models:        
-      route: Route
+      route: 
+        zero:  route
+        one:   route
+        other: routes
     attributes:
       route:
         line: Line
@@ -58,7 +61,10 @@ fr:
       selection_all: Tous
   activerecord:        
     models:        
-      route: "Séquence d'arrêts"
+      route: 
+        zero:  "Séquence d'arrêts"
+        one:   "Séquence d'arrêts"
+        other: "Séquences d'arrêts"
     attributes:
       route:
         line: Ligne
diff --git a/config/locales/stop_areas.yml b/config/locales/stop_areas.yml
index c6d5f9274..45bbbdb9e 100644
--- a/config/locales/stop_areas.yml
+++ b/config/locales/stop_areas.yml
@@ -31,7 +31,10 @@ en:
       title: Add children of stop area %{stop_area} 
   activerecord:        
     models:        
-      stop_area: Stop area
+      stop_area: 
+        zero:  stop area
+        one:   stop area
+        other: stop areas
     attributes:
       stop_area:
         name: Name
@@ -93,7 +96,10 @@ fr:
       title: Ajouter les enfants de l'arrêt %{stop_area} 
   activerecord:        
     models:        
-      stop_area: Arrêt
+      stop_area: 
+        zero:  arrêt
+        one:   arrêt
+        other: arrêts
     attributes:
       stop_area:
         name: Nom
diff --git a/config/locales/stop_points.yml b/config/locales/stop_points.yml
index cc40ba10a..53664ff07 100644
--- a/config/locales/stop_points.yml
+++ b/config/locales/stop_points.yml
@@ -21,7 +21,10 @@ en:
       no_stop_point: No stop point on route
   activerecord:        
     models:        
-      stop_point: Stop point on route
+      stop_point: 
+        zero:  stop point on route
+        one:   stop point on route
+        other: stop points on route
     attributes:
       stop_point:
 
@@ -48,6 +51,9 @@ fr:
       no_stop_point: Aucun arrêt dans la séquence
   activerecord:        
     models:        
-      stop_point: "Arrêt sur séquence d'arrêts"
+      stop_point: 
+        zero:  "arrêt sur séquence d'arrêts"
+        one:   "arrêt sur séquence d'arrêts"
+        other: "arrêts sur séquence d'arrêts"
     attributes:
       stop_point:
diff --git a/config/locales/time_tables.yml b/config/locales/time_tables.yml
index 5e0f44be7..e10d8a5f8 100644
--- a/config/locales/time_tables.yml
+++ b/config/locales/time_tables.yml
@@ -27,7 +27,10 @@ en:
       selection_all: All
   activerecord:        
     models:        
-      time_table: Timetable
+      time_table: 
+        zero:  timetable
+        one:   timetable
+        other: timetables
     attributes:
       time_table:
         comment: Comment
@@ -85,7 +88,10 @@ fr:
       selection_all: Tous
   activerecord:        
     models:        
-      time_table: Calendrier
+      time_table: 
+        zero:  calendrier
+        one:   calendrier
+        other: calendriers
     attributes:
       time_table:
         comment: Description
diff --git a/config/locales/will_paginate.yml b/config/locales/will_paginate.yml
index 4978c358d..bd8dbbc32 100644
--- a/config/locales/will_paginate.yml
+++ b/config/locales/will_paginate.yml
@@ -6,11 +6,11 @@ en:
 
     page_entries_info:
       single_page:
-        zero:  "No %{model} found"
+        zero:  "No item found"
         one:   "1 %{model} shown"
         other: "%{count} %{model} shown"
       single_page_html:
-        zero:  "No %{model} found"
+        zero:  "No item found"
         one:   "<b>1</b> %{model} shown"
         other: "<b>%{count}</b> %{model} shown"
 
@@ -25,12 +25,12 @@ fr:
 
     page_entries_info:
       single_page:
-        zero:  "Aucun(e) %{model} trouvé(e)"
+        zero:  "Aucun élément trouvé"
         one:   "1 %{model} affiché(e)"
         other: "%{count} %{model} affiché(e)s"
       single_page_html:
-        zero:  "Aucun(e) %{model} trouvé(e)"
-        one:   "<b>1</b> %{model} affiché(e)s"
+        zero:  "Aucun élément trouvé"
+        one:   "<b>1</b> %{model} affiché(e)"
         other: "<b>%{count}</b> %{model} affiché(e)s"
 
       multi_page: "%{model} %{from} - %{to} sur %{count} au total"
diff --git a/spec/requests/companies_spec.rb b/spec/requests/companies_spec.rb
index d464fd307..f21662356 100644
--- a/spec/requests/companies_spec.rb
+++ b/spec/requests/companies_spec.rb
@@ -33,7 +33,7 @@ describe "Companies" do
       fill_in "Nom", :with => "Company 1"
       fill_in "Numéro d'enregistrement", :with => "test-1"
       fill_in "Identifiant Neptune", :with => "test:Company:1"        
-      click_button("Créer Transporteur")
+      click_button("Créer transporteur")
       page.should have_content("Company 1")
     end
   end
@@ -44,7 +44,7 @@ describe "Companies" do
       click_link "Modifier ce transporteur"
       fill_in "Nom", :with => "Company Modified"
       fill_in "Numéro d'enregistrement", :with => "test-1"
-      click_button("Modifier Transporteur")
+      click_button("Modifier transporteur")
       page.should have_content("Company Modified")
     end
   end
diff --git a/spec/requests/connection_links_spec.rb b/spec/requests/connection_links_spec.rb
index 0c8b06c0f..798316aac 100644
--- a/spec/requests/connection_links_spec.rb
+++ b/spec/requests/connection_links_spec.rb
@@ -40,7 +40,7 @@ describe "ConnectionLinks" do
       click_link "Ajouter une correspondance"
       fill_in "Nom", :with => "ConnectionLink 1"
       fill_in "Identifiant Neptune", :with => "test:ConnectionLink:1"        
-      click_button("Créer Correspondance")
+      click_button("Créer correspondance")
       page.should have_content("ConnectionLink 1")
     end
   end
@@ -50,7 +50,7 @@ describe "ConnectionLinks" do
       visit referential_connection_link_path(referential, subject)
       click_link "Modifier cette correspondance"
       fill_in "Nom", :with => "ConnectionLink Modified"
-      click_button("Modifier Correspondance")
+      click_button("Modifier correspondance")
       page.should have_content("ConnectionLink Modified")
     end
   end
diff --git a/spec/requests/lines_spec.rb b/spec/requests/lines_spec.rb
index 3a5e4d507..59dc4eeed 100644
--- a/spec/requests/lines_spec.rb
+++ b/spec/requests/lines_spec.rb
@@ -45,7 +45,7 @@ describe "Lines" do
       fill_in "Nom", :with => "Line 1"
       fill_in "Numéro d'enregistrement", :with => "test-1"
       fill_in "Identifiant Neptune", :with => "test:Line:1"        
-      click_button("Créer Ligne")
+      click_button("Créer ligne")
       page.should have_content("Line 1")
     end
   end
@@ -57,7 +57,7 @@ describe "Lines" do
       click_link "Modifier cette ligne"
       fill_in "Nom", :with => "Line Modified"
       fill_in "Numéro d'enregistrement", :with => "test-1"
-      click_button("Modifier Ligne")
+      click_button("Modifier ligne")
       page.should have_content("Line Modified")
     end
   end
diff --git a/spec/requests/networks_spec.rb b/spec/requests/networks_spec.rb
index b48f0312c..cbc8a9638 100644
--- a/spec/requests/networks_spec.rb
+++ b/spec/requests/networks_spec.rb
@@ -42,7 +42,7 @@ describe "Networks" do
       fill_in "Nom", :with => "Network 1"
       fill_in "Numéro d'enregistrement", :with => "test-1"
       fill_in "Identifiant Neptune", :with => "test:GroupOfLine:1"        
-      click_button("Créer Réseau")
+      click_button("Créer réseau")
       page.should have_content("Network 1")
     end
   end
@@ -54,7 +54,7 @@ describe "Networks" do
       click_link "Modifier ce réseau"
       fill_in "Nom", :with => "Network Modified"
       fill_in "Numéro d'enregistrement", :with => "test-1"
-      click_button("Modifier Réseau")
+      click_button("Modifier réseau")
       page.should have_content("Network Modified")
     end
   end
diff --git a/spec/requests/stop_areas_spec.rb b/spec/requests/stop_areas_spec.rb
index bd01c59ba..acc32bdc8 100644
--- a/spec/requests/stop_areas_spec.rb
+++ b/spec/requests/stop_areas_spec.rb
@@ -40,7 +40,7 @@ describe "StopAreas" do
       fill_in "Nom", :with => "StopArea 1"
       fill_in "Numéro d'enregistrement", :with => "test-1"
       #fill_in "Identifiant Neptune", :with => "test:StopArea:1"        
-      click_button("Créer Arrêt")
+      click_button("Créer arrêt")
       page.should have_content("StopArea 1")
     end
   end
@@ -51,7 +51,7 @@ describe "StopAreas" do
       click_link "Modifier cet arrêt"
       fill_in "Nom", :with => "StopArea Modified"
       fill_in "Numéro d'enregistrement", :with => "test-1"
-      click_button("Modifier Arrêt")
+      click_button("Modifier arrêt")
       page.should have_content("StopArea Modified")
     end
   end
diff --git a/spec/requests/time_tables_spec.rb b/spec/requests/time_tables_spec.rb
index 720370ead..5dbf5220b 100644
--- a/spec/requests/time_tables_spec.rb
+++ b/spec/requests/time_tables_spec.rb
@@ -32,7 +32,7 @@ describe "TimeTables" do
       click_link "Ajouter un calendrier"
       fill_in "Description", :with => "TimeTable 1"
       fill_in "Identifiant Neptune", :with => "test:Timetable:1"        
-      click_button("Créer Calendrier")
+      click_button("Créer calendrier")
       page.should have_content("TimeTable 1")
     end
   end
@@ -42,7 +42,7 @@ describe "TimeTables" do
       visit referential_time_table_path(referential, subject)
       click_link "Modifier ce calendrier"
       fill_in "Description", :with => "TimeTable Modified"
-      click_button("Modifier Calendrier")
+      click_button("Modifier calendrier")
       page.should have_content("TimeTable Modified")
     end
   end