TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #144 from oliverguenther/fix/consistent_sentence_case

Browse Source 
Consistent costs case
pull/6827/head
ulferts 9 years ago
parent 9c2bcc0560 2f88f777d4
commit 35a175c96d
4 changed files with 30 additions and 32 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      app/views/cost_types/index.html.erb
  2. 1
      config/locales/de.yml
  3. 57
      config/locales/en.yml
  4. 2
      lib/open_project/costs/engine.rb

2
app/views/cost_types/index.html.erb
Unescape View File

@ -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 %>
<li class="toolbar-item">
<%= link_to new_cost_type_path, class: 'button -alt-highlight' do%>

1
config/locales/de.yml
Unescape View File

@ -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: ","

57
config/locales/en.yml
Unescape View File

@ -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?"

2
lib/open_project/costs/engine.rb
Unescape View File

@ -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,

Write Preview
Loading…
Cancel
Save