Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

275817 - Use i18n bay resource #80

Merged
merged 16 commits into from
Jan 31, 2024
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added Frame.view_sides translations
Maximilien Bausson authored and nicolas-brousse committed Dec 13, 2023

Verified

This commit was signed with the committer’s verified signature. The key has expired.
tvdeyen Thomas von Deyen
commit b81f39fca86d56254a1b5cfbed5a969ac7ca59cc
4 changes: 2 additions & 2 deletions app/views/rooms/_action_buttons.html.erb
Original file line number Diff line number Diff line change
@@ -19,12 +19,12 @@
<!-- Views FRONT / BACK -->
<% if view_side==Frame.view_sides[:both] %>
<%= content_tag :div, class: 'btn btn-default disabled' do %>
<%= t(".views.back_front") %>
<%= Frame.human_attribute_name("view_sides.both") %>
<% end %>
<% else %>
<%= link_to url_for(params.except(:controller, :action).permit(:view, :islet, :id, :bg, :format).merge({:view => (view_side == Frame.view_sides[:back] ? Frame.view_sides[:front] : Frame.view_sides[:back]), islet: params['islet'], id: params['id']})), class: 'btn btn-success', remote: true do %>
<span class="glyphicon glyphicon-refresh" aria-hidden="true"></span>
<%= (view_side==Frame.view_sides[:back] ? t(".views.front") : t(".views.back")) %>
<%= Frame.human_attribute_name("view_sides.#{view_side}") %>
<% end %>
<% end %>

4 changes: 4 additions & 0 deletions config/locales/activerecord.fr.yml
Original file line number Diff line number Diff line change
@@ -43,6 +43,10 @@ fr:
frames_count:
one: 1 châssis
other: '%{count} châssis'
frame/view_sides:
front: Vue avant
back: Vue arrière
both: Vue avant & arrière
maintenance_contract:
server_id: Serveur
start_date: Date de début
4 changes: 0 additions & 4 deletions config/locales/fr.yml
Original file line number Diff line number Diff line change
@@ -72,10 +72,6 @@ fr:
modele: Modèle
manager: Gestionnaire
cluster: Cluster
views:
back_front: Vue avant & arrière
front: Vue avant
back: Vue arrière
dragn_drop:
enable: Activer le drag'n drop
servers: