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/commissions/index.html.erb
+++ b/app/views/settings/commissions/index.html.erb
@@ -3,7 +3,7 @@
    <li><a href="<%= settings_commissions_path %>">Home</a></li>
    <li>Commissions</li>
    <span style="float: right">
-    <%= link_to t('.new', :default => t("helpers.links.new")), new_settings_commission_path, :class => 'btn btn-primary btn-sm' %>
+    <%= link_to t("views.btn.new"), new_settings_commission_path, :class => 'btn btn-primary btn-sm' %>
  </span>
  </ul>
 </div>