merge with origin and add localize

2017-10-13 17:07:17 +06:30
parent 1ba68cd152
commit bfe3727e7d
41 changed files with 91 additions and 84 deletions
--- a/app/views/settings/employees/index.html.erb
+++ b/app/views/settings/employees/index.html.erb
@@ -10,7 +10,7 @@
 </div>
 <br>
 <div class="m-b-10 clearfix">
-  <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_employee_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
+  <%= link_to t("views.btn.new"),new_settings_employee_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
 </div>