diff --git a/app/views/rb_burndown_charts/_burndown.html.erb b/app/views/rb_burndown_charts/_burndown.html.erb index cedca0861c..0427adf659 100644 --- a/app/views/rb_burndown_charts/_burndown.html.erb +++ b/app/views/rb_burndown_charts/_burndown.html.erb @@ -33,7 +33,7 @@ chart: null, dataset_position: {<%= chart.series.enum_for(:each_with_index).collect{|s, i| "#{s.name}: #{i}"}.join(', ') %>}, datasets: [<%= chart.series.collect{|s| "[#{s.join(',')}]"}.join(', ') %>], - series: [<%= chart.series.collect{|s| "{ label: '#{escape_javascript(l(s.name))}', yaxis: 'y#{s.unit == :points ? '' : '2'}axis' }"}.join(',') %>], + series: [<%= chart.series.collect{|s| "{ label: '#{escape_javascript(l('backlogs.' + s.name.to_s))}', yaxis: 'y#{s.unit == :points ? '' : '2'}axis' }"}.join(',') %>], xticks: [<%= chart.days.enum_for(:each_with_index).collect{|d,i| "[#{i+1}, '#{escape_javascript(::I18n.t('date.abbr_day_names')[d.wday % 7])}']"}.join(',') %>], // add a little clearance to the chart diff --git a/app/views/rb_burndown_charts/show.html.erb b/app/views/rb_burndown_charts/show.html.erb index 00eb592f98..cae83f8d02 100644 --- a/app/views/rb_burndown_charts/show.html.erb +++ b/app/views/rb_burndown_charts/show.html.erb @@ -1,14 +1,14 @@ <% if @burndown %> <%= render :partial => 'burndown', :locals => {:div => 'burndown_', :burndown => @burndown } %> -
Generating chart...
+
<%=l('backlogs.generating_chart')%>
- <%= l(:label_chart_options) %> + <%= l('backlogs.chart_options') %> <% @burndown.series(:all).each do |series| %> - <%= l(series.name) %>
+ <%= l('backlogs.' + series.name.to_s) %>
<% end %>
<% else %> - No burndown data available -- are the sprint start- and end dates set? + <%= l('backlogs.no_burndown_data')%> <% end %> diff --git a/app/views/rb_server_variables/show.js.erb b/app/views/rb_server_variables/show.js.erb index 2141ccefde..abfa92d263 100644 --- a/app/views/rb_server_variables/show.js.erb +++ b/app/views/rb_server_variables/show.js.erb @@ -6,6 +6,12 @@ RB.constants = { form_authenticity_token: '<%= form_authenticity_token %>' }; +RB.i18n = { + generating_graph: '<%= l("backlogs.generating_chart") %>', + burndown_graph: '<%= l("backlogs.burndown_graph") %>' + +}; + RB.urlFor = (function () { var routes = { update_sprint: '<%= url_for(:controller => 'rb_sprints', :action => 'update', :sprint_id => ":id") %>', diff --git a/assets/javascripts/app/backlog.js b/assets/javascripts/app/backlog.js index 6d6dab9304..fd22954f8d 100644 --- a/assets/javascripts/app/backlog.js +++ b/assets/javascripts/app/backlog.js @@ -136,7 +136,7 @@ RB.Backlog = (function ($) { if ($("#charts").length === 0) { $('
').appendTo("body"); } - $('#charts').html("
Loading data...
"); + $('#charts').html("
" + RB.i18n['generating_graph'] + "
"); $('#charts').load(RB.urlFor('show_burndown_chart', { id: backlogs.getSprint().data('this').getID(), project_id: RB.constants['project_id']})); $('#charts').dialog({ @@ -147,7 +147,7 @@ RB.Backlog = (function ($) { }, height: 790, modal: true, - title: 'Charts', + title: RB.i18n['burndown_graph'], width: 710 }); } diff --git a/assets/javascripts/app/show_main.js b/assets/javascripts/app/show_main.js index 26ed1d6694..b657960431 100644 --- a/assets/javascripts/app/show_main.js +++ b/assets/javascripts/app/show_main.js @@ -11,7 +11,7 @@ jQuery(function ($) { if ($("#charts").length === 0) { $("
").appendTo("body"); } - $('#charts').html("
Loading data...
"); + $('#charts').html("
" + RB.i18n['generating_graph'] + "
"); $('#charts').load(RB.urlFor('show_burndown_chart', {id: RB.constants.sprint_id})); $('#charts').dialog({ buttons: { @@ -20,7 +20,7 @@ jQuery(function ($) { } }, modal: true, - title: 'Charts', + title: RB.i18n['burndown_graph'], height: 790, width: 710 }); diff --git a/config/locales/de.yml b/config/locales/de.yml index c835b26d33..fa6977a1c5 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -99,6 +99,14 @@ de: backlogs: show_statistics: "Scrum Statistiken anzeigen" show_burndown_chart: "Burndown-Chart" + generating_chart: "Generiere Graph..." + chart_options: "Graphen-Optionen" + remaining_hours: "Verbleibende Stunden" + remaining_hours_ideal: "Verbleibende Stunden (ideal)" + story_points: "Story Points" + story_points_ideal: "Story Points (ideal)" + no_burndown_data: "Keine Burndown Graphen verfügbar. Start- und Enddaten der Sprints müssen definiert sein." + burndown_graph: "Burndown Graph" add_new_story: "Neue Story" column_with: "Spaltenbreite:" impediment: "Hindernis" diff --git a/config/locales/en.yml b/config/locales/en.yml index fd97195086..1076f18da7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -99,6 +99,14 @@ en: backlogs: show_statistics: "Show Scrum statistics" show_burndown_chart: "Burndown Chart" + generating_chart: "Generating Graph..." + chart_options: "Chart-Options" + remaining_hours: "Remaining hours" + remaining_hours_ideal: "Remaining hours (ideal)" + story_points: "Story Points" + story_points_ideal: "Story Points (ideal)" + no_burndown_data: "No burndown data available. It is necessary to have the sprint start- and end dates set." + burndown_graph: "Burndown Graph" add_new_story: "New Story" column_with: "Column width:" impediment: "Impediment"