merge with origin and add localize

This commit is contained in:
Yan
2017-10-13 17:07:17 +06:30
parent 1ba68cd152
commit bfe3727e7d
41 changed files with 91 additions and 84 deletions

View File

@@ -55,7 +55,7 @@
<div class="card-block">
<h4 class="card-title">Menu Categories
<span style="float: right">
<%= link_to t('.new', :default => t("helpers.links.new")),new_settings_menu_menu_category_path(@settings_menu),:class => 'btn btn-primary btn-sm' %>
<%= link_to t("views.btn.new"),new_settings_menu_menu_category_path(@settings_menu),:class => 'btn btn-primary btn-sm' %>
</span>
</h4>
@@ -79,7 +79,7 @@
<td><%= category.menu_items.count %></td>
<td><%= category.order_by %></td>
<td><%= category.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
<td><%= link_to 'Edit', edit_settings_menu_menu_category_path(@settings_menu, category),:class => 'btn btn-info btn-sm waves-effect' %></td>
<td><%= link_to t("views.btn.edit"), edit_settings_menu_menu_category_path(@settings_menu, category),:class => 'btn btn-info btn-sm waves-effect' %></td>
</tr>
<% end %>
</tbody>