avoid patching i18n multiple times in development

pull/6827/head
Jens Ulferts 12 years ago
parent 8b8fe39c20
commit e4b0aa39a3
  1. 9
      lib/open_project/costs/engine.rb
  2. 40
      lib/open_project/costs/patches/i18n_patch.rb

@ -48,6 +48,13 @@ module OpenProject::Costs
app.routes_reloader.paths.uniq!
end
initializer "costs.patch_i18n" do
# This is done here instead of doing it along with the rest of the patches as
# i18n is not unloaded between requests. Hence, placing it inside the config.to_prepare
# block would patch i18n once for every request.
require_dependency 'open_project/costs/patches/i18n_patch'
end
config.to_prepare do
# TODO: avoid this dirty hack necessary to prevent settings method getting lost after reloading
@ -56,8 +63,6 @@ module OpenProject::Costs
require 'open_project/costs/patches'
require_dependency 'open_project/costs/patches/i18n_patch'
# Model Patches
require_dependency 'open_project/costs/patches/issue_patch'
require_dependency 'open_project/costs/patches/project_patch'

@ -1,25 +1,29 @@
module OpenProject::Costs::Patches
module NumberHelper
def self.included(base) # :nodoc:
base.class_eval do
include InstanceMethods
module OpenProject
module Costs
module Patches
module NumberHelper
def self.included(base) # :nodoc:
base.class_eval do
include InstanceMethods
alias_method_chain :number_to_currency, :l10n
end
end
alias_method_chain :number_to_currency, :l10n
end
end
module InstanceMethods
def number_to_currency_with_l10n(number, options = {})
options_with_default = { unit: Setting.plugin_openproject_costs['costs_currency'],
format: Setting.plugin_openproject_costs['costs_currency_format'],
delimiter: l(:currency_delimiter),
separator: l(:currency_separator) }.merge(options)
module InstanceMethods
def number_to_currency_with_l10n(number, options = {})
options_with_default = { unit: Setting.plugin_openproject_costs['costs_currency'],
format: Setting.plugin_openproject_costs['costs_currency_format'],
delimiter: l(:currency_delimiter),
separator: l(:currency_separator) }.merge(options)
# FIXME: patch ruby instead of this code
# this circumvents the broken BigDecimal#to_f on Siemens's ruby
number = number.to_s if number.is_a? BigDecimal
# FIXME: patch ruby instead of this code
# this circumvents the broken BigDecimal#to_f on Siemens's ruby
number = number.to_s if number.is_a? BigDecimal
number_to_currency_without_l10n(number, options_with_default)
number_to_currency_without_l10n(number, options_with_default)
end
end
end
end
end

Loading…
Cancel
Save