translations_ennder 1.1.2 → 1.1.3

data/.bnsignore

@@ -16,3 +16,6 @@ announcement.txt
 coverage
 doc
 pkg
+
+#Ennder
+bin/.directory

data/History.txt

@@ -54,4 +54,7 @@ RAILS_ROOT au lien de Rails.root, Rails n'est pas encore initalisé
 == 1.1.2 / 2011-03-22
 * trace changement de locale dans la session
 format date-heure short: JJ/MM/AASS HHhMM
-Enfin testé
+Enfin testé
+
+== 1.1.3 / 2011-03-29
+* monkey patching localisations réactivé pour Rails 3

data/app/helpers/application_helper.rb

@@ -2,7 +2,7 @@
 module ApplicationHelper
 	#Label de la forme : "<b><nom_colonne></b>: "
 	def label_bold_and_colon(object_name, method, text = nil, options = {})
-		Rails.logger.debug "DEBUG JBA : #{self.class.name}.label_bold_and_colon(#{object_name}, #{method}, #{text}, #{options})"
+#		Rails.logger.debug "DEBUG JBA : #{self.class.name}.label_bold_and_colon(#{object_name}, #{method}, #{text}, #{options})"
 		if text.blank?
 			label(true, object_name, method, method.humanize, true, options)
 		else

data/bin/.directory

@@ -0,0 +1,3 @@
+[Dolphin]
+Timestamp=2011,3,24,16,51,5
+ViewMode=1

data/lib/translations_ennder/rails.rb

@@ -6,14 +6,14 @@ def init_translations_ennder
 	I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), 'locales', 'en.yml'))
 	I18n.load_path.unshift File.expand_path(File.join(File.dirname(__FILE__), 'locales', 'fr.yml'))
 
-	if Rails::VERSION::MAJOR < 3
-		#JBA 2010-09-19, sera caduque avec Rails 3
+#	if Rails::VERSION::MAJOR < 3
+		#JBA 2011-03-29, sera caduque avec Rails 3 ?
 		#pour que to_s prenne en compte les formats localisés
 		#  Date.send :include, ConversionsWithI18nToS
 		#  Time.send :include, ConversionsWithI18nToS
 		ActiveSupport::TimeWithZone.send :include, ConversionsWithI18nToS
 		ActionView::Helpers::FormHelper.send :include, ConversionsWithI18nLabel
-	end
+#	end
 end
 
 
@@ -21,8 +21,9 @@ if Rails::VERSION::MAJOR < 3 then
 	#Rails 2
 
 	Rails.configuration.after_initialize do
-		_info = "gem translations_ennder V#{TranslationsEnnder.version}, Railx V2.x.y, init_translations_ennder() dans after_initialize"
+		_info = "GEM translations_ennder V#{TranslationsEnnder.version}, translations_ennder/rails.rb, Railx V2.x.y"
 
+		puts "Rails.configuration.after_initialize, RAILS_ROOT=[#{RAILS_ROOT}], RAILS_ENV=#{RAILS_ENV}"
 		if RAILS_DEFAULT_LOGGER.nil?
 			_logger = Logger.new( File.join(RAILS_ROOT, "log", "#{RAILS_ENV}.log") )
 		else
@@ -35,14 +36,8 @@ if Rails::VERSION::MAJOR < 3 then
 else
 	#Rails 3
 
-	_info = "gem translations_ennder V#{TranslationsEnnder.version}, Railx V3.x.y, init_translations_ennder()"
-
-	if Rails.logger.nil?
-		_logger = Logger.new(::Rails.root.to_s + "log/#{Rails.env}.log")
-	else
-		_logger = Rails.logger
-	end
-	_logger.info _info
+	# Rails n'est pas encore initalisé dans ce cas
+	puts "GEM translations_ennder V#{TranslationsEnnder.version}, translations_ennder/rails.rb, Railx V3.x.y"
 
 	init_translations_ennder
 end
@@ -73,10 +68,10 @@ module ActionController
 				set_locale_session_or_fr
 			end
 
-#			logger.debug "locale=[#{session[:locale]}]"
+#			logger.debug "GEM translations_ennder, locale=[#{session[:locale]}]"
 
 			if session[:locale] != I18n.locale
-				logger.debug "locale [#{session[:locale]}]=>[#{I18n.locale}]"
+				logger.debug "GEM translations_ennder, set_locale [#{session[:locale]}]=>[#{I18n.locale}]"
 				session[:locale] = I18n.locale
 			end
 		end

data/version.txt

@@ -1 +1 @@
-1.1.2
+1.1.3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: translations_ennder
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Ennder
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 +01:00
+date: 2011-03-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,14 +38,15 @@ description: "Ce plugin apporte des traductions standard en fran\xC3\xA7ais et a
   This plugin brings translations in french and english."
 email: mel@ennder.fr
 executables: 
+- .directory
 - translations_ennder
 extensions: []
 
 extra_rdoc_files: 
 - History.txt
+- bin/.directory
 - bin/translations_ennder
 - lib/.directory
-- lib/tasks/translations_ennder_tasks.rake
 - lib/translations_ennder/.directory
 - lib/translations_ennder/locales/.directory
 - lib/translations_ennder/locales/en.yml
@@ -58,9 +59,9 @@ files:
 - app/.directory
 - app/helpers/.directory
 - app/helpers/application_helper.rb
+- bin/.directory
 - bin/translations_ennder
 - lib/.directory
-- lib/tasks/translations_ennder_tasks.rake
 - lib/translations_ennder.rb
 - lib/translations_ennder/.directory
 - lib/translations_ennder/conversions_with_i18n_label.rb

data/lib/tasks/translations_ennder_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :translations_ennder do
-#   # Task goes here
-# end