diff options
| author | Zakaria BOUZIANE | 2014-12-15 16:49:41 +0100 |
|---|---|---|
| committer | Zakaria BOUZIANE | 2014-12-15 16:49:41 +0100 |
| commit | 070c2fae3b7a3fc32e87bdfc2404c1657d2ecd2b (patch) | |
| tree | ab93d6ad47ddcb114aa983f3a76cd0b5444ad5b7 | |
| parent | 4a38f7e0c6cf879fcd050b0b078cd488065a2202 (diff) | |
| parent | e85c9a8ee0aa0b1058b478879f538ef2c09d23da (diff) | |
| download | chouette-core-070c2fae3b7a3fc32e87bdfc2404c1657d2ecd2b.tar.bz2 | |
Merge branch 'V2_5' of https://github.com/afimb/chouette2 into V2_5
| -rw-r--r-- | app/views/connection_links/show.html.erb | 6 | ||||
| -rw-r--r-- | config/deploy/private.rb | 3 | ||||
| -rw-r--r-- | config/deploy/production.rb | 2 | ||||
| -rw-r--r-- | config/deploy/sismo.rb | 3 | ||||
| -rw-r--r-- | config/locales/connection_link_types.yml | 2 |
5 files changed, 11 insertions, 5 deletions
diff --git a/app/views/connection_links/show.html.erb b/app/views/connection_links/show.html.erb index 58649d245..0771caac4 100644 --- a/app/views/connection_links/show.html.erb +++ b/app/views/connection_links/show.html.erb @@ -22,7 +22,11 @@ </p> <p> <label><%= @connection_link.human_attribute_name("connection_link_type") %>: </label> - <%= t("connection_link_types.label.#{@connection_link.connection_link_type}") %> + <% if @connection_link.connection_link_type.blank? %> + <%= t("connection_link_types.label.undefined") %> + <% else %> + <%= t("connection_link_types.label.#{@connection_link.connection_link_type}") %> + <% end %> </p> <p> <label><%= @connection_link.human_attribute_name("comment") %>: </label> 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" |