Skip to content

Commit

Permalink
Replaced keys to use singular form of 'action'
Browse files Browse the repository at this point in the history
  • Loading branch information
Maximilien Bausson committed Oct 11, 2023
1 parent 8f51f23 commit da60812
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion app/views/servers/_card_fields.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

<span>
<%= f.hidden_field :_destroy %>
<%= link_to t("actions.delete"), '#', class: "remove_fields pull-right" %>
<%= link_to t("action.delete"), '#', class: "remove_fields pull-right" %>
</span>
</fieldset>
</li>
Expand Down
2 changes: 1 addition & 1 deletion app/views/servers/_disk_fields.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</div>
<span>
<%= f.hidden_field :_destroy %>
<%= link_to t("actions.delete"), '#', class: "remove_fields pull-right" %>
<%= link_to t("action.delete"), '#', class: "remove_fields pull-right" %>
</span>
</fieldset>
</li>
2 changes: 1 addition & 1 deletion app/views/servers/_document_fields.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<span>
<%= f.hidden_field :_destroy %>
<%= link_to t("actions.delete"), '#', class: "remove_fields pull-right btn btn-default" %>
<%= link_to t("action.delete"), '#', class: "remove_fields pull-right btn btn-default" %>
</span>

<span class="pull-left"><%= f.object.document.metadata['filename'] if f.object.document.present? %></span>
Expand Down
6 changes: 4 additions & 2 deletions app/views/servers/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
<% if @server.errors.any? %>
<div class="alert alert-danger alert-dismissable" role="alert">
<button type="button" class="close" data-dismiss="alert">
<span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
<span aria-hidden="true">&times;</span><span class="sr-only">
<%= t("action.close") %>
</span></button>
<h4>
<%= t("errors.title", count: @server.errors.count) %>
<%= t("form.errors.title", count: @server.errors.count) %>
</h4>

<ul>
Expand Down
2 changes: 1 addition & 1 deletion app/views/servers/_memory_component_fields.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</div>
<span>
<%= f.hidden_field :_destroy %>
<%= link_to t("actions.delete"), '#', class: "remove_fields pull-right" %>
<%= link_to t("action.delete"), '#', class: "remove_fields pull-right" %>
</span>
</fieldset>
</li>
8 changes: 4 additions & 4 deletions app/views/servers/_modal_add_element_in_frame.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
<%= form_for(Server.new(:name => "PatchPanel", :modele => Modele.where("name LIKE ?", '%Panel%').first, frame: (@frame ? @frame : nil)), html: { class: "form-horizontal", role: "form" }) do |f| %>
<% if @server.try(:errors).try(:any?) %>
<div class="alert alert-danger alert-dismissable" role="alert">
<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only"><%= t("actions.close") %></span></button>
<button type="button" class="close" data-dismiss="alert"><span aria-hidden="true">&times;</span><span class="sr-only"><%= t("action.close") %></span></button>
<h4>
<%= t("errors.title", count: @server.errors.count) %>
<%= t("form.errors.title", count: @server.errors.count) %>
</h4>

<ul>
Expand Down Expand Up @@ -67,9 +67,9 @@

<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
<%= f.submit t("actions.confirm"),class: "btn btn-primary" %>
<%= f.submit t("action.confirm"),class: "btn btn-primary" %>
<button type="button" class="btn btn-default" data-dismiss="modal">
<%= t("actions.cancel") %>
<%= t("action.cancel") %>
</button>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/servers/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
data: { confirm: t(".delete_confirmation") },
class: 'btn btn-danger') do %>
<span class="glyphicon glyphicon-alert"></span>
<%= t("actions.delete") %>
<%= t("action.delete") %>
<% end %>
<h1>
<%= t(".title", name: @server.name) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/servers/import_csv.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<% if @import_error %>
<div class="alert alert-danger alert-dismissable" role="alert">
<button type="button" class="close" data-dismiss="alert">
<span aria-hidden="true">&times;</span><span class="sr-only"><%= t("actions.close") %></span></button>
<span aria-hidden="true">&times;</span><span class="sr-only"><%= t("action.close") %></span></button>
<h4><%= @import_error %></h4>
</div>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/servers/index.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<td><%= server.room %></td>
<td><%= server.islet %></td>
<td><%= server.bay %></td>
<td><%= link_to t("actions.edit"), edit_server_path(server), class: 'btn btn-primary' %></td>
<td><%= link_to t("action.edit"), edit_server_path(server), class: 'btn btn-primary' %></td>
<% end %>
</tbody>
</table>
Expand Down
2 changes: 1 addition & 1 deletion app/views/servers/new.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<div class="page-header">
<%= link_to servers_path, class: 'btn btn-default' do %>
<span class="glyphicon glyphicon-list-alt"></span>
<%= t("actions.back") %>
<%= t("action.back") %>
<% end %>
<h1>
<%= t(".title") %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/servers/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<div class="page-header">
<%= link_to edit_server_path(@server.slug), class: 'btn btn-primary' do %>
<span class="glyphicon glyphicon-pencil"></span>
<%= t("actions.edit") %>
<%= t("action.edit") %>
<% end %>
<h1><%= title %></h1>
</div>
Expand Down
2 changes: 1 addition & 1 deletion config/locales/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ fr:
confirmation:
yes: Oui
no: Non
actions:
action:
edit: Modifier
delete: Supprimer
back: Retour
Expand Down

0 comments on commit da60812

Please sign in to comment.