@@ -68,7 +68,7 @@ $plurals = {} end $languages = $plurals.keys -def rand_language +def rand_language $languages[Kernel.rand($languages.length)] end @@ -97,7 +97,7 @@ Benchmark.bm(22) do |bm| DB[:translations2] << { :language_id => lang_id, :msgid => original, - :msgstr => translation + :msgstr => translation } end end benchmarks/database1.rb @@ -7,4 +7,3 @@ controller file. Start with merb - examples/active_record_example/README.txt @@ -7,4 +7,3 @@ controller file. Start with merb - examples/data_mapper_example/README.txt @@ -7,4 +7,3 @@ controller file. Start with merb - examples/gettext_example/README.txt @@ -1,3 +1,3 @@ :merb_global: :provider: gettext - :flat: true \ No newline at end of file + :flat: true examples/gettext_example/config/plugins.yml @@ -7,4 +7,3 @@ controller file. Start with merb - examples/mock_example/README.txt @@ -7,4 +7,3 @@ controller file. Start with merb - examples/sequel_example/README.txt @@ -1,2 +1,2 @@ :merb_global: - :provider: sequel \ No newline at end of file + :provider: sequel examples/sequel_example/config/plugins.yml @@ -7,4 +7,3 @@ controller file. Start with merb - examples/yaml_example/README.txt @@ -1,3 +1,3 @@ :merb_global: :provider: yaml - :flat: true \ No newline at end of file + :flat: true examples/yaml_example/config/plugins.yml @@ -1,7 +1,7 @@ require 'merb_global/base' module Merb - class Controller + class Controller include Merb::Global class_inheritable_accessor :_language lib/merb_global/controller.rb @@ -1,17 +1,17 @@ require 'fileutils' namespace :merb_global do - + task :merb_start do Merb.start_environment :adapter => 'runner', :environment => ENV['MERB_ENV'] || 'development' end - + desc 'Create migration' task :migration => :merb_start do Merb::Global::Providers.provider.create! end - + desc 'Transfer the translations from one provider to another' task :transfer => :merb_start do from = Merb::Global.config 'source', 'gettext' @@ -33,5 +33,5 @@ namespace :merb_global do Merb::Global::Provider.transfer from, into end end - -end \ No newline at end of file + +end lib/merb_global/merbrake.rb @@ -3,9 +3,9 @@ module Merb # Merb-global is able to store the translations in different types of # storage. An interface betwean merb-global and those storages are # providers. - # + # # Please note that it is not required to include this module - despite it - # is recomended both as a documentation part and the more customized + # is recomended both as a documentation part and the more customized # error messages. module Provider # call-seq: @@ -61,7 +61,7 @@ module Merb def create! raise NoMethodError.new('method create! has not been implemented') end - + # This method choos an supported language except those form the list # given. It may fallback to english if none language can be found # which agree with those criteria lib/merb_global/provider.rb @@ -7,7 +7,7 @@ module Merb # # ==== Parames # provider<~to_s,~to_sym>:: A name of provider - # + # # ==== Returns # provider<Provider>:: A new provider def self.[](provider) lib/merb_global/providers.rb @@ -12,7 +12,7 @@ module Merb include Merb::Global::Provider include Merb::Global::Provider::Importer include Merb::Global::Provider::Exporter - + def translate_to(singular, plural, opts) language = Language.find :first, :conditions => {:name => opts[:lang]} @@ -22,7 +22,7 @@ module Merb translation = Translation.find [language.id, singular, n] else translation = Translation.find [language.id, singular, nil] - end + end return translation.msgstr end rescue nil return opts[:n] > 1 ? plural : singular # Fallback if not in database lib/merb_global/providers/active_record.rb @@ -9,7 +9,7 @@ module Merb include Merb::Global::Provider include Merb::Global::Provider::Importer include Merb::Global::Provider::Exporter - + def translate_to(singular, plural, opts) # I hope it's from MemCache language = Language.first :name => opts[:lang] lib/merb_global/providers/data_mapper.rb @@ -16,7 +16,7 @@ module Merb class Gettext #:nodoc: all include Merb::Global::Provider include Merb::Global::Provider::Importer - + def translate_to(singular, plural, opts) context = Thread.current.gettext_context context.set_locale opts[:lang], true lib/merb_global/providers/gettext.rb @@ -3,7 +3,7 @@ module Merb module Providers class Mock #:nodoc: include Merb::Global::Provider - + def translate_to(singular, plural, opts) opts[:n] > 1 ? plural : singular end lib/merb_global/providers/mock.rb @@ -8,7 +8,7 @@ module Merb include Merb::Global::Provider include Merb::Global::Provider::Importer include Merb::Global::Provider::Exporter - + def initialize # Not synchronized - make GC do it's work (may be not optimal # but I don't think that some problem will occure). @@ -97,7 +97,7 @@ module Merb file = "#{Merb::Global::Providers.localedir}/#{language}.yaml" open file, 'w+' do |out| YAML.dump lang, out - end + end end def export_string(language, msgid, msgstr, msgstr_index) lib/merb_global/providers/yaml.rb @@ -23,7 +23,7 @@ module Merb # ==== Parameters # exporter<Exporter>:: Exporter to which it should be exported # export_data:: Data to pass in calles - # + # # ==== Raises # NoMethodError:: Raised by default implementation. # Should not be thrown. lib/merb_global/transfer.rb @@ -167,15 +167,15 @@ if HAS_AR @provider.import(exporter, export_data) end end - + describe '.export' do it 'should delete all data' end - + describe '.export_language' do it 'should create a new language and yield its id' end - + describe '.export_string' do it 'should create a new translation row' end spec/providers/active_record_spec.rb @@ -73,7 +73,7 @@ if HAS_DM @provider.choose(['en']).should == 'fr' end end - + describe '.import' do it 'should iterate over the translations' do lang = Merb::Global::Providers::DataMapper::Language @@ -99,15 +99,15 @@ if HAS_DM @provider.import(exporter, export_data) end end - + describe '.export' do it 'should delete all data' end - + describe '.export_language' do it 'should create a new language and yield its id' end - + describe '.export_string' do it 'should create a new translation row' end spec/providers/data_mapper_spec.rb @@ -65,7 +65,7 @@ if HAS_GETTEXT @provider.choose(['en', 'pl']).should be_nil end end - + describe '.import' do it 'should iterate over the translations' do export_data = mock @@ -86,15 +86,15 @@ if HAS_GETTEXT @provider.import(exporter, export_data) end end - + #describe '.export' do # it 'should delete all data' #end - + #describe '.export_language' do # it 'should create a new language and yield its id' #end - + #describe '.export_string' do # it 'should create a new translation row' #end spec/providers/gettext_spec.rb @@ -126,7 +126,7 @@ if HAS_SEQUEL @provider.choose(['en']).should == 'fr' end end - + describe '.import' do it 'should iterate over the translations' do lang = Merb::Global::Providers::Sequel::Language @@ -152,15 +152,15 @@ if HAS_SEQUEL @provider.import(exporter, export_data) end end - + describe '.export' do it 'should delete all data' end - + describe '.export_language' do it 'should create a new language and yield its id' end - + describe '.export_string' do it 'should create a new translation row' end spec/providers/sequel_spec.rb @@ -56,7 +56,7 @@ describe Merb::Global::Providers::Yaml do @provider.choose(['pl']).should be_nil end end - + describe '.import' do it 'should iterate over the translations' do export_data = mock @@ -77,15 +77,15 @@ describe Merb::Global::Providers::Yaml do @provider.import(exporter, export_data) end end - + describe '.export' do it 'should delete all data' end - + describe '.export_language' do it 'should create a new language and yield its id' end - + describe '.export_string' do it 'should create a new translation row' end spec/providers/yaml_spec.rb c5d6b5adbcf1377e3730099ddf44e8ba1ac14257 Alex Coles alexbcoles@mac.com http://github.com/myabc/merb_global/commit/465b03781b5bce98357414a2f527af8b1c6e4551 465b03781b5bce98357414a2f527af8b1c6e4551 2008-06-24T08:18:25-07:00 2008-06-24T08:18:25-07:00 Cleaning up whitepace using sake 'strip' 1c02005d0ab0809b749a6e284868dc18b2933922 Alex Coles alexbcoles@mac.com