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

@@ -42,8 +42,8 @@
<td><%= @room.created_by %></td>
<% end %>
<td><%= @room.created_at.utc.getlocal.strftime("%Y-%m-%d/%I:%M %p") %></td>
<td><%= link_to 'Edit', edit_settings_zone_room_path(@zone,@room) %>
<%= link_to 'Destroy', settings_zone_room_path(@zone,@room), method: :delete, data: { confirm: 'Are you sure?' } %></td>
<td><%= link_to t("views.btn.edit"), edit_settings_zone_room_path(@zone,@room) %>
<%= link_to t("views.btn.delete"), settings_zone_room_path(@zone,@room), method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
</tbody>
</table>