further i18n changes for Hebrew, impacting other locales too

This commit is contained in:
Reinier Balt 2012-04-11 21:09:46 +02:00
parent ac270884ed
commit f32e5b256b
12 changed files with 277 additions and 272 deletions

View file

@ -1,4 +1,4 @@
<% context = context_form
<% context = context_form
@context = context
-%>
@ -11,10 +11,10 @@
<div id="edit_error_status"><%= error_messages_for("project") %></div>
<label for="context_name">Context name</label><br/>
<label for="context_name"><%= t 'contexts.context_name' %></label><br/>
<%= text_field('context', 'name', :class => 'context-name', :tabindex => next_tab_index) %><br/>
<label for="context_hide">Hide from front page?</label>
<label for="context_hide"><%= t 'contexts.context_hide' %> </label>
<%= check_box('context', 'hide', {:class => 'context-hide', :tabindex => next_tab_index}) %>
<input type="hidden" name="wants_render" value="true" />

View file

@ -8,14 +8,14 @@
<h3><%= t('stats.top5_contexts') %></h3>
<%
1.upto 5 do |i|
%><%=i-%> -
<%= i <= @actions_per_context.size ? link_to(@actions_per_context[i-1]['name'], {:controller => "contexts", :action => "show", :id => @actions_per_context[i-1]['id']}) : "n/a"%>
%><%=i-%> -
<%= i <= @actions_per_context.size ? link_to(@actions_per_context[i-1]['name'], {:controller => "contexts", :action => "show", :id => @actions_per_context[i-1]['id']}) : "n/a"%>
(
<%= i <= @actions_per_context.size ? @actions_per_context[i-1]['total'] : "n/a"%>
<%= i <= @actions_per_context.size ? @actions_per_context[i-1]['total'] : t('common.not_available_abbr')%>
)
<br/><%
end
-%>
-%>
</div>
<div class="stats_module">
@ -25,9 +25,9 @@
%><%=i-%> -
<%= i <= @running_actions_per_context.size ? link_to(@running_actions_per_context[i-1]['name'], {:controller => "contexts", :action => "show", :id => @running_actions_per_context[i-1]['id']}) : "n/a"-%>
(
<%= i <= @running_actions_per_context.size ? @running_actions_per_context[i-1]['total'] : "n/a"-%>
<%= i <= @running_actions_per_context.size ? @running_actions_per_context[i-1]['total'] : t('common.not_available_abbr')-%>
)
<br/><%
end
-%>
-%>
</div>

View file

@ -7,7 +7,7 @@
<% end
if i < 10
i.upto 10 do |j| -%>
<%= i -%> - n/a (n/a) <br/>
<%= i -%> - <%=t('common.not_available_abbr')%> (<%=t('common.not_available_abbr')%>) <br/>
<% end
end
-%>
@ -22,7 +22,7 @@
<% end
if i < 10
i.upto 10 do |j| -%>
<%= i -%> - n/a (n/a) <br/>
<%= i -%> - <%=t('common.not_available_abbr')%> (<%=t('common.not_available_abbr')%>) <br/>
<% end
end
-%>

View file

@ -7,12 +7,12 @@
t('stats.no_tags_available')
else
@tags_for_cloud.each do |t| %>
<%= link_to t.name,
{:controller => "todos", :action => "tag", :id => t.name},
<%= link_to t.name,
{:controller => "todos", :action => "tag", :id => t.name},
{:style => "font-size: " + (9 + 2*(t.count.to_i-@tags_min)/@tags_divisor).to_s + "pt",
:title => t.count.to_s+" actions"}
:title => t.count.to_s+" #{t('common.actions_midsentence')}"}
-%> <%
end
end
end-%>
</p>
</div>
@ -25,12 +25,12 @@
t('stats.no_tags_available')
else
@tags_for_cloud_90days.each do |t| %>
<%= link_to t.name,
{:controller => "todos", :action => "tag", :id => t.name},
<%= link_to t.name,
{:controller => "todos", :action => "tag", :id => t.name},
{:style => "font-size: " + (9 + 2*(t.count.to_i-@tags_min_90days)/@tags_divisor_90days).to_s + "pt",
:title => t.count.to_s+" actions"}
:title => t.count.to_s+" #{t('common.actions_midsentence')}"}
-%> <%
end
end
end-%>
</p>
</div>

