aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorLuc Donnet2012-02-15 12:19:35 +0100
committerLuc Donnet2012-02-15 12:19:35 +0100
commitdfd08c9868942f31040f1518a09500ef398e4509 (patch)
tree8d632b0d382fa0ed75872fdc41cca7cea4c185de /config
parent3acd3ee699ec4f049d9ef204ab58d9488039a7ee (diff)
downloadchouette-core-dfd08c9868942f31040f1518a09500ef398e4509.tar.bz2
Add network and company model
Diffstat (limited to 'config')
-rw-r--r--config/database.yml16
-rw-r--r--config/locales/networks.yml43
-rw-r--r--config/routes.rb7
3 files changed, 56 insertions, 10 deletions
diff --git a/config/database.yml b/config/database.yml
index 317b1c4a9..c3bfe0abf 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -6,19 +6,21 @@
#
development:
adapter: jdbcpostgresql
- database: chouette
- schema_search_path: avignon
- hostname: localhost
- username: luc
- password: monalisa
+ database: chouette_dev
+ username: chouette
+ password: chouette
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
adapter: jdbcpostgresql
- database: db/test.sqlite3
+ database: chouette_test
+ username: chouette
+ password: chouette
production:
adapter: jdbcpostgresql
- database: db/production.sqlite3
+ database: chouette_prod
+ username: chouette
+ password: chouette
diff --git a/config/locales/networks.yml b/config/locales/networks.yml
new file mode 100644
index 000000000..8878bc4c2
--- /dev/null
+++ b/config/locales/networks.yml
@@ -0,0 +1,43 @@
+en:
+ networks:
+ actions:
+ new: Add a new network
+ edit: Edit this network
+ destroy: Remove this network
+ destroy_confirm: "Are you sure you want destroy this network?"
+ new:
+ title: "Add a new network"
+ edit:
+ title: "Update network"
+ show:
+ title: "Network"
+ index:
+ title: "Networks"
+
+fr:
+ networks:
+ actions:
+ new: Ajouter un réseau
+ edit: Modifier ce réseau
+ destroy: Supprimer ce réseau
+ destroy_confirm: "Etes vous sûr de détruire cette réseau ?"
+ new:
+ title: "Ajouter un réseau"
+ edit:
+ title: "Modifier le réseau"
+ show:
+ title: "Réseau"
+ index:
+ title: "Réseaux"
+ activerecord:
+ models:
+ network: Réseaux
+ attributes:
+ network:
+ registrationnumber: "Identifiant"
+ name: "Nom"
+ comment: "Commentaire"
+ version_date: Date de version
+ description: Description
+ source_name: Nom de la source
+ source_identifier: Identifiant de la source
diff --git a/config/routes.rb b/config/routes.rb
index 81dd47560..26a425ae6 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -12,8 +12,9 @@ ChouetteIhm::Application.routes.draw do
# Sample resource route (maps HTTP verbs to controller actions automatically):
# resources :products
- resources :lines
- resources :referentials
+ resources :referentials do
+ resources :lines, :networks, :companies
+ end
# Sample resource route with options:
# resources :products do
@@ -50,7 +51,7 @@ ChouetteIhm::Application.routes.draw do
# You can have the root of your site routed with "root"
# just remember to delete public/index.html.
- root :to => 'lines#index'
+ root :to => 'referentials#index'
# See how all your routes lay out with "rake routes"