Merge branch 'master' of github.com:neocities/neocities

Gemfile

@@ -26,6 +26,7 @@ gem 'thread'
 gem 'scrypt'
 gem 'rack-cache'
 gem 'rest-client'
+gem 'geoip'
 
 platform :mri, :rbx do
   gem 'magic' # sudo apt-get install file, For OSX: brew install libmagic

Gemfile.lock

@@ -62,6 +62,7 @@ GEM
       ffi (>= 1.0.0)
       rake
     filesize (0.0.3)
+    geoip (1.5.0)
     google-api-client (0.7.1)
       addressable (>= 2.3.2)
       autoparse (>= 0.3.3)
@@ -242,6 +243,7 @@ DEPENDENCIES
   fabrication
   faker
   filesize
+  geoip
   google-api-client
   hiredis
   jdbc-postgres

views/plan/_pricing.erb

@@ -134,7 +134,7 @@
             <strong>It's safe.</strong> We use <a href="https://stripe.com" target="_blank">Stripe</a> for payments, and never store your credit card information directly.
           </li>
           <li>
-            <strong>It's affordable, only <strong>$<%= Site::PLAN_FEATURES[:supporter][:price] %> per month</strong>.
+            <strong>It's affordable.</strong> Only $<%= Site::PLAN_FEATURES[:supporter][:price] %> per month.
           </li>
           <li>
             <strong>You can cancel or change plans anytime.</strong> If you do, we'll refund or credit the amount you didn't use.