remove trailing white-spaces from lib/redmine/i18n.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6939 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
9957c3c98a
commit
87faf96f6a
|
@ -3,7 +3,7 @@ module Redmine
|
|||
def self.included(base)
|
||||
base.extend Redmine::I18n
|
||||
end
|
||||
|
||||
|
||||
def l(*args)
|
||||
case args.size
|
||||
when 1
|
||||
|
@ -25,12 +25,12 @@ module Redmine
|
|||
k = "#{options[:prefix]}#{s}".to_sym
|
||||
::I18n.t(k, :default => s.to_s.humanize)
|
||||
end
|
||||
|
||||
|
||||
def l_hours(hours)
|
||||
hours = hours.to_f
|
||||
l((hours < 2.0 ? :label_f_hour : :label_f_hour_plural), :value => ("%.2f" % hours.to_f))
|
||||
end
|
||||
|
||||
|
||||
def ll(lang, str, value=nil)
|
||||
::I18n.t(str.to_s, :value => value, :locale => lang.to_s.gsub(%r{(.+)\-(.+)$}) { "#{$1}-#{$2.upcase}" })
|
||||
end
|
||||
|
@ -39,7 +39,7 @@ module Redmine
|
|||
return nil unless date
|
||||
Setting.date_format.blank? ? ::I18n.l(date.to_date) : date.strftime(Setting.date_format)
|
||||
end
|
||||
|
||||
|
||||
def format_time(time, include_date = true)
|
||||
return nil unless time
|
||||
time = time.to_time if time.is_a?(String)
|
||||
|
@ -52,7 +52,7 @@ module Redmine
|
|||
def day_name(day)
|
||||
::I18n.t('date.day_names')[day % 7]
|
||||
end
|
||||
|
||||
|
||||
def month_name(month)
|
||||
::I18n.t('date.month_names')[month]
|
||||
end
|
||||
|
@ -65,13 +65,13 @@ module Redmine
|
|||
@@languages_lookup = valid_languages.inject({}) {|k, v| k[v.to_s.downcase] = v; k }
|
||||
@@languages_lookup[lang.to_s.downcase]
|
||||
end
|
||||
|
||||
|
||||
def set_language_if_valid(lang)
|
||||
if l = find_language(lang)
|
||||
::I18n.locale = l
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def current_language
|
||||
::I18n.locale
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue