##// END OF EJS Templates
Make sure that invalid cache from older versions is not used for languages_options (#14534)....
Jean-Philippe Lang -
r13162:4e815e25d7f6
parent child
Show More
@@ -1,192 +1,192
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2014 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 module Redmine
19 19 module I18n
20 20 def self.included(base)
21 21 base.extend Redmine::I18n
22 22 end
23 23
24 24 def l(*args)
25 25 case args.size
26 26 when 1
27 27 ::I18n.t(*args)
28 28 when 2
29 29 if args.last.is_a?(Hash)
30 30 ::I18n.t(*args)
31 31 elsif args.last.is_a?(String)
32 32 ::I18n.t(args.first, :value => args.last)
33 33 else
34 34 ::I18n.t(args.first, :count => args.last)
35 35 end
36 36 else
37 37 raise "Translation string with multiple values: #{args.first}"
38 38 end
39 39 end
40 40
41 41 def l_or_humanize(s, options={})
42 42 k = "#{options[:prefix]}#{s}".to_sym
43 43 ::I18n.t(k, :default => s.to_s.humanize)
44 44 end
45 45
46 46 def l_hours(hours)
47 47 hours = hours.to_f
48 48 l((hours < 2.0 ? :label_f_hour : :label_f_hour_plural), :value => ("%.2f" % hours.to_f))
49 49 end
50 50
51 51 def ll(lang, str, value=nil)
52 52 ::I18n.t(str.to_s, :value => value, :locale => lang.to_s.gsub(%r{(.+)\-(.+)$}) { "#{$1}-#{$2.upcase}" })
53 53 end
54 54
55 55 def format_date(date)
56 56 return nil unless date
57 57 options = {}
58 58 options[:format] = Setting.date_format unless Setting.date_format.blank?
59 59 options[:locale] = User.current.language unless User.current.language.blank?
60 60 ::I18n.l(date.to_date, options)
61 61 end
62 62
63 63 def format_time(time, include_date = true)
64 64 return nil unless time
65 65 options = {}
66 66 options[:format] = (Setting.time_format.blank? ? :time : Setting.time_format)
67 67 options[:locale] = User.current.language unless User.current.language.blank?
68 68 time = time.to_time if time.is_a?(String)
69 69 zone = User.current.time_zone
70 70 local = zone ? time.in_time_zone(zone) : (time.utc? ? time.localtime : time)
71 71 (include_date ? "#{format_date(local)} " : "") + ::I18n.l(local, options)
72 72 end
73 73
74 74 def day_name(day)
75 75 ::I18n.t('date.day_names')[day % 7]
76 76 end
77 77
78 78 def day_letter(day)
79 79 ::I18n.t('date.abbr_day_names')[day % 7].first
80 80 end
81 81
82 82 def month_name(month)
83 83 ::I18n.t('date.month_names')[month]
84 84 end
85 85
86 86 def valid_languages
87 87 ::I18n.available_locales
88 88 end
89 89
90 90 # Returns an array of languages names and code sorted by names, example:
91 91 # [["Deutsch", "de"], ["English", "en"] ...]
92 92 #
93 93 # The result is cached to prevent from loading all translations files
94 94 # unless :cache => false option is given
95 95 def languages_options(options={})
96 96 if options[:cache] == false
97 97 valid_languages.
98 98 select {|locale| ::I18n.exists?(:general_lang_name, locale)}.
99 99 map {|lang| [ll(lang.to_s, :general_lang_name), lang.to_s]}.
100 100 sort {|x,y| x.first <=> y.first }
101 101 else
102 ActionController::Base.cache_store.fetch "i18n/languages_options" do
102 ActionController::Base.cache_store.fetch "i18n/languages_options/#{Redmine::VERSION}" do
103 103 languages_options :cache => false
104 104 end
105 105 end
106 106 end
107 107
108 108 def find_language(lang)
109 109 @@languages_lookup = valid_languages.inject({}) {|k, v| k[v.to_s.downcase] = v; k }
110 110 @@languages_lookup[lang.to_s.downcase]
111 111 end
112 112
113 113 def set_language_if_valid(lang)
114 114 if l = find_language(lang)
115 115 ::I18n.locale = l
116 116 end
117 117 end
118 118
119 119 def current_language
120 120 ::I18n.locale
121 121 end
122 122
123 123 # Custom backend based on I18n::Backend::Simple with the following changes:
124 124 # * lazy loading of translation files
125 125 # * available_locales are determined by looking at translation file names
126 126 class Backend
127 127 (class << self; self; end).class_eval { public :include }
128 128
129 129 module Implementation
130 130 include ::I18n::Backend::Base
131 131
132 132 # Stores translations for the given locale in memory.
133 133 # This uses a deep merge for the translations hash, so existing
134 134 # translations will be overwritten by new ones only at the deepest
135 135 # level of the hash.
136 136 def store_translations(locale, data, options = {})
137 137 locale = locale.to_sym
138 138 translations[locale] ||= {}
139 139 data = data.deep_symbolize_keys
140 140 translations[locale].deep_merge!(data)
141 141 end
142 142
143 143 # Get available locales from the translations filenames
144 144 def available_locales
145 145 @available_locales ||= ::I18n.load_path.map {|path| File.basename(path, '.*')}.uniq.sort.map(&:to_sym)
146 146 end
147 147
148 148 # Clean up translations
149 149 def reload!
150 150 @translations = nil
151 151 @available_locales = nil
152 152 super
153 153 end
154 154
155 155 protected
156 156
157 157 def init_translations(locale)
158 158 locale = locale.to_s
159 159 paths = ::I18n.load_path.select {|path| File.basename(path, '.*') == locale}
160 160 load_translations(paths)
161 161 translations[locale] ||= {}
162 162 end
163 163
164 164 def translations
165 165 @translations ||= {}
166 166 end
167 167
168 168 # Looks up a translation from the translations hash. Returns nil if
169 169 # eiher key is nil, or locale, scope or key do not exist as a key in the
170 170 # nested translations hash. Splits keys or scopes containing dots
171 171 # into multiple keys, i.e. <tt>currency.format</tt> is regarded the same as
172 172 # <tt>%w(currency format)</tt>.
173 173 def lookup(locale, key, scope = [], options = {})
174 174 init_translations(locale) unless translations.key?(locale)
175 175 keys = ::I18n.normalize_keys(locale, key, scope, options[:separator])
176 176
177 177 keys.inject(translations) do |result, _key|
178 178 _key = _key.to_sym
179 179 return nil unless result.is_a?(Hash) && result.has_key?(_key)
180 180 result = result[_key]
181 181 result = resolve(locale, _key, result, options.merge(:scope => nil)) if result.is_a?(Symbol)
182 182 result
183 183 end
184 184 end
185 185 end
186 186
187 187 include Implementation
188 188 # Adds fallback to default locale for untranslated strings
189 189 include ::I18n::Backend::Fallbacks
190 190 end
191 191 end
192 192 end
General Comments 0
You need to be logged in to leave comments. Login now