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/order_queue_stations/index.html.erb
+++ b/app/views/settings/order_queue_stations/index.html.erb
@@ -14,7 +14,7 @@
 <div class="row">
  <div class="col-xs-12 col-sm-12 col-md-9 col-lg-9">
  <div class="m-b-10 clearfix">
-  <%= link_to t('.new', :default => t("helpers.links.new")),new_settings_order_queue_station_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
+  <%= link_to t("views.btn.new"),new_settings_order_queue_station_path,:class => 'btn btn-primary btn-lg float-right waves-effect"' %>
 </div>
    <div class="card">
      <table class="table">