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/origami/in_duties/index.html.erb
+++ b/app/views/origami/in_duties/index.html.erb
@@ -35,7 +35,7 @@
    <%= render 'form', in_duty: @in_duty, table: @table %>
  </div>
  <span style="float: right">
-    <%= link_to t('.new', :default => t("helpers.links.new")), new_origami_in_duty_path, :class => 'btn bg-blue' %>
+    <%= link_to t("views.btn.new"), new_origami_in_duty_path, :class => 'btn bg-blue' %>
  </span>
 </div>