diff --git a/app/views/cost_objects/_edit.html.erb b/app/views/cost_objects/_edit.html.erb index c16d9c4d3b..4bdedf520c 100644 --- a/app/views/cost_objects/_edit.html.erb +++ b/app/views/cost_objects/_edit.html.erb @@ -29,5 +29,5 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<%= l(:label_attachment_plural )%>

<%= render :partial => 'attachments/form' %>

- <%= submit_tag l(:button_submit), class: 'button -highlight' %> + <%= styled_button_tag l(:button_submit), class: '-with-icon icon-yes' %> <% end %> diff --git a/app/views/cost_objects/new.html.erb b/app/views/cost_objects/new.html.erb index 78f8449c1b..9a89aef972 100644 --- a/app/views/cost_objects/new.html.erb +++ b/app/views/cost_objects/new.html.erb @@ -29,8 +29,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. :html => {:multipart => true, :id => 'cost_object_form'} do |f| %> <%= error_messages_for 'cost_object' %> <%= render :partial => 'form', :locals => {:f => f} %> - <%= submit_tag l(:button_create), class: 'button -highlight' %> - <%= submit_tag l(:button_create_and_continue), :name => 'continue', + <%= styled_button_tag l(:button_create), class: '-with-icon icon-yes' %> + <%= styled_button_tag l(:button_create_and_continue), :name => 'continue', class: 'button -highlight'%> <%= javascript_tag "Form.Element.focus('cost_object_subject');" %> diff --git a/app/views/cost_types/edit.html.erb b/app/views/cost_types/edit.html.erb index 4f76beff80..ecf9db29eb 100644 --- a/app/views/cost_types/edit.html.erb +++ b/app/views/cost_types/edit.html.erb @@ -73,7 +73,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= link_to_function l(:button_add_rate), "addRate($('add_rate_date'))", {:class => "button icon icon-add"} %>
- <%= submit_tag l(:button_save), class: 'button -highlight' %> + <%= styled_button_tag l(:button_save), class: '-with-icon icon-yes' %> <% end %> diff --git a/app/views/cost_types/index.html.erb b/app/views/cost_types/index.html.erb index 29624e0fce..6afe87a64b 100644 --- a/app/views/cost_types/index.html.erb +++ b/app/views/cost_types/index.html.erb @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= render :partial => 'shared/costs_header' %> -<% html_title l(:cost_types_title) %> +<% html_title l(:label_cost_type_plural) %> <%= toolbar title: CostType.model_name.human(count: 2) do %>
  • <%= link_to new_cost_type_path, class: 'button -alt-highlight' do%> @@ -47,13 +47,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. { :update => "content", :with => "Form.serialize('query_form')", :method => :get - }, :class => 'button -highlight' %> + }, :class => 'button -with-icon icon-yes' %> <%= link_to_remote l(:button_clear), { :url => { :clear_filter => true }, :method => :get, :update => "content", - }, :class => 'button' %> + }, :class => 'button icon-context icon-undo' %> <% end %> - <%= submit_tag l(:button_apply), :name => nil, class: 'button -highlight' %> + <%= styled_button_tag l(:button_apply), class: '-with-icon icon-yes' %> diff --git a/app/views/costlog/edit.html.erb b/app/views/costlog/edit.html.erb index 910baf0f78..7248dc6937 100644 --- a/app/views/costlog/edit.html.erb +++ b/app/views/costlog/edit.html.erb @@ -100,7 +100,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - <%= submit_tag l(:button_save), class: 'button -highlight' %> + <%= styled_button_tag l(:button_save), class: '-with-icon icon-yes' %> <% end %> <% content_for :header_tags do %> diff --git a/app/views/hourly_rates/edit.html.erb b/app/views/hourly_rates/edit.html.erb index f14ea5f15f..c4700976bb 100644 --- a/app/views/hourly_rates/edit.html.erb +++ b/app/views/hourly_rates/edit.html.erb @@ -56,5 +56,5 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= link_to_function l(:button_add_rate), "addRate($('add_rate_date'))", {:class => "button icon icon-add"} %> -
    <%= submit_tag l(:button_save), class: 'button -highlight' %>
    +
    <%= styled_button_tag l(:button_save), class: '-with-icon icon-yes' %>
    <% end %> diff --git a/config/locales/de.yml b/config/locales/de.yml index 41e60de2e0..2a1ba8c940 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -104,7 +104,6 @@ de: caption_set_rate: "Aktuellen Satz festlegen" caption_show_locked: "Gesperrte Typen anzeigen" cost_objects_title: "Budgets" - cost_types_title: "Kostenarten" currency_delimiter: "." currency_separator: "," diff --git a/config/locales/en.yml b/config/locales/en.yml index 126652bcaf..d36d94364c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -22,7 +22,6 @@ en: activerecord: attributes: cost_entry: - work_package: "WorkPackage" work_package: "Work package" overridden_costs: "Overridden costs" spent: "Spent" @@ -32,17 +31,17 @@ en: available: "Available" budget: "Planned" budget_ratio: "Spent (ratio)" - created_on: "Created On" + created_on: "Created on" description: "Description" fixed_date: "Fixed date" spent: "Spent" status: "Status" subject: "Subject" type: "Cost type" - updated_on: "Updated On" + updated_on: "Updated on" cost_type: - unit: "Unit Name" - unit_plural: "Pluralized Unit Name" + unit: "Unit name" + unit_plural: "Pluralized unit name" work_package: cost_object_subject: "Budget title" labor_costs: "Labor costs" @@ -55,8 +54,8 @@ en: user: default_rates: "Default rates" variable_cost_object: - labor_budget: "Planned Labor Costs" - material_budget: "Planned Unit Costs" + labor_budget: "Planned labor costs" + material_budget: "Planned unit costs" models: cost_object: "Budget" cost_type: @@ -80,8 +79,8 @@ en: units: "Units" valid_from: "Valid from" - button_add_budget_item: "Add Planned Costs" - button_add_cost_object: "Add Budget" + button_add_budget_item: "Add planned costs" + button_add_cost_object: "Add budget" button_add_cost_type: "Add cost type" button_add_rate: "Add rate" button_cancel_edit_budget: "Cancel editing budget" @@ -89,22 +88,22 @@ en: button_log_costs: "Log unit costs" button_log_time: "Log time" - caption_booked_on_project: "Booked on Project" + caption_booked_on_project: "Booked on project" caption_default: "Default" - caption_default_rate_history_for: "Default Rate History for %{user}" + caption_default_rate_history_for: "Default rate history for %{user}" caption_labor: "Labor" - caption_labor_costs: "Actual Labor Costs" + caption_labor_costs: "Actual labor costs" caption_locked_on: "Locked on" - caption_material_costs: "Actual Unit Costs" + caption_material_costs: "Actual unit costs" caption_materials: "Units" - caption_rate_history: "Rate History" - caption_rate_history_for: "Rate History for %{user}" - caption_rate_history_for_project: "Rate History for %{user} in Project %{project}" + caption_rate_history: "Rate history" + caption_rate_history_for: "Rate history for %{user}" + caption_rate_history_for_project: "Rate history for %{user} in project %{project}" caption_save_rate: "Save rate" - caption_set_rate: "Set Current Rate" + caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" cost_objects_title: "Budgets" - cost_types_title: "Cost Types" + label_cost_type_plural: "Cost types" currency_delimiter: "," currency_separator: "." @@ -124,18 +123,18 @@ en: label_costlog: "Logged unit costs" label_cost_object: "Budget" label_cost_object_id: "Budget #%{id}" - label_cost_object_new: "New Budget" + label_cost_object_new: "New budget" label_cost_object_plural: "Budgets" label_cost_plural: "Costs" - label_cost_report: "Cost Report" + label_cost_report: "Cost report" label_cost_type_specific: "Budget #%{id}: %{name}" - label_cost_type_plural: "Cost Types" + label_cost_type_plural: "Cost types" label_costs_per_page: "Costs per page" label_currency: "Currency" label_currency_format: "Format of currency" label_current_default_rate: "Current default rate" label_date_on: "on" - label_deleted_cost_types: "Deleted Cost Types" + label_deleted_cost_types: "Deleted cost types" label_deliverable: "Budget" label_display_cost_entries: "Display unit costs" label_display_time_entries: "Display reported hours" @@ -143,7 +142,7 @@ en: label_edit: "Edit" label_fixed_cost_object: "Fixed budget" label_fixed_date: "Fixed date" - label_generic_user: "Generic User" + label_generic_user: "Generic user" label_greater_or_equal: ">=" label_group_by: "Group by" label_group_by_add: "Add grouping field" @@ -164,7 +163,7 @@ en: label_until: "until" label_valid_from: "Valid from" label_variable_cost_object: "Variable rate based budget" - label_view_all_cost_objects: "View all Budgets" + label_view_all_cost_objects: "View all budgets" label_yes: "Yes" notice_cost_object_conflict: "WorkPackages must be of the same project." @@ -173,7 +172,7 @@ en: notice_successful_restore: "Successful restore." permission_edit_cost_entries: "Edit booked unit costs" - permission_edit_cost_objects: "Edit Budgets" + permission_edit_cost_objects: "Edit budgets" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" permission_edit_own_hourly_rate: "Edit own hourly rates" @@ -181,13 +180,13 @@ en: permission_log_costs: "Book unit costs" permission_log_own_costs: "Book unit costs for oneself" permission_view_cost_entries: "View booked costs" - permission_view_cost_objects: "View Budgets" + permission_view_cost_objects: "View budgets" permission_view_cost_rates: "View cost rates" permission_view_hourly_rates: "View all hourly rates" permission_view_own_cost_entries: "View own booked costs" permission_view_own_hourly_rate: "View own hourly rate" permission_view_own_time_entries: "View own spent time" - project_module_costs_module: "Cost Control" + project_module_costs_module: "Cost control" text_assign_time_and_cost_entries_to_project: "Assign reported hours and costs to the project" text_cost_object_change_type_confirmation: "Are you sure? This operation will destroy information of the specific budget type." @@ -200,8 +199,8 @@ en: week: "week" x_entries: - one: "1 Entry" - other: "%{count} Entries" + one: "1 entry" + other: "%{count} entries" js: text_are_you_sure: "Are you sure?" diff --git a/lib/open_project/costs/engine.rb b/lib/open_project/costs/engine.rb index 08759e9fec..563b60e7a5 100644 --- a/lib/open_project/costs/engine.rb +++ b/lib/open_project/costs/engine.rb @@ -69,7 +69,7 @@ module OpenProject::Costs :cost_types, { controller: '/cost_types', action: 'index' }, html: { class: 'icon2 icon-tracker' }, - caption: :cost_types_title + caption: :label_cost_type_plural menu :project_menu, :cost_objects,