View file

@ -1,6 +1,6 @@
<%-
time_labels = Array.new(@count){ |i| "#{i}-#{i+1}" }
time_labels[0] = "within 1"
time_labels[0] = t('stats.within_one')
time_labels[@count] = "> #{@count}"
-%>
&title=<%= t('stats.action_completion_time_title') %>,{font-size:16},&

View file

@ -6,7 +6,7 @@
&filled_bar_2=50,0x0066CC,0x0066CC,<%= t('stats.labels.completed') %>,8&
&values=<%= @actions_creation_day_array.join(",") %>&
&values_2=<%= @actions_completion_day_array.join(",") %>&
&x_labels=<%= Date::DAYNAMES.join(",") %>&
&x_labels=<%= t('date.day_names').join(",") %>&
&y_min=0&
<%
# add one to @max for people who have no actions completed yet.

View file

@ -6,7 +6,7 @@
&filled_bar_2=50,0x0066CC,0x0066CC,<%= t('stats.labels.completed') %>,8&
&values=<%= @actions_creation_day_array.join(",") %>&
&values_2=<%= @actions_completion_day_array.join(",") %>&
&x_labels=<%= Date::DAYNAMES.join(",") %>&
&x_labels=<%= t('date.day_names').join(",") %>&
&y_min=0&
<%
# add one to @max for people who have no actions completed yet.

View file

@ -2,7 +2,7 @@
url_array = Array.new(13){ |i| url_for :controller => 'stats', :action => 'actions_done_last_years'}
created_count_array = Array.new(13){ |i| @actions_created_last12months.count/12.0 }
done_count_array = Array.new(13){ |i| @actions_done_last12months.count/12.0 }
month_names = Array.new(13){ |i| Date::MONTHNAMES[ (Time.now.mon - i -1 ) % 12 + 1 ]}
month_names = Array.new(13){ |i| t('date.month_names')[ (Time.now.mon - i -1 ) % 12 + 1 ]}
-%>
&title=<%= t('stats.actions_lastyear_title') %>,{font-size:16},&
&y_legend=<%= t('stats.legend.number_of_actions') %>,12,0x736AFF&

View file

@ -1,6 +1,7 @@
<%-
created_count_array = Array.new(30){ |i| @actions_created_last30days.count/30.0 }
done_count_array = Array.new(30){ |i| @actions_done_last30days.count/30.0 }
# TODO: make the strftime i18n proof
time_labels = Array.new(30){ |i| (Time.zone.now-i.days).strftime("%a %d-%m") }
-%>
&title=<%= t('stats.actions_30days_title') %>,{font-size:16},&

View file

@ -1,7 +1,7 @@
<%-
created_count_array = Array.new(@month_count+1){ |i| @actions_created_last_months.count/@month_count }
done_count_array = Array.new(@month_count+1){ |i| @actions_done_last_months.count/@month_count }
month_names = Array.new(@month_count+1){ |i| Date::MONTHNAMES[ (Time.now.mon - i -1 ) % 12 + 1 ]+ " " + (Time.now - i.months).year.to_s}
month_names = Array.new(@month_count+1){ |i| t('date.month_names')[ (Time.now.mon - i -1 ) % 12 + 1 ]+ " " + (Time.now - i.months).year.to_s}
-%>
&title=<%= t('stats.actions_last_year') %>,{font-size:16},&
&y_legend=<%= t('stats.actions_last_year_legend.number_of_actions') %>,12,0x736AFF&

View file

@ -144,6 +144,7 @@ en:
search: Search
ajaxError: There was an error retrieving from server
days_midsentence: days
not_available_abbr: "n/a"
data:
import_successful: Import was successful.
import_errors: Some errors occurred during import
@ -243,6 +244,7 @@ en:
other: "%{count} errors prohibited this %{model} from being saved"
stats:
index_title: TRACKS::Statistics
within_one: Within 1
tag_cloud_title: Tag cloud for all actions
tag_cloud_description: This tag cloud includes tags of all actions (completed, not completed, visible and/or hidden)
tag_cloud_90days_title: Tag cloud actions in past 90 days

File diff suppressed because it is too large Load diff