diff --git a/app/views/cost_objects/_form.rhtml b/app/views/cost_objects/_form.rhtml index c9e06228d5..d56a0716af 100644 --- a/app/views/cost_objects/_form.rhtml +++ b/app/views/cost_objects/_form.rhtml @@ -91,5 +91,5 @@ <%= javascript_include_tag 'subform', :plugin => 'redmine_costs' %> <%= javascript_include_tag 'editinplace', :plugin => 'redmine_costs' %> - <%= javascript_tag "initialize_editinplace('src=\"#{image_path('cancel.png')}\" value=\"#{l(:label_cancel)}\"' )" %> + <%= javascript_tag "initialize_editinplace('src=\"#{image_path('cancel.png')}\" alt=\"#{l(:button_cancel_edit_budget)}\" title=\"#{l(:button_cancel_edit_budget)}\"' )" %> <% end %> diff --git a/app/views/cost_objects/_labor_budget_item.rhtml b/app/views/cost_objects/_labor_budget_item.rhtml index 6aa01b0e64..53dee8fac5 100644 --- a/app/views/cost_objects/_labor_budget_item.rhtml +++ b/app/views/cost_objects/_labor_budget_item.rhtml @@ -1,7 +1,7 @@ -<%- - index ||= "INDEX" +<%- + index ||= "INDEX" new_or_existing = labor_budget_item.new_record? ? 'new' : 'existing' - id_or_index = labor_budget_item.new_record? ? index : labor_budget_item.id + id_or_index = labor_budget_item.new_record? ? index : labor_budget_item.id prefix = "cost_object[#{new_or_existing}_labor_budget_item_attributes][]" id_prefix = "cost_object_#{new_or_existing}_labor_budget_item_attributes_#{id_or_index}" name_prefix = "cost_object[#{new_or_existing}_labor_budget_item_attributes][#{id_or_index}]" @@ -9,7 +9,7 @@ @labor_budget_item = labor_budget_item error_messages = error_messages_for 'labor_budget_item' --%> +-%> <% unless error_messages.blank? %><%= error_messages %><% end %> <% fields_for prefix, labor_budget_item do |cost_form| %> @@ -35,7 +35,7 @@ <%= observe_field( "#{id_prefix}_hours", :frequency => 1, :url => {:action => :update_labor_budget_item, :project_id => @project.id}, :with => "'user_id=' + encodeURIComponent(document.getElementById('#{id_prefix}_user_id').value) + '&hours=' + encodeURIComponent(value) + '&fixed_date=' + encodeURIComponent(document.getElementById('cost_object_fixed_date').value) + '&element_id=#{id_prefix}'") %> - <%= link_to_function image_tag('delete.png'), "deleteLaborBudgetItem('#{id_prefix}')" %> + <%= link_to_function image_tag('delete.png', :alt => l(:button_delete), :title => l(:button_delete)), "deleteLaborBudgetItem('#{id_prefix}')" %> <% end %> diff --git a/app/views/cost_objects/_material_budget_item.rhtml b/app/views/cost_objects/_material_budget_item.rhtml index fd7f62b6db..4af47e5084 100644 --- a/app/views/cost_objects/_material_budget_item.rhtml +++ b/app/views/cost_objects/_material_budget_item.rhtml @@ -1,15 +1,15 @@ -<%- - index ||= "INDEX" +<%- + index ||= "INDEX" new_or_existing = material_budget_item.new_record? ? 'new' : 'existing' - id_or_index = material_budget_item.new_record? ? index : material_budget_item.id + id_or_index = material_budget_item.new_record? ? index : material_budget_item.id prefix = "cost_object[#{new_or_existing}_material_budget_item_attributes][]" id_prefix = "cost_object_#{new_or_existing}_material_budget_item_attributes_#{id_or_index}" name_prefix = "cost_object[#{new_or_existing}_material_budget_item_attributes][#{id_or_index}]" classes ||= "" - + @material_budget_item = material_budget_item error_messages = error_messages_for 'material_budget_item' --%> +-%> <% unless error_messages.blank? %><%= error_messages %><% end %> <% fields_for prefix, material_budget_item do |cost_form| %> @@ -38,8 +38,8 @@ end %> - <%= link_to_function image_tag('delete.png'), "deleteMaterialBudgetItem('#{id_prefix}')" %> + <%= link_to_function image_tag('delete.png', :alt => l(:button_delete), :title => l(:button_delete)), "deleteMaterialBudgetItem('#{id_prefix}')" %> <% end %> - \ No newline at end of file + diff --git a/app/views/cost_types/_rate.rhtml b/app/views/cost_types/_rate.rhtml index 32077cbb93..cbf656cc03 100644 --- a/app/views/cost_types/_rate.rhtml +++ b/app/views/cost_types/_rate.rhtml @@ -1,7 +1,7 @@ -<%- - index ||= "INDEX" +<%- + index ||= "INDEX" new_or_existing = rate.new_record? ? 'new' : 'existing' - id_or_index = rate.new_record? ? index : rate.id + id_or_index = rate.new_record? ? index : rate.id prefix = "cost_type[#{new_or_existing}_rate_attributes][]" id_prefix = "cost_type_#{new_or_existing}_rate_attributes_#{id_or_index}" name_prefix = "cost_type[#{new_or_existing}_rate_attributes][#{id_or_index}]" @@ -9,7 +9,7 @@ @rate = rate error_messages = error_messages_for 'rate' --%> +-%> <% unless error_messages.blank? %><%= error_messages %><% end %> @@ -17,6 +17,6 @@ <%= rate_form.text_field :valid_from, :size => 10, :class => 'date', :index => id_or_index %><%= calendar_for("#{id_prefix}_valid_from") %> <%= rate_form.text_field :rate, :size => 7, :index => id_or_index, :value => rate.rate ? rate.rate.round(2) : "" %> <%= Setting.plugin_redmine_costs['costs_currency'] %> - <%= image_to_function 'delete.png', "var e = $('#{id_prefix}');parent=e.up();e.remove();recalculate_even_odd(parent)"%> + <%= image_to_function 'delete.png', "var e = $('#{id_prefix}');parent=e.up();e.remove();recalculate_even_odd(parent)", {:alt => l(:button_delete), :title => l(:button_delete)}%> -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/hourly_rates/_list_default.rhtml b/app/views/hourly_rates/_list_default.rhtml index 2b10a4c16d..f256edfa88 100644 --- a/app/views/hourly_rates/_list_default.rhtml +++ b/app/views/hourly_rates/_list_default.rhtml @@ -17,7 +17,7 @@ <%= rate.valid_from %> <%= number_to_currency(rate.rate) %> - <%= rate == current_rate ? image_tag('true.png') : "" %> + <%= rate == current_rate ? image_tag('true.png', :alt => l(:general_text_Yes)) : "" %> <%- end -%> diff --git a/app/views/hourly_rates/_list_project.rhtml b/app/views/hourly_rates/_list_project.rhtml index 663d3054ac..31d6b866c3 100644 --- a/app/views/hourly_rates/_list_project.rhtml +++ b/app/views/hourly_rates/_list_project.rhtml @@ -1,7 +1,7 @@ <% rates = @rates unless rates project = @project unless project - + current_rate = @user.current_rate(project) %> @@ -26,9 +26,9 @@ <%= rate.valid_from %> <%= number_to_currency(rate.rate) %> - <%= rate == current_rate ? image_tag('true.png') : "" %> + <%= rate == current_rate ? image_tag('true.png', :alt => l(:general_text_Yes)) : "" %> <%- end -%> -<% end %> \ No newline at end of file +<% end %> diff --git a/config/locales/de.yml b/config/locales/de.yml index 9a5cfeca28..335cfe7baf 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -161,3 +161,4 @@ de: caption_save_rate: "Satz speichern" caption_locked_on: "Gesperrt am" caption_show_locked: "Gesperrte Typen anzeigen" + button_cancel_edit_budget: "Budget bearbeiten abbrechen" diff --git a/config/locales/en.yml b/config/locales/en.yml index 1a8b730a97..2488320de3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -159,3 +159,4 @@ en: caption_save_rate: "Save rate" caption_locked_on: "Locked on" caption_show_locked: "Show locked types" + button_cancel_edit_budget: "Cancel editing budget"