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/zones/edit.html.erb
+++ b/app/views/settings/zones/edit.html.erb
@@ -5,7 +5,7 @@
  			<li class="breadcrumb-item"><a href="<%= settings_zones_path %>">Zones</a></li>
 		  	<li class="breadcrumb-item active">Edit</li>
 		  	<span class="float-right">
-		    	<%= link_to t('.new', :default => t("views.btn.new")), settings_zones_path %>
+		  		<%= link_to t("views.btn.back"), settings_zones_path %> 		    	
 		  	</span>
 		 </ul>
 		</div>