diff --git a/app/views/projects/_project_state_group.fr.html.erb b/app/views/projects/_project_state_group.fr.html.erb deleted file mode 100644 index e9cfc76e..00000000 --- a/app/views/projects/_project_state_group.fr.html.erb +++ /dev/null @@ -1,31 +0,0 @@ -<%- - total_count ||= -1 - total_count_string = total_count!=-1 ? " / #{total_count}" : "" - suppress_sort_menu ||= false - suppress_drag_handle ||= false --%> -
> -

- <%= project_state_group.length%><%= total_count_string%> - - <%= t('common.last' ) unless ( ['review','stalled','blocked','current'].include?(state) )%> - <%= t('common.projects').downcase %> - <%= t('states.'+state+'_plural' ).downcase %><%= total_count==-1 ? "" : " (#{link_to(t('common.show_all'), done_projects_path)})".html_safe%> - -

- <% unless suppress_sort_menu %> - - <% end %> - -
- <%= render :partial => 'projects/project_listing', :collection => project_state_group, :locals => {:suppress_drag_handle => suppress_drag_handle} %> -
-
diff --git a/app/views/projects/_project_state_group.html.erb b/app/views/projects/_project_state_group.html.erb index ad33de3b..06edbe38 100644 --- a/app/views/projects/_project_state_group.html.erb +++ b/app/views/projects/_project_state_group.html.erb @@ -9,8 +9,13 @@ <%= project_state_group.length%><%= total_count_string%> <%= t('common.last' ) unless ( ['review','stalled','blocked','current'].include?(state) )%> - <%= t('states.'+state+'_plural' )%> - <%= t('common.projects') %><%= total_count==-1 ? "" : " (#{link_to(t('common.show_all'), done_projects_path)})".html_safe%> + <% if (I18n.locale == :fr) %> + <%= t('common.projects').downcase %> + <%= t('states.'+state+'_plural' ).downcase %><%= total_count==-1 ? "" : " (#{link_to(t('common.show_all'), done_projects_path)})".html_safe%> + <% else %> + <%= t('states.'+state+'_plural' )%> + <%= t('common.projects') %><%= total_count==-1 ? "" : " (#{link_to(t('common.show_all'), done_projects_path)})".html_safe%> + <% end %> <% unless suppress_sort_menu %>