fix small details

lab2023 · Jun 21, 2016 · 0c104e3 · 0c104e3
1 parent d19a4b5
commit 0c104e3
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/templates/app/controllers/user/user_application_controller.rb b/templates/app/controllers/user/user_application_controller.rb
@@ -2,6 +2,7 @@
 
 class User::UserApplicationController < ActionController::Base
   # layout 'user/application'
+  layout 'application'
   before_action :authenticate_user!
   self.responder = ApplicationResponder
   respond_to :html, :json

diff --git a/templates/app/views/hq/dashboard/index.html.haml b/templates/app/views/hq/dashboard/index.html.haml
@@ -3,6 +3,6 @@
     .row
       .col-lg-12
         .alert.alert-info
-          = t('view.hello', email: current_admin.email)
+          = t('view.hello', user: current_admin.email)
         = link_to t('navbar.sign_out'), destroy_admin_session_path, method: :delete, class: 'btn btn-danger'
         = link_to t('navbar.edit_login_info'), edit_admin_registration_path, class: 'btn btn-primary'
diff --git a/templates/app/views/user/dashboard/index.html.haml b/templates/app/views/user/dashboard/index.html.haml
@@ -3,6 +3,6 @@
     .row
       .col-lg-12
         .alert.alert-info
-          = t('view.hello', email: current_user.email)
+          = t('view.hello', user: current_user.email)
         = link_to t('navbar.sign_out'), destroy_user_session_path, method: :delete, class: 'btn btn-danger'
         = link_to t('navbar.edit_login_info'), edit_user_registration_path, class: 'btn btn-primary'
diff --git a/templates/config/locales/view.tr.yml b/templates/config/locales/view.tr.yml
@@ -20,6 +20,7 @@ tr:
     reset: Temizle
     quick_search: Arama yap..
     reload: Yeniden yükle
+    hello: Merhaba %{user}
     there_is_no_data: Hiç %{resource} eklenmemiş.
   navbar:
     settings: Ayarlar