tr8n 3.0.3 → 3.0.5

data/VERSION

@@ -1 +1 @@
-3.0.3
+3.0.5

data/app/views/tr8n/home/index.html.erb

@@ -28,7 +28,6 @@
 	    <li><%=link_to("Tr8n Label Internationalization", "http://wiki.tr8n.org/index.php?title=Tr8n_Label_Internationalization")%></li>
 	    <li><%=link_to("Tr8n Rules Engine Configuration Guide", "http://wiki.tr8n.org/index.php?title=Tr8n_Rules_Engine_Configuration_Guide")%></li>
 		</ul>
-		
 	</div>
 	
 <% end %>	

data/lib/application_helper.rb

@@ -55,8 +55,10 @@ module ApplicationHelper
   
   # translation functions
   def tr(label, desc = "", tokens = {}, options = {})
-    unless desc.nil? or desc.is_a?(String)
-      raise Tr8n::Exception.new("The second parameter of the tr function must be a description")
+    if desc.is_a?(Hash)
+      options = desc
+      tokens  = options[:tokens] || {}
+      desc    = options[:context] || ""
     end
 
     begin

data/lib/tr8n/controller_methods.rb

@@ -78,14 +78,10 @@ module Tr8n::ControllerMethods
     
     tr8n_current_user = nil
     if Tr8n::Config.site_user_info_enabled? 
-      if self.methods.include?(Tr8n::Config.current_user_method.to_sym)
-        begin
-          tr8n_current_user = eval(Tr8n::Config.current_user_method)
-          tr8n_current_user = nil if tr8n_current_user.class.name != Tr8n::Config.user_class_name
-        rescue Exception => ex
-          raise Tr8n::Exception.new("Tr8n cannot be initialized because #{Tr8n::Config.current_user_method} failed with: #{ex.message}")
-        end
-      else  
+      begin
+        tr8n_current_user = eval(Tr8n::Config.current_user_method)
+        tr8n_current_user = nil if tr8n_current_user.class.name != Tr8n::Config.user_class_name
+      rescue Exception => ex
         tr8n_current_user = Tr8n::Translator.new
         Tr8n::Logger.error("Site user integration is enabled, but #{Tr8n::Config.current_user_method} method is not defined")
       end
@@ -103,9 +99,19 @@ module Tr8n::ControllerMethods
     end
   end
 
+  ############################################################
+  # There are two ways to call the tr method
+  #
+  # tr(label, desc = "", tokens = {}, options = {})
+  # or 
+  # tr(label, {:context => "", tokens => {},  ...})
+  ############################################################
+  
   def tr(label, desc = "", tokens = {}, options = {})
-    unless desc.nil? or desc.is_a?(String)
-      raise Tr8n::Exception.new("The second parameter of the tr function must be a description")
+    if desc.is_a?(Hash)
+      options = desc
+      tokens  = options[:tokens] || {}
+      desc    = options[:context] || ""
     end
 
     begin

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tr8n
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 13
   prerelease: 
   segments: 
   - 3
   - 0
-  - 3
-  version: 3.0.3
+  - 5
+  version: 3.0.5
 platform: ruby
 authors: 
 - Michael Berkovich
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-19 00:00:00 -07:00
+date: 2011-06-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency