@@ -95,7 +95,11 @@ task :package => [:makemo] ############################################################ Rake::RDocTask.new { |rdoc| - allison = `allison --path`.chop + begin + allison = `allison --path`.chop + rescue + allison = '' + end rdoc.rdoc_dir = 'doc' rdoc.title = "gettext_rails API Reference" rdoc.options << '--line-numbers' << '--inline-source' @@ -116,3 +120,11 @@ task :release => [ :package ] do "pkg/gettext_rails-#{PKG_VERSION}.gem") end +# Run the unit tests +desc 'Run tests' +task :test do + cd "test" + sh $0 + " test" + cd ".." +end + Rakefile @@ -8,7 +8,6 @@ Original: gettext/lib/rails.rb from Ruby-GetText-Package-1.93.0 - $Id$ =end module ActionView #:nodoc: @@ -16,9 +15,9 @@ module ActionView #:nodoc: module DateHelper #:nodoc: all include GetText - bindtextdomain "rails" + bindtextdomain "gettext_rails" - alias distance_of_time_in_words_without_locale distance_of_time_in_words #:nodoc: + alias distance_of_time_in_words_without_gettext_rails distance_of_time_in_words #:nodoc: # This is FAKE constant. The messages are found by rgettext as the msgid. MESSAGESS = [N_('less than 5 seconds'), N_('less than 10 seconds'), N_('less than 20 seconds'), @@ -31,7 +30,7 @@ module ActionView #:nodoc: NYEARS = [/^over (\d+) years?$/, Nn_('over 1 year', 'over %{num} years')] def distance_of_time_in_words(from_time, to_time = 0, include_seconds = false) - msg = distance_of_time_in_words_without_locale(from_time, to_time, include_seconds) + msg = distance_of_time_in_words_without_gettext_rails(from_time, to_time, include_seconds) match = false [NMINUTES, NHOURS, NDAYS, NMONTHS, NYEARS].each do |regexp, nn| if regexp =~ msg lib/gettext_rails/action_view/date_helper.rb @@ -38,7 +38,17 @@ Rails::Initializer.run do |config| # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')] # config.i18n.default_locale = :de - config.gem "locale_rails" - config.gem "gettext_activerecord" - config.gem "gettext_rails" +# config.gem "locale_rails" +# config.gem "gettext_activerecord" +# config.gem "gettext_rails" end + +$LOAD_PATH.unshift RAILS_ROOT + "/../../locale/lib" +$LOAD_PATH.unshift RAILS_ROOT + "/../../locale_rails/lib" +$LOAD_PATH.unshift RAILS_ROOT + "/../../gettext/lib" +$LOAD_PATH.unshift RAILS_ROOT + "/../../gettext_activerecord/lib" +$LOAD_PATH.unshift RAILS_ROOT + "/../../gettext_rails/lib" + +require 'locale_rails' +require 'gettext_activerecord' +require 'gettext_rails' test/config/environment.rb @@ -24,4 +24,14 @@ config.action_mailer.delivery_method = :test # Use SQL instead of Active Record's schema dumper when creating the test database. # This is necessary if your schema can't be completely dumped by the schema dumper, # like if you have constraints or database-specific column types -# config.active_record.schema_format = :sql \ No newline at end of file +# config.active_record.schema_format = :sql +$LOAD_PATH.unshift RAILS_ROOT + "/../../locale/lib" +$LOAD_PATH.unshift RAILS_ROOT + "/../../locale_rails/lib" +$LOAD_PATH.unshift RAILS_ROOT + "/../../gettext/lib" +$LOAD_PATH.unshift RAILS_ROOT + "/../../gettext_activerecord/lib" +$LOAD_PATH.unshift RAILS_ROOT + "/../../gettext_rails/lib" + +require 'locale_rails' +require 'gettext_activerecord' +require 'gettext_rails' + test/config/environments/test.rb @@ -22,8 +22,8 @@ environ 1 mois<br/> 2 mois<br/> environ 1 an<br/> - over 2 years<br/> - over 4 years<br/> + plus de 2 ans<br/> + plus de 4 ans<br/> test/test/result/fr/distance_of_time_in_words.html test/vendor/plugins/gettext test/vendor/plugins/gettext_activerecord test/vendor/plugins/gettext_rails test/vendor/plugins/locale test/vendor/plugins/locale_rails 0214d40495a4082caa8450e50ff89b28f7125b60 Masao Mutoh mutomasa@gmail.com http://github.com/mutoh/gettext_rails/commit/52426fd70d736ca6c805e4d3a61fab4f9d05c896 52426fd70d736ca6c805e4d3a61fab4f9d05c896 2009-11-06T21:15:03-08:00 2009-11-06T21:15:03-08:00 Fixed to work distance_of_time_in_words. Reported by Mitko Kostov, Bart ten Brinke. 4eea5c854ea71896939ab045edd9536ae100cfbd Masao Mutoh mutomasa@gmail.com