@@ -1,15 +1,29 @@ -module Radiant - module AvailableLocales +module Radiant::AvailableLocales - def self.locales - locales = Dir.new("#{RADIANT_ROOT}/config/locales/").entries.collect do |x| - x =~ /\.yml/ ? x.sub(/\.yml/,"") : nil - end.compact.each_with_object({}) do |str, hsh| - locale_file = YAML.load_file("#{RADIANT_ROOT}/config/locales/" + "/" + str + ".yml") - hsh[locale_file[str]["this_file_language"]] = str if locale_file.has_key? str - end.freeze - locales + def self.locales + root_locales = [File.join(RADIANT_ROOT, 'config', 'locales'), File.join(RADIANT_ROOT, 'config', 'locales')].uniq + all_locale_paths = unless root_locales.empty? + Radiant::ExtensionLoader.locale_paths.dup + root_locales + else + Radiant::ExtensionLoader.locale_paths end + + available_locales = {} + all_locale_paths.each do |path| + if File.exists? path + Dir.new(path).entries.collect do |x| + result = x =~ /\.yml/ ? x.sub(/\.yml/,"") : nil + # filters out the available_tags files + result =~ /\_available_tags/ ? nil : result + end.compact.each do |str| + locale_file = YAML.load_file(path + "/" + str + ".yml") + lang = locale_file[str]["this_file_language"] if locale_file[str] + available_locales.merge! Hash[lang, str] if lang + end.freeze + end + end + available_locales end + end \ No newline at end of file lib/radiant/available_locales.rb @@ -53,11 +53,11 @@ module Radiant end def locale_paths - load_extension_roots.map { |extension| Dir[File.join("#{extension}/config/locales" , '*.{rb,yml}')] }.flatten + load_extension_roots.map { |extension| "#{extension}/config/locales" }.select { |d| File.directory?(d) }.reverse end def add_locale_paths - configuration.i18n.load_path.concat(locale_paths) + configuration.i18n.load_path.concat(locale_paths.map{ |path| Dir[File.join("#{path}","*.{rb,yml}")] }) end def controller_paths lib/radiant/extension_loader.rb @@ -170,7 +170,7 @@ end_error def initialize_i18n extension_loader.add_locale_paths radiant_locale_paths = Dir[File.join(RADIANT_ROOT, 'config', 'locales', '*.{rb,yml}')] - extension_loader.configuration.i18n.load_path = radiant_locale_paths + extension_loader.configuration.i18n.load_path + configuration.i18n.load_path = radiant_locale_paths + extension_loader.configuration.i18n.load_path super end lib/radiant/initializer.rb ff944b1e5f12c1c405fdbab49c3de04738162332 Keith keith@keithbingman.com http://github.com/radiant/radiant/commit/a4d595b9bad693495eb8b4970d78d29c158c312f a4d595b9bad693495eb8b4970d78d29c158c312f 2009-10-12T10:36:06-07:00 2009-10-12T10:36:06-07:00 moving langauages to extensions, for easy distribution and maintenence 1f87b921d5e6ffa01ff26fd612be255fa34c0415 Keith keith@keithbingman.com