Complete a first i18n support

2 files changed, 10 insertions, 18 deletions

diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index 9e8b0131f..e9642c49c 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -1,10 +1,13 @@
+# -*- coding: undecided -*-
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format
 # (all these examples are active by default):
-# ActiveSupport::Inflector.inflections do |inflect|
+ActiveSupport::Inflector.inflections do |inflect|
 #   inflect.plural /^(ox)$/i, '\1en'
 #   inflect.singular /^(ox)en/i, '\1'
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
-# end
+  inflect.irregular 'réseau', 'réseaux'
+end
+
diff --git a/config/initializers/ninoxe.rb b/config/initializers/ninoxe.rb
index 3c26e41f4..c9b6085a1 100644
--- a/config/initializers/ninoxe.rb
+++ b/config/initializers/ninoxe.rb
@@ -1,36 +1,25 @@
 Chouette::ActiveRecord.establish_chouette_connection = false
 
-
 class Chouette::Line
 
   def self.model_name
-    name = "Line"
-    def name.name
-      self
-    end
-    ActiveModel::Name.new name
+    ActiveModel::Name.new Chouette::Line, Chouette, "Line"
   end
 
 end
 
 class Chouette::Network
+
   def self.model_name
-    name = "Network"
-    def name.name
-      self
-    end
-    ActiveModel::Name.new name
+    ActiveModel::Name.new Chouette::Network, Chouette, "Network"
   end
 
 end
 
 class Chouette::Company
+
   def self.model_name
-    name = "Company"
-    def name.name
-      self
-    end
-    ActiveModel::Name.new name
+    ActiveModel::Name.new Chouette::Company, Chouette, "Company"
   end
 
 end