diff --git a/models/site.rb b/models/site.rb index 3c9e1dd9..5363623e 100644 --- a/models/site.rb +++ b/models/site.rb @@ -912,14 +912,6 @@ class Site < Sequel::Model end end - def hits_english - values[:hits].to_s.reverse.gsub(/...(?=.)/,'\&,').reverse - end - - def views_english - values[:views].to_s.reverse.gsub(/...(?=.)/,'\&,').reverse - end - def screenshots_delete(path) SCREENSHOT_RESOLUTIONS.each do |res| begin diff --git a/views/browse.erb b/views/browse.erb index 2061152b..4363a15e 100644 --- a/views/browse.erb +++ b/views/browse.erb @@ -80,9 +80,9 @@
<% if params[:sort_by] == 'hits' %> - <%= site.hits %> hit<%= site.hits == 1 ? '' : 's' %> + <%= site.hits.format_large_number %> hit<%= site.hits == 1 ? '' : 's' %> <% else %> - <%= site.views %> view<%= site.views == 1 ? '' : 's' %> + <%= site.views.format_large_number %> view<%= site.views == 1 ? '' : 's' %> <% end %>
diff --git a/views/home.erb b/views/home.erb index 7056bec9..87a82cbc 100644 --- a/views/home.erb +++ b/views/home.erb @@ -67,7 +67,7 @@
- <%= suggested_site.views %> view<%= suggested_site.views == 1 ? '' : 's' %> + <%= suggested_site.views.format_large_number %> view<%= suggested_site.views == 1 ? '' : 's' %>
@@ -97,9 +97,9 @@ <% end %>
-
<%= site.views_english %> unique views
-
<%= site.hits_english %> hits
-
<%= site.follows_dataset.count %> followers
+
<%= site.views.format_large_number %> unique views
+
<%= site.hits.format_large_number %> hits
+
<%= site.follows_dataset.count.format_large_number %> followers
diff --git a/views/site.erb b/views/site.erb index 34840dee..944ab6b1 100644 --- a/views/site.erb +++ b/views/site.erb @@ -22,9 +22,9 @@

<%= site.title %> <% if site.supporter? %> <% end %>

<%= site.host %>

-
<%= site.views_english %> views
-
<%= site.hits_english %> hits
-
<%= site.follows_dataset.count %> followers
+
<%= site.views.format_large_number %> views
+
<%= site.hits.format_large_number %> hits
+
<%= site.follows_dataset.count.format_large_number %> followers
@@ -107,8 +107,8 @@ <% end %>
-
Number of updates<%= site.changed_count %>
-
Created<%= site.created_at.strftime('%B %-d, %Y') %>
+
Number of updates<%= site.changed_count.format_large_number %>
+
Created<%= site.created_at.strftime('%b %-d, %Y') %>
<%== erb :'_follows', layout: false, locals: {site: site, is_current_site: site == current_site} %>