aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/assets/stylesheets/stop_areas.css.scss6
-rw-r--r--app/views/companies/show.html.erb2
-rw-r--r--app/views/lines/index.html.erb15
-rw-r--r--app/views/stop_areas/_form.html.erb6
-rw-r--r--app/views/stop_areas/show.html.erb2
-rw-r--r--config/locales/companies.yml4
-rw-r--r--config/locales/lines.yml20
-rw-r--r--config/locales/networks.yml2
-rw-r--r--config/locales/routes.yml24
-rw-r--r--config/locales/stop_areas.yml4
10 files changed, 53 insertions, 32 deletions
diff --git a/app/assets/stylesheets/stop_areas.css.scss b/app/assets/stylesheets/stop_areas.css.scss
index b751723b4..e66f4dd28 100644
--- a/app/assets/stylesheets/stop_areas.css.scss
+++ b/app/assets/stylesheets/stop_areas.css.scss
@@ -65,6 +65,12 @@
span { margin-left: 7px; }
img { margin: 0px 5px 0px 5px;}
}
+ .no_parent{
+ float: left;
+ padding: 3px 15px 3px 3px;
+ height: 25px;
+ width: 150px;
+ }
.target{
border: 2px solid #86b41d;
diff --git a/app/views/companies/show.html.erb b/app/views/companies/show.html.erb
index 8703bbc49..b5c64b691 100644
--- a/app/views/companies/show.html.erb
+++ b/app/views/companies/show.html.erb
@@ -57,7 +57,7 @@
<% content_for :sidebar do %>
<ul class="actions">
<li><%= link_to t('companies.actions.edit'), edit_referential_company_path(@referential, @company), :class => "edit" %></li>
- <li><%= link_to t('companys.actions.destroy'), referential_company_path(@referential, @company), :method => :delete, :confirm => t('companies.actions.destroy_confirm'), :class => "remove" %></li>
+ <li><%= link_to t('companies.actions.destroy'), referential_company_path(@referential, @company), :method => :delete, :confirm => t('companies.actions.destroy_confirm'), :class => "remove" %></li>
<br>
</ul>
<% end %>
diff --git a/app/views/lines/index.html.erb b/app/views/lines/index.html.erb
index 26b97e0b3..f499f6940 100644
--- a/app/views/lines/index.html.erb
+++ b/app/views/lines/index.html.erb
@@ -23,7 +23,6 @@
</p>
<% end %>
-
<div class="pagination">
<div class="page_info">
<%= page_entries_info @lines %>
@@ -63,21 +62,21 @@
</ul>
<div id="multiple_selection_menu">
- <h3>Sélection multiple</h3>
+ <h3><%= t(".multi_selection") %> </h3>
<div class="disabled">
- <a class="enable" href="#">Activer la sélection multiple</a>
+ <a class="enable" href="#"><%= t(".multi_selection_enable") %></a>
</div>
<div class="enabled" style="display: none;">
- <a class="disable" href="#">Désactiver la sélection multiple</a>
+ <a class="disable" href="#"><%= t(".multi_selection_disable") %></a>
<ul class="actions">
- <li><a href="#" class="remove">Supprimer les lignes</a></li>
- <li><a href="#" class="export">Exporter les lignes</a></li>
+ <li><a href="#" class="remove"><%= t(".delete_selected") %></a></li>
+ <li><a href="#" class="export"><%= t(".export_selected") %></a></li>
</ul>
- <a class="select_all" href="#">Tout sélectionner</a> | <a class="deselect_all" href="#">désélectionner</a>
- </div>
+ <a class="select_all" href="#"><%= t(".select_all") %></a> | <a class="deselect_all" href="#"><%= t(".deselect_all") %></a>
+ </div>
</div>
<% end %>
diff --git a/app/views/stop_areas/_form.html.erb b/app/views/stop_areas/_form.html.erb
index ffdd9faa1..208345523 100644
--- a/app/views/stop_areas/_form.html.erb
+++ b/app/views/stop_areas/_form.html.erb
@@ -12,11 +12,11 @@
<%= form.input :objectid %>
<% else %>
<li>
- <label><%= @stop_area.human_attribute_name("stop_area_type") %>: </label>
- <%= @stop_area.stop_area_type %>
+ <label><%= @stop_area.human_attribute_name("stop_area_type") %></label>
+ <%= t("area_types.label.#{@stop_area.stop_area_type}") %>
</li>
<li>
- <label><%= @stop_area.human_attribute_name("objectid") %>: </label>
+ <label><%= @stop_area.human_attribute_name("objectid") %></label>
<%= @stop_area.objectid %>
</li>
<% end %>
diff --git a/app/views/stop_areas/show.html.erb b/app/views/stop_areas/show.html.erb
index f4f7a9064..afaa5830a 100644
--- a/app/views/stop_areas/show.html.erb
+++ b/app/views/stop_areas/show.html.erb
@@ -96,6 +96,8 @@
<%= link_to image_tag("user_interface/ui/remove.png"), referential_stop_area_path(@referential, @stop_area.parent), :method => :delete, :confirm => t('stop_areas.actions.destroy_confirm'), :class => "remove" %>
</div>
<div class="link"><%= image_tag "icons/link.png"%></div>
+ <% else %>
+ <div class="no_parent">&nbsp;</div>
<% end %>
<% if @stop_area.parent.present? || @stop_area.children.present? %>
diff --git a/config/locales/companies.yml b/config/locales/companies.yml
index b6b3db0d7..86af20ab2 100644
--- a/config/locales/companies.yml
+++ b/config/locales/companies.yml
@@ -17,7 +17,7 @@ en:
activerecord:
models:
- company: "Companies"
+ company: Company
attributes:
company:
registrationnumber: "Registration number"
@@ -58,7 +58,7 @@ fr:
activerecord:
models:
- company: "Transporteurs"
+ company: Transporteur
attributes:
company:
registrationnumber: "Numéro d'enregistrement"
diff --git a/config/locales/lines.yml b/config/locales/lines.yml
index 7e565f24b..c585c5e13 100644
--- a/config/locales/lines.yml
+++ b/config/locales/lines.yml
@@ -15,8 +15,15 @@ en:
index:
title: Lines
name_or_number: Name or number
- selection: Selection
+ selection: Filter on
selection_all: All
+ multi_selection: Multiple selection
+ multi_selection_enable: Enable multiple selection
+ multi_selection_disable: Disable multiple selection
+ delete_selected: Delete lines
+ export_selected: Export linges
+ select_all: Select all
+ deselect_all: Deselect all
activerecord:
models:
line: Line
@@ -53,12 +60,19 @@ fr:
title: Modifier la ligne %{line}
show:
title: Ligne %{line}
- itineraries: "Liste des itinéraires de la ligne"
+ itineraries: "Liste des séquences d'arrêts de la ligne"
index:
name_or_number: Nom ou indice
title: Lignes
- selection: Sélection
+ selection: Filtrer sur
selection_all: Tous
+ multi_selection: Sélection multiple
+ multi_selection_enable: Activer la sélection multiple
+ multi_selection_disable: Désactiver la sélection multiple
+ delete_selected: Supprimer les lignes
+ export_selected: Exporter les lignes
+ select_all: Tout sélectionner
+ deselect_all: Tout désélectionner
activerecord:
models:
line: Ligne
diff --git a/config/locales/networks.yml b/config/locales/networks.yml
index 6b0070933..06c7396cf 100644
--- a/config/locales/networks.yml
+++ b/config/locales/networks.yml
@@ -17,7 +17,7 @@ en:
activerecord:
models:
- network: Networks
+ network: Network
attributes:
network:
registrationnumber: "Registration number"
diff --git a/config/locales/routes.yml b/config/locales/routes.yml
index a4cd3a366..c7f8ac306 100644
--- a/config/locales/routes.yml
+++ b/config/locales/routes.yml
@@ -39,26 +39,26 @@ en:
fr:
routes:
actions:
- new: Ajouter un itinéraire
- edit: Modifier cet itinéraire
- destroy: Supprimer cet itinéraire
- destroy_confirm: Etes vous sûr de détruire cet itinéraire ?
+ new: "Ajouter une séquence d'arrêts"
+ edit: "Modifier cette séquence d'arrêts"
+ destroy: "Supprimer cette séquence d'arrêts"
+ destroy_confirm: "Etes vous sûr de détruire cette séquence d'arrêts ?"
new:
- title: Ajouter un itinéraire
+ title: "Ajouter une séquence d'arrêts"
edit:
- title: "Modifier l'itinéraire %{route}"
+ title: "Modifier la séquence d'arrêts %{route}"
show:
- title: Itinéraire %{route} de la ligne %{line}
- stop_areas: "Liste des arrêts de l'itinéraire"
- no_opposite_route: Aucun itinéraire associé en sens opposé
+ title: "Séquence d'arrêts %{route} de la ligne %{line}"
+ stop_areas: "Liste des arrêts de la séquence d'arrêts"
+ no_opposite_route: "Aucune séquence d'arrêts associée en sens opposé"
undefined: Non défini
index:
- title: Itinéraires
+ title: "Séquences d'arrêts"
selection: Sélection
selection_all: Tous
activerecord:
models:
- route: Itinéraire
+ route: "Séquence d'arrêts"
attributes:
route:
line: Ligne
@@ -68,7 +68,7 @@ fr:
comment: Commentaire
direction_code: Direction
wayback_code: Sens
- opposite_route: Itinéraire associé en sens opposé
+ opposite_route: "Séquence d'arrêts associée en sens opposé"
objectid: Identifiant Neptune
object_version: Version
creation_time: Créé le
diff --git a/config/locales/stop_areas.yml b/config/locales/stop_areas.yml
index bb5d02869..c6d5f9274 100644
--- a/config/locales/stop_areas.yml
+++ b/config/locales/stop_areas.yml
@@ -22,7 +22,7 @@ en:
index:
title: Stop areas
name_or_country_code: Name or Country code
- selection: Selection
+ selection: Filter on
selection_all: All
area_type: Area Type
select_parent:
@@ -84,7 +84,7 @@ fr:
index:
name_or_country_code: Nom ou Code Postal
title: Arrêts
- selection: Sélection
+ selection: Filtrer sur
selection_all: Tous
area_type: Type d'arrêt
select_parent:
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-02 11:28:45 +0000