diff --git a/app/assets/stylesheets/costs/costs_legacy.css b/app/assets/stylesheets/costs/costs_legacy.css index 6604512447..439d5e96c6 100644 --- a/app/assets/stylesheets/costs/costs_legacy.css +++ b/app/assets/stylesheets/costs/costs_legacy.css @@ -98,10 +98,6 @@ td.comment input { cursor: pointer; } -.budget-table--fieldset{ - margin: 8px 2px; -} - .cost_entry td{ vertical-align: top; padding: 6px 6px; diff --git a/app/controllers/cost_objects_controller.rb b/app/controllers/cost_objects_controller.rb index 81aaea2b60..5b6a0c94c1 100644 --- a/app/controllers/cost_objects_controller.rb +++ b/app/controllers/cost_objects_controller.rb @@ -129,7 +129,7 @@ class CostObjectsController < ApplicationController Attachment.attach_files(@cost_object, params[:attachments]) render_attachment_warning_if_needed(@cost_object) - flash[:notice] = l(:notice_successful_create) + flash[:notice] = t(:notice_successful_create) redirect_to(params[:continue] ? { action: 'new' } : { action: 'show', id: @cost_object }) return @@ -158,19 +158,19 @@ class CostObjectsController < ApplicationController Attachment.attach_files(@cost_object, params[:attachments]) render_attachment_warning_if_needed(@cost_object) - flash[:notice] = l(:notice_successful_update) + flash[:notice] = t(:notice_successful_update) redirect_to(params[:back_to] || { action: 'show', id: @cost_object }) else render action: 'edit' end rescue ActiveRecord::StaleObjectError # Optimistic locking exception - flash.now[:error] = l(:notice_locking_conflict) + flash.now[:error] = t(:notice_locking_conflict) end def destroy @cost_objects.each(&:destroy) - flash[:notice] = l(:notice_successful_delete) + flash[:notice] = t(:notice_successful_delete) redirect_to action: 'index', project_id: @project end diff --git a/app/controllers/cost_types_controller.rb b/app/controllers/cost_types_controller.rb index a7cefdfeb5..c0988ad16a 100644 --- a/app/controllers/cost_types_controller.rb +++ b/app/controllers/cost_types_controller.rb @@ -56,14 +56,14 @@ class CostTypesController < ApplicationController @cost_type.attributes = permitted_params.cost_type if @cost_type.save - flash[:notice] = l(:notice_successful_update) + flash[:notice] = t(:notice_successful_update) redirect_back_or_default(action: 'index') else render action: 'edit', layout: !request.xhr? end rescue ActiveRecord::StaleObjectError # Optimistic locking exception - flash.now[:error] = l(:notice_locking_conflict) + flash.now[:error] = t(:notice_locking_conflict) end def new @@ -78,7 +78,7 @@ class CostTypesController < ApplicationController @cost_type = CostType.new(permitted_params.cost_type) if @cost_type.save - flash[:notice] = l(:notice_successful_update) + flash[:notice] = t(:notice_successful_update) redirect_back_or_default(action: 'index') else @cost_type.rates.build(valid_from: Date.today) if @cost_type.rates.empty? @@ -86,7 +86,7 @@ class CostTypesController < ApplicationController end rescue ActiveRecord::StaleObjectError # Optimistic locking exception - flash.now[:error] = l(:notice_locking_conflict) + flash.now[:error] = t(:notice_locking_conflict) end def destroy @@ -94,7 +94,7 @@ class CostTypesController < ApplicationController @cost_type.default = false if @cost_type.save - flash[:notice] = l(:notice_successful_lock) + flash[:notice] = t(:notice_successful_lock) redirect_back_or_default(action: 'index') end @@ -105,7 +105,7 @@ class CostTypesController < ApplicationController @cost_type.default = false if @cost_type.save - flash[:notice] = l(:notice_successful_restore) + flash[:notice] = t(:notice_successful_restore) redirect_back_or_default(action: 'index') end @@ -122,11 +122,11 @@ class CostTypesController < ApplicationController rate.rate = clean_currency(params[:rate]) if rate.save - flash[:notice] = l(:notice_successful_update) + flash[:notice] = t(:notice_successful_update) redirect_to action: 'index' else # FIXME: Do some real error handling here - flash[:error] = l(:notice_something_wrong) + flash[:error] = t(:notice_something_wrong) redirect_to action: 'index' end end diff --git a/app/controllers/costlog_controller.rb b/app/controllers/costlog_controller.rb index e3aec77c0c..255661db77 100644 --- a/app/controllers/costlog_controller.rb +++ b/app/controllers/costlog_controller.rb @@ -96,7 +96,7 @@ class CostlogController < ApplicationController elsif @cost_entry.save - flash[:notice] = l(:notice_cost_logged_successfully) + flash[:notice] = t(:notice_cost_logged_successfully) redirect_back_or_default action: 'index', project_id: @cost_entry.project else @@ -113,7 +113,7 @@ class CostlogController < ApplicationController elsif @cost_entry.save - flash[:notice] = l(:notice_successful_update) + flash[:notice] = t(:notice_successful_update) redirect_back_or_default action: 'index', project_id: @cost_entry.project else @@ -126,7 +126,7 @@ class CostlogController < ApplicationController render_404 and return unless @cost_entry render_403 and return unless @cost_entry.editable_by?(User.current) @cost_entry.destroy - flash[:notice] = l(:notice_successful_delete) + flash[:notice] = t(:notice_successful_delete) if request.referer =~ /cost_reports/ redirect_to controller: '/cost_reports', action: :index diff --git a/app/controllers/hourly_rates_controller.rb b/app/controllers/hourly_rates_controller.rb index f6e1d41956..6f49d0b40d 100644 --- a/app/controllers/hourly_rates_controller.rb +++ b/app/controllers/hourly_rates_controller.rb @@ -89,7 +89,7 @@ class HourlyRatesController < ApplicationController end if @user.save - flash[:notice] = l(:notice_successful_update) + flash[:notice] = t(:notice_successful_update) if @project.nil? redirect_back_or_default(controller: 'users', action: 'edit', id: @user) else @@ -126,7 +126,7 @@ class HourlyRatesController < ApplicationController page.replace_html "rate_for_#{@user.id}", link_to(number_to_currency(rate.rate), action: 'edit', id: @user, project_id: @project) end else - flash[:notice] = l(:notice_successful_update) + flash[:notice] = t(:notice_successful_update) redirect_to action: 'index' end end diff --git a/app/helpers/cost_objects_helper.rb b/app/helpers/cost_objects_helper.rb index e53116ad86..0a876458b6 100644 --- a/app/helpers/cost_objects_helper.rb +++ b/app/helpers/cost_objects_helper.rb @@ -29,7 +29,7 @@ module CostObjectsHelper end def cost_objects_to_csv(cost_objects) - CSV.generate(col_sep: l(:general_csv_separator)) do |csv| + CSV.generate(col_sep: t(:general_csv_separator)) do |csv| # csv header fields headers = ['#', Project.model_name.human, diff --git a/app/helpers/costlog_helper.rb b/app/helpers/costlog_helper.rb index 9f560b570a..6ae9e20dec 100644 --- a/app/helpers/costlog_helper.rb +++ b/app/helpers/costlog_helper.rb @@ -22,7 +22,7 @@ module CostlogHelper def render_costlog_breadcrumb links = [] - links << link_to(l(:label_project_all), project_id: nil, work_package_id: nil) + links << link_to(t(:label_project_all), project_id: nil, work_package_id: nil) links << link_to(h(@project), project_id: @project, work_package_id: nil) if @project links << link_to_work_package(@work_package, subject: false) if @work_package breadcrumb links @@ -36,7 +36,7 @@ module CostlogHelper cost_types.sort end collection = [] - collection << ["--- #{l(:actionview_instancetag_blank_option)} ---", ''] unless cost_types.detect(&:is_default?) + collection << ["--- #{t(:actionview_instancetag_blank_option)} ---", ''] unless cost_types.detect(&:is_default?) cost_types.each do |t| collection << [t.name, t.id] end collection end @@ -65,7 +65,7 @@ module CostlogHelper return nil if value.nil? || value == '' value = value.strip - value.gsub!(l(:currency_delimiter), '') if value.include?(l(:currency_delimiter)) && value.include?(l(:currency_separator)) + value.gsub!(t(:currency_delimiter), '') if value.include?(t(:currency_delimiter)) && value.include?(t(:currency_separator)) value.gsub(',', '.') BigDecimal.new(value) end diff --git a/app/models/activity/cost_object_activity_provider.rb b/app/models/activity/cost_object_activity_provider.rb index e0e6e7eff4..f552570a7d 100644 --- a/app/models/activity/cost_object_activity_provider.rb +++ b/app/models/activity/cost_object_activity_provider.rb @@ -33,7 +33,7 @@ class Activity::CostObjectActivityProvider < Activity::BaseActivityProvider end def event_title(event, _activity) - "#{l(:label_cost_object)} ##{event['journable_id']}: #{event['cost_object_subject']}" + "#{I18n.t(:label_cost_object)} ##{event['journable_id']}: #{event['cost_object_subject']}" end def event_path(event, _activity) diff --git a/app/models/cost_object.rb b/app/models/cost_object.rb index e8c39f79ab..cc813f7505 100644 --- a/app/models/cost_object.rb +++ b/app/models/cost_object.rb @@ -34,7 +34,7 @@ class CostObject < ActiveRecord::Base acts_as_journalized acts_as_event type: 'cost-objects', - title: Proc.new { |o| "#{l(:label_cost_object)} ##{o.id}: #{o.subject}" }, + title: Proc.new { |o| "#{I18n.t(:label_cost_object)} ##{o.id}: #{o.subject}" }, url: Proc.new { |o| { controller: 'cost_objects', action: 'show', id: o.id } } validates_presence_of :subject, :project, :author, :kind, :fixed_date @@ -116,7 +116,7 @@ class CostObject < ActiveRecord::Base # Label of the current type for display in GUI. Virtual accessor that is overriden by subclasses. def type_label - l(:label_cost_object) + I18n.t(:label_cost_object) end # Amount of the budget spent. Expressed as as a percentage whole number diff --git a/app/models/fixed_cost_object.rb b/app/models/fixed_cost_object.rb index 934c2f9c24..85b4641094 100644 --- a/app/models/fixed_cost_object.rb +++ b/app/models/fixed_cost_object.rb @@ -20,6 +20,6 @@ class FixedCostObject < CostObject # Label of the current type for display in GUI. def type_label - l(:label_fixed_cost_object) + I18n.t(:label_fixed_cost_object) end end diff --git a/app/models/rate.rb b/app/models/rate.rb index 8561cd6fa6..6978b0d826 100644 --- a/app/models/rate.rb +++ b/app/models/rate.rb @@ -32,7 +32,7 @@ class Rate < ActiveRecord::Base def self.clean_currency(value) if value && value.is_a?(String) value = value.strip - value.gsub!(l(:currency_delimiter), '') if value.include?(l(:currency_delimiter)) && value.include?(l(:currency_separator)) + value.gsub!(I18n.t(:currency_delimiter), '') if value.include?(I18n.t(:currency_delimiter)) && value.include?(I18n.t(:currency_separator)) value.gsub(',', '.') else value diff --git a/app/models/variable_cost_object.rb b/app/models/variable_cost_object.rb index 78ae169da7..f3963954f1 100644 --- a/app/models/variable_cost_object.rb +++ b/app/models/variable_cost_object.rb @@ -48,7 +48,7 @@ class VariableCostObject < CostObject # Label of the current cost_object type for display in GUI. def type_label - l(:label_variable_cost_object) + I18n.t(:label_variable_cost_object) end def material_budget diff --git a/app/views/cost_objects/_edit.html.erb b/app/views/cost_objects/_edit.html.erb index 645457029f..6b6582dfb9 100644 --- a/app/views/cost_objects/_edit.html.erb +++ b/app/views/cost_objects/_edit.html.erb @@ -26,8 +26,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. :class => 'form'} do |f| %> <%= error_messages_for 'cost_object' %> <%= render :partial => 'form', :locals => {:f => f} %> -
<%= l(:label_attachment_plural )%> +
<%= t(:label_attachment_plural )%>

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

- <%= styled_button_tag l(:button_submit), class: '-with-icon icon-checkmark -highlight', id: 'budget-table--submit-button'%> + <%= styled_button_tag t(:button_submit), class: '-with-icon icon-checkmark -highlight', id: 'budget-table--submit-button'%> <% end %> diff --git a/app/views/cost_objects/_form.html.erb b/app/views/cost_objects/_form.html.erb index 808557773c..b122a6317b 100644 --- a/app/views/cost_objects/_form.html.erb +++ b/app/views/cost_objects/_form.html.erb @@ -44,8 +44,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. //]]> -
- <%= VariableCostObject.human_attribute_name(:material_budget) %> +
+ <%= VariableCostObject.human_attribute_name(:material_budget) %>
@@ -87,6 +87,15 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + <% if User.current.allowed_to?(:view_cost_rates, @project)%> <%end%> - @@ -112,12 +120,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- <%= link_to_function l(:button_add_budget_item), "materialBudgetItemsForm.add()", {class: "button -with-icon icon-context icon-add"} %> + <%= link_to_function t(:button_add_budget_item), "materialBudgetItemsForm.add()", {class: "button -alt-highlight -with-icon icon-context icon-add"} %>
-
- <%= VariableCostObject.human_attribute_name(:labor_budget) %> +
+ <%= VariableCostObject.human_attribute_name(:labor_budget) %>
+
+
+ + <%= MaterialBudgetItem.human_attribute_name(:description) %> + +
+
+
@@ -98,7 +107,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -183,7 +191,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- <%= link_to_function l(:button_add_budget_item), "laborBudgetItemsForm.add()", {class: "button -with-icon icon-context icon-add"} %> + <%= link_to_function t(:button_add_budget_item), "laborBudgetItemsForm.add()", {class: "button -alt-highlight -with-icon icon-context icon-add"} %>
@@ -192,7 +200,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
<% if @cost_object.new_record? %> -

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

+

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

<% end %> <%= wikitoolbar_for 'cost_object_description' %> diff --git a/app/views/cost_objects/_labor_budget_item.html.erb b/app/views/cost_objects/_labor_budget_item.html.erb index 38be4a405d..b24f41bba9 100644 --- a/app/views/cost_objects/_labor_budget_item.html.erb +++ b/app/views/cost_objects/_labor_budget_item.html.erb @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= cost_form.text_field :hours, :index => id_or_index, :size => 3 %>
- + <%= cost_form.select :user_id, @project.possible_assignees.sort.map{|u| [u.name, u.id]}, {:prompt => true}, {:index => id_or_index, :class => 'form--select'}%> @@ -47,7 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= cost_form.text_field :comments, :index => id_or_index, :size => 40 %> - " class="icon-context icon-edit" title="<%= l(:help_click_to_edit) %>"> + " class="icon-context icon-edit" title="<%= t(:help_click_to_edit) %>"> <%= number_to_currency(labor_budget_item.calculated_costs(@cost_object.fixed_date, @cost_object.project_id)) if labor_budget_item.costs_visible_by?(User.current) %> <%= update_page_tag do |page| diff --git a/app/views/cost_objects/_material_budget_item.html.erb b/app/views/cost_objects/_material_budget_item.html.erb index da51cb56c4..02dd828a6f 100644 --- a/app/views/cost_objects/_material_budget_item.html.erb +++ b/app/views/cost_objects/_material_budget_item.html.erb @@ -56,7 +56,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= cost_form.text_field :comments, :index => id_or_index, :size => 40 %> - " class="icon-context icon-edit" title="<%= l(:help_click_to_edit) %>"> + " class="icon-context icon-edit" title="<%= t(:help_click_to_edit) %>"> <%= number_to_currency(material_budget_item.calculated_costs(@cost_object.fixed_date)) %> <%= update_page_tag do |page| diff --git a/app/views/cost_objects/_show_variable_cost_object.html.erb b/app/views/cost_objects/_show_variable_cost_object.html.erb index d49d225ad9..7b6c1d9841 100644 --- a/app/views/cost_objects/_show_variable_cost_object.html.erb +++ b/app/views/cost_objects/_show_variable_cost_object.html.erb @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++#%> -

<%= l(:caption_materials) %>

+

<%= t(:caption_materials) %>

<%= VariableCostObject.human_attribute_name(:material_budget) %>

@@ -101,7 +101,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-

<%= l(:caption_material_costs) %>

+

<%= t(:caption_material_costs) %>

@@ -195,7 +195,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-

<%= l(:caption_labor) %>

+

<%= t(:caption_labor) %>

<%= VariableCostObject.human_attribute_name(:labor_budget)%>

@@ -284,7 +284,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-

<%= l(:caption_labor_costs) %>

+

<%= t(:caption_labor_costs) %>

diff --git a/app/views/cost_objects/edit.html.erb b/app/views/cost_objects/edit.html.erb index 090ba33d25..e552cb0a37 100644 --- a/app/views/cost_objects/edit.html.erb +++ b/app/views/cost_objects/edit.html.erb @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= render :partial => 'shared/costs_header' %> -<% html_title "#{l(:label_edit)} #{l(:label_cost_object_id, id: @cost_object.id)}: #{@cost_object.subject}" %> -<%= toolbar title: l(:label_cost_object_id, id: @cost_object.id) %> +<% html_title "#{t(:label_edit)} #{t(:label_cost_object_id, id: @cost_object.id)}: #{@cost_object.subject}" %> +<%= toolbar title: t(:label_cost_object_id, id: @cost_object.id) %> <%= render :partial => 'edit' %> <%= javascript_tag "Form.Element.focus('cost_object_subject');" %> diff --git a/app/views/cost_objects/index.html.erb b/app/views/cost_objects/index.html.erb index f4add09832..f6b209ba51 100644 --- a/app/views/cost_objects/index.html.erb +++ b/app/views/cost_objects/index.html.erb @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= render :partial => 'shared/costs_header' %> -<% html_title(l(:label_cost_object_plural)) %> -<%= toolbar title: l(:label_cost_object_plural) do %> +<% html_title(t(:label_cost_object_plural)) %> +<%= toolbar title: t(:label_cost_object_plural) do %> <% if authorize_for(:cost_objects, :new) %> @@ -38,7 +38,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <% end %>

-<%= l(:label_export_to) %> +<%= t(:label_export_to) %> diff --git a/app/views/cost_objects/new.html.erb b/app/views/cost_objects/new.html.erb index c259587364..475e2bf65b 100644 --- a/app/views/cost_objects/new.html.erb +++ b/app/views/cost_objects/new.html.erb @@ -20,8 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= render :partial => 'shared/costs_header' %> -<% html_title(l(:label_cost_object_new)) %> -<%= toolbar title: l(:label_cost_object_new) %> +<% html_title(t(:label_cost_object_new)) %> +<%= toolbar title: t(:label_cost_object_new) %> <%= labelled_tabular_form_for @cost_object, :url => projects_cost_objects_path(@project), @@ -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} %> - <%= styled_button_tag l(:button_create), class: '-with-icon icon-checkmark' %> - <%= styled_button_tag l(:button_create_and_continue), :name => 'continue', + <%= styled_button_tag t(:button_create), class: '-with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_create_and_continue), :name => 'continue', class: 'button -highlight'%> <%= javascript_tag "Form.Element.focus('cost_object_subject');" %> diff --git a/app/views/cost_objects/show.html.erb b/app/views/cost_objects/show.html.erb index e79ce9ee61..c86b04e8f2 100644 --- a/app/views/cost_objects/show.html.erb +++ b/app/views/cost_objects/show.html.erb @@ -20,26 +20,26 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= render :partial => 'shared/costs_header' %> -<% html_title "#{l(:label_cost_object_id, id: @cost_object.id)}: #{@cost_object.subject}" %> -<%= toolbar title: l(:label_cost_object_id, id: @cost_object.id) do %> +<% html_title "#{t(:label_cost_object_id, id: @cost_object.id)}: #{@cost_object.subject}" %> +<%= toolbar title: t(:label_cost_object_id, id: @cost_object.id) do %> <% if authorize_for(:cost_objects, :edit) %>

  • <%= link_to({ controller: 'cost_objects', action: 'edit', id: @cost_object }, class: 'button', accesskey: accesskey(:edit)) do %> - <%= l(:button_update) %> + <%= t(:button_update) %> <% end %>
    • <% end %> <% if authorize_for(:cost_objects, :copy) %>
  • <%= link_to({ controller: 'cost_objects', action: 'copy', id: @cost_object }, class: 'button') do %> - <%= l(:button_copy) %> + <%= t(:button_copy) %> <% end %>
    • <% end %> <% if authorize_for(:cost_objects, :copy) %>
  • - <%= link_to({ controller: 'cost_objects', action: 'destroy', id: @cost_object }, class: 'button', method: :delete, data: { confirm: l(:text_are_you_sure)}) do %> - <%= l(:button_delete) %> + <%= link_to({ controller: 'cost_objects', action: 'destroy', id: @cost_object }, class: 'button', method: :delete, data: { confirm: t(:text_are_you_sure)}) do %> + <%= t(:button_delete) %> <% end %>
    • <% end %> @@ -49,7 +49,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

    <%=h @cost_object.subject %>

    <%= authoring @cost_object.created_on, @cost_object.author %>. - <%= l(:label_updated_time, distance_of_time_in_words(Time.now, @cost_object.updated_on)) + '.' if @cost_object.created_on != @cost_object.updated_on %> + <%= t(:label_updated_time, value: distance_of_time_in_words(Time.now, @cost_object.updated_on)) + '.' if @cost_object.created_on != @cost_object.updated_on %>

    @@ -81,7 +81,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <% if authorize_for('cost_objects', 'edit') %> <% end %> diff --git a/app/views/cost_types/_list.html.erb b/app/views/cost_types/_list.html.erb index faeccc2de7..ab054df7ea 100644 --- a/app/views/cost_types/_list.html.erb +++ b/app/views/cost_types/_list.html.erb @@ -53,7 +53,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
    - <%= l(:caption_set_rate) %> + <%= t(:caption_set_rate) %>
    @@ -62,7 +62,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
    - <%= l(:caption_default) %> + <%= t(:caption_default) %>
    @@ -80,7 +80,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - <%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %> + <%= sort_header_tag('spent_on', :caption => t(:label_date), :default_order => 'desc') %> <%= sort_header_tag('user', :caption => Member.model_name.human) %> <%= sort_header_tag('project', :caption => Project.model_name.human )%> <%= sort_header_tag('work_package', :caption => WorkPackage.model_name.human, :default_order => 'desc') %> @@ -46,8 +46,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - <%= sort_header_tag('units', :caption => l(:label_units)) %> - <%= sort_header_tag('costs', :caption => l(:label_overall_costs)) %> + <%= sort_header_tag('units', :caption => t(:label_units)) %> + <%= sort_header_tag('costs', :caption => t(:label_overall_costs)) %> @@ -75,13 +75,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= link_to icon_wrapper('icon-context icon-edit',t(:button_edit)), {:controller => '/costlog', :action => 'edit', :id => entry, :project_id => nil}, :class => 'no-decoration-on-hover', - :title => l(:button_edit) %> + :title => t(:button_edit) %> <%= link_to icon_wrapper('icon-context icon-delete',t(:button_delete)), {:controller => '/costlog', :action => 'destroy', :id => entry, :project_id => nil}, - :confirm => l(:text_are_you_sure), + :confirm => t(:text_are_you_sure), :method => :delete, :class => 'no-decoration-on-hover', - :title => l(:button_delete) %> + :title => t(:button_delete) %> <% end -%> diff --git a/app/views/costlog/edit.html.erb b/app/views/costlog/edit.html.erb index 84247f331b..5a76b3e952 100644 --- a/app/views/costlog/edit.html.erb +++ b/app/views/costlog/edit.html.erb @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++#%> <%= render partial: 'shared/costs_header' %> -

    <%= l(:label_log_costs) %>

    +

    <%= t(:label_log_costs) %>

    <% url = @cost_entry.new_record? ? { action: 'create', project_id: @project.id } : @@ -76,7 +76,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <% if User.current.allowed_to? :view_cost_rates, @cost_entry.project %> - + <%= number_to_currency(@cost_entry.calculated_costs) %> <%= update_page_tag do |page| @@ -87,7 +87,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. " size="7" name="cost_entry[overridden_costs]" id="cost_entry_costs_edit"/> <%= Setting.plugin_openproject_costs['costs_currency'] %> -
    <%= l(:help_override_rate) %> +
    <%= t(:help_override_rate) %> <% end %>     @@ -97,5 +97,5 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - <%= styled_button_tag l(:button_save), class: '-with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-with-icon icon-checkmark' %> <% end %> diff --git a/app/views/costlog/index.html.erb b/app/views/costlog/index.html.erb index 648990b03b..a27d9f7b36 100644 --- a/app/views/costlog/index.html.erb +++ b/app/views/costlog/index.html.erb @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= toolbar title: WorkPackage.human_attribute_name(:spent_costs) do %> <% if authorize_for(:costlog, :new) %> <%= link_to({:controller => '/costlog', :action => 'new', :work_package_id => @work_package }, class: 'button') do %> - <%= l(:button_log_costs) %> + <%= t(:button_log_costs) %> <% end %> <% end %> <% end %> @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= pagination_links_full @entries %> <% end %> -<% html_title WorkPackage.human_attribute_name(:spent_costs), l(:label_details) %> +<% html_title WorkPackage.human_attribute_name(:spent_costs), t(:label_details) %> <% content_for :header_tags do %> <%= auto_discovery_link_tag(:atom, {:work_package_id => @work_package, :format => 'atom', :key => User.current.rss_key}, :title => WorkPackage.human_attribute_name(:spent_costs)) %> diff --git a/app/views/hooks/costs/_view_work_package_show_action_menu.html.erb b/app/views/hooks/costs/_view_work_package_show_action_menu.html.erb index 9ac51a021f..e9a9732d16 100644 --- a/app/views/hooks/costs/_view_work_package_show_action_menu.html.erb +++ b/app/views/hooks/costs/_view_work_package_show_action_menu.html.erb @@ -20,5 +20,5 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <% if @project && @project.module_enabled?(:costs_module) %>
    - <%= li_unless_nil(link_to_if_authorized l(:button_log_costs), {:controller => '/costlog', :action => 'new', :work_package_id => work_package}, :class => 'icon-context icon-projects') %> + <%= li_unless_nil(link_to_if_authorized t(:button_log_costs), {:controller => '/costlog', :action => 'new', :work_package_id => work_package}, :class => 'icon-context icon-projects') %> <% end %> diff --git a/app/views/hooks/costs/_view_work_packages_bulk_edit_details_bottom.html.erb b/app/views/hooks/costs/_view_work_packages_bulk_edit_details_bottom.html.erb index 5b055efd02..18e0efae0b 100644 --- a/app/views/hooks/costs/_view_work_packages_bulk_edit_details_bottom.html.erb +++ b/app/views/hooks/costs/_view_work_packages_bulk_edit_details_bottom.html.erb @@ -23,8 +23,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
    <%= styled_select_tag('cost_object_id', - content_tag('option', l(:label_no_change_option), :value => '') + - content_tag('option', l(:label_none), :value => 'none') + + content_tag('option', t(:label_no_change_option), :value => '') + + content_tag('option', t(:label_none), :value => 'none') + options_from_collection_for_select(CostObject.where(project_id: @project.id).order('subject ASC'), :id, :subject)) %>
    diff --git a/app/views/hooks/costs/_view_work_packages_move_bottom.html.erb b/app/views/hooks/costs/_view_work_packages_move_bottom.html.erb index 8f4a704da3..a161853601 100644 --- a/app/views/hooks/costs/_view_work_packages_move_bottom.html.erb +++ b/app/views/hooks/costs/_view_work_packages_move_bottom.html.erb @@ -21,8 +21,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <% if @project && @project.module_enabled?(:costs_module) %>
    <%= styled_label_tag :cost_object_id, CostObject.model_name.human %> - <%= styled_select_tag('cost_object_id', (@target_project == @project ? content_tag('option', l(:label_no_change_option), :value => '') : "") + - content_tag('option', l(:label_none), :value => 'none') + + <%= styled_select_tag('cost_object_id', (@target_project == @project ? content_tag('option', t(:label_no_change_option), :value => '') : "") + + content_tag('option', t(:label_none), :value => 'none') + options_from_collection_for_select(@target_project.cost_objects, :id, :subject)) %>
    <% end %> diff --git a/app/views/hourly_rates/_list_default.html.erb b/app/views/hourly_rates/_list_default.html.erb index 540d0185a6..3cb0905165 100644 --- a/app/views/hourly_rates/_list_default.html.erb +++ b/app/views/hourly_rates/_list_default.html.erb @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++#%>
    - <%= link_to l(:button_update), edit_hourly_rate_path(@user), :class => 'icon icon-edit', :accesskey => accesskey(:edit) %> + <%= link_to t(:button_update), edit_hourly_rate_path(@user), :class => 'icon icon-edit', :accesskey => accesskey(:edit) %>

    <%= User.human_attribute_name(:default_rates) %>

    <% if @rates_default.blank? %> diff --git a/app/views/hourly_rates/_list_project.html.erb b/app/views/hourly_rates/_list_project.html.erb index b0d447140a..bb7a16ad1a 100644 --- a/app/views/hourly_rates/_list_project.html.erb +++ b/app/views/hourly_rates/_list_project.html.erb @@ -31,7 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
    <% if project && User.current.allowed_to?({:controller => '/hourly_rates', :action => 'edit'}, project) %> - <%= link_to l(:button_update), {:controller => '/hourly_rates', :action => 'edit', :project_id => project, :id => @user}, :class => 'icon icon-edit', :accesskey => accesskey(:edit) %> + <%= link_to t(:button_update), {:controller => '/hourly_rates', :action => 'edit', :project_id => project, :id => @user}, :class => 'icon icon-edit', :accesskey => accesskey(:edit) %> <% end %>

    <%=h project.name %><%= (" - " + number_to_currency(current_rate.rate)) if current_rate %>

    diff --git a/app/views/hourly_rates/edit.html.erb b/app/views/hourly_rates/edit.html.erb index c821d58d0e..8f4b829d06 100644 --- a/app/views/hourly_rates/edit.html.erb +++ b/app/views/hourly_rates/edit.html.erb @@ -20,13 +20,13 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= render :partial => 'shared/costs_header' %> -<% html_title l(:label_administration), "#{l(:label_edit)} #{l((@project.nil? ? :caption_default_rate_history_for : :caption_rate_history_for), user: ' ')} #{@user.name}" %> +<% html_title t(:label_administration), "#{t(:label_edit)} #{l((@project.nil? ? :caption_default_rate_history_for : :caption_rate_history_for), user: ' ')} #{@user.name}" %> -<%= toolbar title: (@project.nil? ? l(:caption_default_rate_history_for, :user => @user.name) : l(:caption_rate_history_for_project, :user => @user.name, :project => @project.name) ) %> +<%= toolbar title: (@project.nil? ? t(:caption_default_rate_history_for, :user => @user.name) : t(:caption_rate_history_for_project, :user => @user.name, :project => @project.name) ) %> <%- default_rate = @user.current_default_rate -%> <% if default_rate%> -

    <%= l(:label_current_default_rate) %>: <%= number_to_currency(default_rate.rate)%>

    +

    <%= t(:label_current_default_rate) %>: <%= number_to_currency(default_rate.rate)%>

    <% end %> <%= javascript_tag do -%> @@ -81,8 +81,8 @@ 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 -alt-highlight -with-icon icon-add"} %> - <%= styled_button_tag l(:button_save), class: '-with-icon icon-checkmark' %> + + <%= link_to_function t(:button_add_rate), "addRate($('add_rate_date'))", {class: "button -alt-highlight -with-icon icon-add"} %> + <%= styled_button_tag t(:button_save), class: '-with-icon icon-checkmark' %>
    <% end %> diff --git a/app/views/hourly_rates/show.html.erb b/app/views/hourly_rates/show.html.erb index b60ce5743a..844ee6f0c2 100644 --- a/app/views/hourly_rates/show.html.erb +++ b/app/views/hourly_rates/show.html.erb @@ -20,16 +20,16 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= render :partial => 'shared/costs_header' %> -<% html_title l(:label_administration), l(:caption_rate_history_for, user: @user.name) %> +<% html_title t(:label_administration), t(:caption_rate_history_for, user: @user.name) %> -<%= toolbar title: l(:caption_rate_history_for, :user => @user.name) %> +<%= toolbar title: t(:caption_rate_history_for, :user => @user.name) %> <% if @project %> - <% html_title l(:caption_rate_history_for, user: @user.name) %> + <% html_title t(:caption_rate_history_for, user: @user.name) %> <%= render :partial => 'list_project' %> <% else %> - <% html_title l(:label_administration), l(:caption_rate_history_for, user: @user.name) %> + <% html_title t(:label_administration), t(:caption_rate_history_for, user: @user.name) %> <%= render :partial => 'list_default' %> <%= render :partial => 'list' %> diff --git a/app/views/settings/_openproject_costs.html.erb b/app/views/settings/_openproject_costs.html.erb index 6d4561d4fb..60c5b0d94c 100644 --- a/app/views/settings/_openproject_costs.html.erb +++ b/app/views/settings/_openproject_costs.html.erb @@ -18,11 +18,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++#%>
    - <%= styled_label_tag :label_currency, l(:label_currency) %> + <%= styled_label_tag :label_currency, t(:label_currency) %> <%= styled_text_field_tag 'settings[costs_currency]', @settings['costs_currency'] %>
    - <%= styled_label_tag :label_currency_format, l(:label_currency_format) %> + <%= styled_label_tag :label_currency_format, t(:label_currency_format) %> <%= styled_text_field_tag 'settings[costs_currency_format]', @settings['costs_currency_format'] %>
    diff --git a/app/views/users/_rates.html.erb b/app/views/users/_rates.html.erb index f43e43837f..a25572f81b 100644 --- a/app/views/users/_rates.html.erb +++ b/app/views/users/_rates.html.erb @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++#%> -

    <%= l(:caption_rate_history) %>

    +

    <%= t(:caption_rate_history) %>

    <% @rates = HourlyRate.history_for_user(@user) @rates_default = @rates.delete(nil) diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 12e24091ce..749ce7bd6a 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -39,8 +39,8 @@ fr: models: cost_object: Budget cost_type: - one: Cost type - other: Cost types + one: Type de coût + other: Types de coût material_budget_item: Unité rate: Tarif errors: @@ -107,7 +107,7 @@ fr: label_current_default_rate: Taux par défaut actuel label_date_on: le label_deleted_cost_types: Types de coût effacés - label_locked_cost_types: Locked cost types + label_locked_cost_types: Types de coût bloqués label_deliverable: Budget label_display_cost_entries: Afficher les coûts unitaires label_display_time_entries: Afficher les heures consignées @@ -142,8 +142,8 @@ fr: notice_no_cost_objects_available: Aucun budget disponible. notice_something_wrong: "Quelque chose s'est mal passé. Veuillez réessayer." notice_successful_restore: Restauration réussie. - notice_successful_lock: Locked successfully. - notice_cost_logged_successfully: Unit cost logged successfully. + notice_successful_lock: Bloqué avec succès. + notice_cost_logged_successfully: Coût unitaire enregistré avec succès. permission_edit_cost_entries: Éditer coûts unitaires réservés permission_edit_cost_objects: Éditer les budgets permission_edit_own_cost_entries: Éditer coûts unitaires propres réservés @@ -169,7 +169,7 @@ fr: text_warning_hidden_elements: "Certaines entrées peuvent avoir été exclues de l'agrégation." week: semaine x_entries: - one: 1 entry - other: '%{count} entries' + one: 1 entrée + other: '%{count} entrées' js: text_are_you_sure: Êtes-vous sûr ? diff --git a/config/locales/ru.yml b/config/locales/ru.yml index e084286bdb..3f9376c9da 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -39,7 +39,7 @@ ru: models: cost_object: Бюджет cost_type: - one: Cost type + one: Тип затрат few: Cost types other: Cost types material_budget_item: Единица @@ -108,7 +108,7 @@ ru: label_current_default_rate: Текущий тариф по умолчанию label_date_on: на label_deleted_cost_types: Типы удаленных расходов - label_locked_cost_types: Locked cost types + label_locked_cost_types: Заблокированные типы стоимостей label_deliverable: Бюджет label_display_cost_entries: Отображать расходы на единицу label_display_time_entries: Отображать часы по отчету @@ -143,8 +143,8 @@ ru: notice_no_cost_objects_available: Нет доступных бюджетов. notice_something_wrong: Произошла ошибка. Пожалуйста, попробуйте снова. notice_successful_restore: Успешное восстановление. - notice_successful_lock: Locked successfully. - notice_cost_logged_successfully: Unit cost logged successfully. + notice_successful_lock: Успешно заблокировано. + notice_cost_logged_successfully: 'Стоимость единицы успешно зажурналировано ' permission_edit_cost_entries: Править зарегестрированные количественные затраты permission_edit_cost_objects: Править бюджеты permission_edit_own_cost_entries: Править собственные зарегистрированные количественные затраты @@ -170,7 +170,7 @@ ru: text_warning_hidden_elements: Некоторые записи были исключены из агрегирования. week: неделя x_entries: - one: 1 entry + one: 1 запись few: '%{count} entries' other: '%{count} entries' js: diff --git a/frontend/app/openproject-costs-app.js b/frontend/app/openproject-costs-app.js index 36cc9ba86e..c701e2368c 100644 --- a/frontend/app/openproject-costs-app.js +++ b/frontend/app/openproject-costs-app.js @@ -33,6 +33,14 @@ localeFiles.keys().forEach(function(localeFile) { I18n.addTranslations(locale, localeFiles(localeFile)[locale]); }); +// Register Budget as select inline edit +angular + .module('openproject') + .run(['wpEditField', function(wpEditField) { + wpEditField.extendFieldType('select', ['Budget']); + }]); + + // main app var openprojectCostsApp = angular.module('openproject'); diff --git a/lib/open_project/costs/hooks/project_hook.rb b/lib/open_project/costs/hooks/project_hook.rb index cbae3d8bf6..d23bbbefdf 100644 --- a/lib/open_project/costs/hooks/project_hook.rb +++ b/lib/open_project/costs/hooks/project_hook.rb @@ -31,7 +31,7 @@ class OpenProject::Costs::Hooks::ProjectHook < Redmine::Hook::ViewListener project = context[:project] result += content_tag(:th, User.human_attribute_name(:current_rate)) if user.allowed_to?(:view_hourly_rates, project) - result += content_tag(:th, l(:caption_set_rate)) if user.allowed_to?(:edit_hourly_rates, project) + result += content_tag(:th, t(:caption_set_rate)) if user.allowed_to?(:edit_hourly_rates, project) result end diff --git a/lib/open_project/costs/patches/application_helper_patch.rb b/lib/open_project/costs/patches/application_helper_patch.rb index 1b9750e1fd..db671f690b 100644 --- a/lib/open_project/costs/patches/application_helper_patch.rb +++ b/lib/open_project/costs/patches/application_helper_patch.rb @@ -25,7 +25,7 @@ module OpenProject::Costs::Patches::ApplicationHelperPatch title = nil subject = nil if options[:subject] == false - subject = "#{l(:label_cost_object)} ##{cost_object.id}" + subject = "#{t(:label_cost_object)} ##{cost_object.id}" title = truncate(cost_object.subject, length: 60) else subject = cost_object.subject diff --git a/lib/open_project/costs/patches/number_helper_patch.rb b/lib/open_project/costs/patches/number_helper_patch.rb index 747c767ddd..1cacbc6e03 100644 --- a/lib/open_project/costs/patches/number_helper_patch.rb +++ b/lib/open_project/costs/patches/number_helper_patch.rb @@ -30,8 +30,8 @@ module OpenProject::Costs::Patches::NumberHelperPatch def number_to_currency_with_l10n(number, options = {}) options_with_default = { unit: ERB::Util.h(Setting.plugin_openproject_costs['costs_currency']), format: ERB::Util.h(Setting.plugin_openproject_costs['costs_currency_format']), - delimiter: l(:currency_delimiter), - separator: l(:currency_separator) }.merge(options) + delimiter: I18n.t(:currency_delimiter), + separator: I18n.t(:currency_separator) }.merge(options) # FIXME: patch ruby instead of this code # this circumvents the broken BigDecimal#to_f on Siemens's ruby diff --git a/lib/open_project/costs/patches/query_patch.rb b/lib/open_project/costs/patches/query_patch.rb index f6eaca8cb1..ab9f5b3c10 100644 --- a/lib/open_project/costs/patches/query_patch.rb +++ b/lib/open_project/costs/patches/query_patch.rb @@ -57,7 +57,7 @@ module OpenProject::Costs::Patches::QueryPatch # Same as typing in the class base.class_eval do - add_available_column(QueryColumn.new(:cost_object_subject)) + add_available_column(QueryColumn.new(:cost_object)) add_available_column(CurrencyQueryColumn.new( :material_costs,
    <%= form_for cost_type, :url => { :controller => '/cost_types', :action => 'set_rate', :id => cost_type } do |f| %> - + <%= f.text_field :rate, :value => "", :name => :rate, :size => 7, :id => "rate_field_#{cost_type.id}" %> <%= Setting.plugin_openproject_costs['costs_currency'] %> diff --git a/app/views/cost_types/_list_deleted.html.erb b/app/views/cost_types/_list_deleted.html.erb index 1e92166724..19fe703046 100644 --- a/app/views/cost_types/_list_deleted.html.erb +++ b/app/views/cost_types/_list_deleted.html.erb @@ -52,7 +52,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
    - <%= l(:caption_locked_on) %> + <%= t(:caption_locked_on) %>
    diff --git a/app/views/cost_types/edit.html.erb b/app/views/cost_types/edit.html.erb index ffdadf9c76..d3084ea47a 100644 --- a/app/views/cost_types/edit.html.erb +++ b/app/views/cost_types/edit.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(:label_cost_type_specific, id: @cost_type.id, name: @cost_type.name) %> +<% html_title t(:label_cost_type_specific, id: @cost_type.id, name: @cost_type.name) %> <%= toolbar title: CostType.model_name.human %> @@ -41,7 +41,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= f.check_box :default %> -

    <%= l :caption_rate_history %>

    +

    <%= t :caption_rate_history %>

    <%= javascript_tag do -%> RatesForm = new Subform('<%= escape_javascript(render(:partial => "rate", :object => CostRate.new )) %>',<%= @cost_type.rates.length %>,'rates_body'); <% end -%> @@ -97,11 +97,11 @@ 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"} %> + + <%= link_to_function t(:button_add_rate), "addRate($('add_rate_date'))", {:class => "button icon icon-add"} %>
    - <%= styled_button_tag l(:button_save), class: '-with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: '-with-icon icon-checkmark' %> <% end %> diff --git a/app/views/cost_types/index.html.erb b/app/views/cost_types/index.html.erb index 1a6cc7e47c..15d1c01459 100644 --- a/app/views/cost_types/index.html.erb +++ b/app/views/cost_types/index.html.erb @@ -20,36 +20,36 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= render :partial => 'shared/costs_header' %> -<% html_title l(:label_cost_type_plural) %> +<% html_title t(:label_cost_type_plural) %> <%= toolbar title: CostType.model_name.human(count: 2) do %>
  • <%= link_to new_cost_type_path, class: 'button -alt-highlight' do%> - <%= l(:button_add_cost_type) %> + <%= t(:button_add_cost_type) %> <% end %>
    • <% end %> <%= styled_form_tag(cost_types_path, { :method => :get, :id => 'query_form' }) do %>
    - <%= l(:label_filter_plural) %> + <%= t(:label_filter_plural) %>
    - <%= styled_label_tag :fixed_date, l(:label_fixed_date) %> + <%= styled_label_tag :fixed_date, t(:label_fixed_date) %> <%= styled_text_field_tag :fixed_date, @fixed_date %> <%= calendar_for :fixed_date %>
    - <%= styled_label_tag :include_deleted, l(:caption_show_locked) %> + <%= styled_label_tag :include_deleted, t(:caption_show_locked) %> <%= styled_check_box_tag :include_deleted, "1", @include_deleted, :autocomplete => "off" %>
    -<%= link_to_remote l(:button_apply), +<%= link_to_remote t(:button_apply), { :update => "content", :with => "Form.serialize('query_form')", :method => :get }, :class => 'button -with-icon icon-checkmark' %> -<%= link_to_remote l(:button_clear), +<%= link_to_remote t(:button_clear), { :url => { :clear_filter => true }, :method => :get, :update => "content", @@ -57,11 +57,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <% end %> <%= render :partial => 'list' %> <% if @include_deleted %> -

    <%= l(:label_locked_cost_types) %>

    +

    <%= t(:label_locked_cost_types) %>

    <%= render :partial => 'list_deleted' %> <% end %> diff --git a/app/views/costlog/_date_range.html.erb b/app/views/costlog/_date_range.html.erb index c63bd9770d..2d69fcf598 100644 --- a/app/views/costlog/_date_range.html.erb +++ b/app/views/costlog/_date_range.html.erb @@ -19,7 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++#%>
    - <%= l(:label_date_range) %> + <%= t(:label_date_range) %>
    <%= styled_radio_button_tag 'period_type', '1', !@free_period %>
    @@ -32,18 +32,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. <%= styled_radio_button_tag 'period_type', '2', @free_period %>
    -

    <%= l(:label_date_from) %>

    +

    <%= t(:label_date_from) %>

    - <%= styled_label_tag :from, l(:description_date_range_list) %> + <%= styled_label_tag :from, t(:description_date_range_list) %> <%= styled_text_field_tag :from, @from %> <%= calendar_for :from %>
    -

    <%= l(:label_date_to) %>

    +

    <%= t(:label_date_to) %>

    - <%= styled_label_tag :to, l(:description_date_range_interval) %> + <%= styled_label_tag :to, t(:description_date_range_interval) %> <%= styled_text_field_tag :to, @to %> <%= calendar_for :to %>
    - <%= styled_button_tag l(:button_apply), class: '-with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_apply), class: '-with-icon icon-checkmark' %>
    diff --git a/app/views/costlog/_list.html.erb b/app/views/costlog/_list.html.erb index 8453d263dc..4d94d07806 100644 --- a/app/views/costlog/_list.html.erb +++ b/app/views/costlog/_list.html.erb @@ -33,7 +33,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.