Merge branch 'V2_5' of https://github.com/afimb/chouette2 into V2_5

4 files changed, 6 insertions, 4 deletions

diff --git a/config/deploy/private.rb b/config/deploy/private.rb
new file mode 100644
index 000000000..58301b4fe
--- /dev/null
+++ b/config/deploy/private.rb
@@ -0,0 +1,3 @@
+server "chouette-private.marseille.cityway.fr", :app, :web, :db, :primary => true
+set :branch, "V2_5"
+set :gui_cmd, "2.5.1"
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
index 57d36de2d..3baa258d0 100644
--- a/config/deploy/production.rb
+++ b/config/deploy/production.rb
@@ -1,3 +1,3 @@
-server "chouette.cityway.fr", :app, :web, :db, :primary => true
+server "chouette.marseille.cityway.fr", :app, :web, :db, :primary => true
 set :branch, "V2_5"
 set :gui_cmd, "2.5.1"
\ No newline at end of file
diff --git a/config/deploy/sismo.rb b/config/deploy/sismo.rb
deleted file mode 100644
index 4e7c6cd57..000000000
--- a/config/deploy/sismo.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-server "chouette-sismo.marseille.cityway.fr", :app, :web, :db, :primary => true
-set :branch, "V2_5"
-set :gui_cmd, "2.5.1"
diff --git a/config/locales/connection_link_types.yml b/config/locales/connection_link_types.yml
index 0f4f9d408..4a7149a4f 100644
--- a/config/locales/connection_link_types.yml
+++ b/config/locales/connection_link_types.yml
@@ -1,6 +1,7 @@
 en:
   connection_link_types:
     label:
+      undefined: "Undefined"
       underground: "Underground"
       mixed: "Mixed"
       overground: "Overground"
@@ -8,6 +9,7 @@ en:
 fr:
   connection_link_types:
     label:
+      undefined: "Non précisé"
       underground: "Souterrain"
       mixed: "Mixte"
       overground: "Aérien"