./lib/common/url.rb in lux-fw-0.1.35 vs ./lib/common/url.rb in lux-fw-0.2.1

@@ -11,16 +11,18 @@
 
   attr_accessor :proto, :host, :port
 
   class << self
     def current
-      new Lux.page.request.url
+      new Lux.current.request.url
     end
 
     def force_locale loc
-      u = current
-      u.locale loc
-      u.relative
+      # u = current
+      # u.locale loc
+      # u.relative
+
+      '/' + loc.to_s + Lux.current.nav.full
     end
 
     def subdomain name,  in_path=nil
       b = current.subdomain(name)
       b.path in_path if in_path
\ No newline at end of file