merge i18n keys to better support fr locale and update en, fr and nl locale for the change

es was updated by tolk, but no changes in content
This commit is contained in:
Reinier Balt 2013-06-04 11:47:47 +02:00
parent b6e110c917
commit 651e45d389
6 changed files with 37 additions and 23 deletions

View file

@ -1,7 +1,7 @@
<div class="list-stategroup-contexts-container" id="list-<%= state %>-contexts-container">
<h2>
<span id="<%= state %>-contexts-count" class="badge"><%= context_state_group.length %></span>
<%= t("states."+ state +"_plural")%> <%= t('common.contexts') %>
<%= t("states.contexts."+ state) %>
</h2>
<div id="<%= state%>-contexts-empty-nd" style="<%= no_contexts ? 'display:block' : 'display:none'%>">

View file

@ -8,14 +8,9 @@
<h2>
<span id="<%= state %>-projects-count" class="badge"><%= project_state_group.length%><%= total_count_string%></span>
<%= t('common.last' ) unless ( ['review','stalled','blocked','current'].include?(state) )%>
<% 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 %>
<%= t('common.last' ) if state == 'completed' %>
<%= t('states.projects.'+state) %>
<%= total_count==-1 ? "" : " (#{link_to(t('common.show_all'), done_projects_path)})".html_safe%>
</h2>
<% unless suppress_sort_menu %>