Skip to content

Commit

Permalink
Merge pull request daemonsy#3 from Webegy/master
Browse files Browse the repository at this point in the history
French translation from Olivier
  • Loading branch information
daemonsy committed Jul 11, 2012
2 parents ea6b421 + 3b38e6a commit b58a803
Show file tree
Hide file tree
Showing 7 changed files with 24 additions and 9 deletions.
4 changes: 2 additions & 2 deletions app/overrides/add_showcase_to_admin_configuration_menu.rb
Expand Up @@ -3,7 +3,7 @@
:insert_bottom => "[data-hook='admin_configurations_menu']",
:text => %q{
<tr>
<td><%= link_to 'Showcase Slider', admin_slides_path %></td>
<td>Showcase Slides & Settings</td>
<td><%= link_to t(:showcase_slider), admin_slides_path %></td>
<td><%= t(:showcase_settings) %></td>
</tr> })

Expand Up @@ -2,6 +2,6 @@
:virtual_path => 'spree/admin/shared/_configuration_menu',
:name => 'add_showcase_to_admin_configurations_side_menu',
:insert_bottom => "[data-hook='admin_configurations_sidebar_menu']",
:text => %q{<%= configurations_sidebar_menu_item 'Showcase Slider', admin_slides_path %>}
:text => %q{<%= configurations_sidebar_menu_item t(:showcase_slider), admin_slides_path %>}
)

2 changes: 1 addition & 1 deletion app/views/spree/admin/slides/_form.html.erb
Expand Up @@ -18,7 +18,7 @@
<% end %>
<%= f.field_container :thumbnail_message do %>
<%= f.label "Thumb Message" %>
<%= f.label :thumbnail_message, t(:thumbnail_message) %>
<%= f.text_field :thumbnail_message %>
<% end %>
<%= f.field_container :published do %>
Expand Down
6 changes: 3 additions & 3 deletions app/views/spree/admin/slides/index.html.erb
Expand Up @@ -3,18 +3,18 @@
<div class="toolbar" data-hook="toolbar">
<ul class="actions">
<li>
<p><%= button_link_to 'New Slide', new_object_url, :icon => 'add', :id => 'admin_new_slide_link' %></p>
<p><%= button_link_to t(:new_slide), new_object_url, :icon => 'add', :id => 'admin_new_slide_link' %></p>
</li>
</ul>
<br class="clear" />
</div>

<h1>Showcase </h1>
<h1><%= t(:showcase) %></h1>

<table class="index sortable" id="listing_slides" data-hook data-sortable-link="<%= update_positions_admin_slides_url %>">
<thead>
<tr data-hook="admin_slides_index_headers">
<th>Name</th>
<th><%= t(:name) %></th>
<th data-hook="admin_slides_index_header_actions"></th>
</tr>
</thead>
Expand Down
2 changes: 1 addition & 1 deletion app/views/spree/admin/slides/new.html.erb
@@ -1,6 +1,6 @@
<%= render :partial => 'spree/admin/shared/configuration_menu' %>
<%= render :partial=>'spree/admin/shared/showcase_submenu'%>
<h1>New Showcase Slide</h1>
<h1><%= t(:new_showcase_slide) %></h1>
<%= render 'spree/shared/error_messages', :target => @slide %>
<%= form_for [:admin, @slide] , :html => { :multipart => true } do |f| %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/spree/admin/slides/show.html.erb
Expand Up @@ -28,7 +28,7 @@
</td>
</tr>
<tr data-hook="image_file_name">
<th><%= t(:image_file_name) %></th>
<th><%= t(:image) %></th>
<td>
<%= @slide.image_file_name %>
</td>
Expand Down
15 changes: 15 additions & 0 deletions config/locales/fr.yml
@@ -0,0 +1,15 @@
fr:
new_slide: "Ajouter une image"
showcase: "Diaporama"
slides: "Images"
slide: "Image"
showcase_slider: "Diaporama"
showcase_settings: "Options du diaporama"
edit_showcase_settings: "Edition des propriétés du diaporama"
body: "Corps"
target_url: "Cible du lien"
image: Image
thumbnail_message: "Texte de la miniature"
published: "Publiée"
new_showcase_slide: "Nouvelle image"
edit_showcase_slide: "Edition de l'image"

0 comments on commit b58a803

Please sign in to comment.