tusur_header 0.2.12 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5af34bb4965438c94cc96bbfb6d371b4f93c5f06
-  data.tar.gz: 276d3b0ad6646df97e2720c673b24c27cb8f8b4c
+  metadata.gz: 4657ce71e37c0baf00d4553b6afc990182f22f3e
+  data.tar.gz: ff0d8975de0a2425fe4a7fce3caf74b888325d2b
 SHA512:
-  metadata.gz: 7d370be982361995bcfae9fe673f0364e1d1825bdd1616ef323ca9fcb51e994fcebc366d91d688bf1ab1c66d2660e043baeb3ad8dae03043bb6c4f392f66c82a
-  data.tar.gz: e84fdc49c481ba90b99556e10b7ac44b2440ff6a9aaea8e14fc0aa1e82003247426916552ed18b122d4f38c976393780ef3f87c11c29e85e0e86fc93443b01e0
+  metadata.gz: b6f8573fc8aa094943644fbe77dbc5863005cb3002603ddb3c79a0a81d1c6be7814a958a74de06b45557e74bf043471685b1c32ed41f17bec6e1a529059a11aa
+  data.tar.gz: 174e6479ef7d6dcbbc9156d0daa45012e374b380d2d0f1030130971365d8d9e5666ee9b5d889627d2b49a587f006d4a3276b03d35e46ac4ceb6494664952161c

data/lib/tusur_header/menu_links.rb

@@ -58,7 +58,7 @@ module TusurHeader
     end
 
     def edit_user_url
-      I18n.locale != :ru ? %(#{edit_user_link}/#{I18n.locale}/users/edit) : %(#{edit_user_link}/users/edit)
+      %(#{edit_user_link}/#{ I18n.locale == :ru ? nil : %(#{I18n.locale}/) }users/edit)
     end
 
     def sign_out_link
@@ -66,7 +66,7 @@ module TusurHeader
     end
 
     def sign_out_url
-      "#{sign_out_link}/#{I18n.locale}/users/sign_out?redirect_url=#{Settings['app.url']}"
+      "#{sign_out_link}/#{ I18n.locale == :ru ? nil : %(#{I18n.locale}/) }users/sign_out?redirect_url=#{Settings['app.url']}"
     end
 
     def links_from_system_infos(key)
@@ -89,7 +89,10 @@ module TusurHeader
                         end
 
                         urls = []
-                        urls << { title: I18n.t('menu_links.profile'), url: "#{profile_url}/#{I18n.locale}/dashboard" }
+                        urls << {
+                          title: I18n.t('menu_links.profile'),
+                          url: "#{profile_url}/#{ I18n.locale == :ru ? nil : %(#{I18n.locale}/) }dashboard"
+                        }
                         if links_from_system_infos('url').any?
                           links_from_system_infos('url').reject{ |elem| elem['link'].blank? }.each do |elem|
                             urls << { title: elem['title'], url: elem['link'] }

data/lib/tusur_header/version.rb

@@ -1,3 +1,3 @@
 module TusurHeader
-  VERSION = '0.2.12'
+  VERSION = '0.2.13'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tusur_header
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Evgeny Lapin