From 24281ad9e2723650769b94ffd6fff9afc84e521b Mon Sep 17 00:00:00 2001 From: Godwin Date: Wed, 26 Aug 2015 21:02:08 -0700 Subject: [PATCH] Fixed translation, CDN, and POST issues for prod --- Gemfile | 22 +++++++++++++++++----- Gemfile.lock | 28 +++++++++++++++------------- app/views/shared/_footer.html.haml | 2 +- config/application.rb | 1 + config/environments/production.rb | 11 ++++++----- config/locales/en.yml | 29 +++++++++++++++-------------- config/locales/es.yml | 2 -- config/routes.rb | 2 +- 8 files changed, 56 insertions(+), 41 deletions(-) diff --git a/Gemfile b/Gemfile index 62ea2ec..b2043b5 100644 --- a/Gemfile +++ b/Gemfile @@ -6,11 +6,23 @@ gem 'haml' gem 'jquery-rails' gem 'jquery-ui-rails' gem 'coffee-rails', '~> 4.0.0' -gem 'lingua_franca', :git => 'git://github.com/lingua-franca/lingua_franca.git' + +if Dir.exists?('../lingua_franca') + gem 'lingua_franca', :path => '../lingua_franca' +else + gem 'lingua_franca', :git => 'git://github.com/lingua-franca/lingua_franca.git' +end + gem 'tzinfo-data' gem 'sass'#, '~> 3.4.13' -gem 'sass-rails'#, :git => 'git://github.com/rails/sass-rails.git', :tag => 'v4.0.5' -gem 'bumbleberry', :git => 'git://github.com/bumbleberry/bumbleberry.git' +gem 'sass-rails' + +if Dir.exists?('../bumbleberry') + gem 'bumbleberry', :path => "../bumbleberry" +else + gem 'bumbleberry', :git => 'git://github.com/bumbleberry/bumbleberry.git' +end + gem 'foundation-rails' gem 'uglifier', '>= 1.3.0' gem 'sorcery', '>= 0.8.1' @@ -24,7 +36,7 @@ gem 'geocoder' gem 'paper_trail', '~> 3.0.5' gem 'font-awesome-rails' gem 'wysiwyg-rails' -gem 'rails-assets-cdn' +#gem 'rails-assets-cdn' gem 'sitemap_generator' gem 'activerecord-session_store' gem 'paypal-express', '0.7.1' @@ -68,7 +80,7 @@ group :staging, :production, :preview do end group :production, :preview do - #gem 'unicorn' + gem 'unicorn' gem 'daemon-spawn' end diff --git a/Gemfile.lock b/Gemfile.lock index 14865ec..aefca1a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,5 @@ -GIT - remote: git://github.com/bumbleberry/bumbleberry.git - revision: bd3f458d81305df42076e1d2512eb5eebeb050b6 +PATH + remote: ../bumbleberry specs: bumbleberry (0.0.1) blockspring @@ -10,9 +9,8 @@ GIT sass-json-vars sass-rails -GIT - remote: git://github.com/lingua-franca/lingua_franca.git - revision: fe9f8cdca3f7d180157086116766bb8622d0bdb3 +PATH + remote: ../lingua_franca specs: lingua_franca (0.0.1) diffy @@ -93,7 +91,7 @@ GEM net-sftp (>= 2.0.0) net-ssh (>= 2.0.14) net-ssh-gateway (>= 1.1.0) - capybara (2.4.4) + capybara (2.5.0) mime-types (>= 1.16) nokogiri (>= 1.3.3) rack (>= 1.0.0) @@ -233,6 +231,7 @@ GEM json (1.8.3) jwt (0.1.13) multi_json (>= 1.5) + kgio (2.9.3) launchy (2.4.3) addressable (~> 2.3) listen (3.0.3) @@ -320,8 +319,6 @@ GEM bundler (>= 1.3.0, < 2.0) railties (= 4.2.0) sprockets-rails - rails-assets-cdn (0.1.0) - rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) rails-dom-testing (1.0.7) @@ -343,6 +340,7 @@ GEM activesupport (= 4.2.0) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) + raindrops (0.15.0) rake (10.4.2) rb-fsevent (0.9.5) rb-inotify (0.9.5) @@ -390,7 +388,7 @@ GEM rvm-capistrano (1.5.6) capistrano (~> 2.15.4) safe_yaml (1.0.4) - sass (3.4.16) + sass (3.4.18) sass-json-vars (0.3.2) sass (>= 3.1) sass-rails (5.0.3) @@ -418,7 +416,7 @@ GEM bcrypt (~> 3.1) oauth (~> 0.4, >= 0.4.4) oauth2 (>= 0.8.0) - sprockets (3.3.2) + sprockets (3.3.3) rack (~> 1.0) sprockets-rails (2.3.2) actionpack (>= 3.0) @@ -434,13 +432,17 @@ GEM thread_safe (~> 0.1) tzinfo-data (1.2015.6) tzinfo (>= 1.0.0) - uglifier (2.7.1) + uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) unf (0.1.4) unf_ext unf_ext (0.0.7.1) unf_ext (0.0.7.1-x86-mingw32) + unicorn (4.9.0) + kgio (~> 2.6) + rack + raindrops (~> 0.7) wdm (0.1.1) webmock (1.21.0) addressable (>= 2.3.6) @@ -498,7 +500,6 @@ DEPENDENCIES pg poltergeist rails (= 4.2.0) - rails-assets-cdn rails_12factor redcarpet rspec @@ -513,6 +514,7 @@ DEPENDENCIES sorcery (>= 0.8.1) tzinfo-data uglifier (>= 1.3.0) + unicorn wdm (>= 0.1.0) webmock wysiwyg-rails diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml index 2907ebc..2da428d 100644 --- a/app/views/shared/_footer.html.haml +++ b/app/views/shared/_footer.html.haml @@ -16,7 +16,7 @@ =_!I18n.locale.upcase .selector %ul - -I18n.backend.available_locales.each do |locale| + -I18n.backend.enabled_locales.each do |locale| %li %a{href: request.original_url.gsub(/^(https?:\/\/)(preview\-)?(..\.)?(.*)$/, '\1\2' + locale + '.\4')} =_! locale.upcase diff --git a/config/application.rb b/config/application.rb index 0bfedde..90fc5d3 100644 --- a/config/application.rb +++ b/config/application.rb @@ -24,6 +24,7 @@ module BikeBike # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] + config.action_controller.default_url_options = { :trailing_slash => true } config.i18n.default_locale = :en config.i18n.enforce_available_locales = false self.paths['config/database'] = Rails.root.join('config', 'database.yml') diff --git a/config/environments/production.rb b/config/environments/production.rb index 49b660a..cf3a012 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -65,8 +65,9 @@ BikeBike::Application.configure do # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. # config.assets.precompile += %w( search.js ) - config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif) - config.action_controller.asset_host = "https://cdn.bikebike.org" + #config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif) + config.assets.precompile += %w(*.png *.jpg *.jpeg *.gif *.svg application/*.scss web-fonts/*.scss) + #config.action_controller.asset_host = "https://cdn.bikebike.org" # Ignore bad email addresses and do not raise email delivery errors. # Set this to true and configure the email server for immediate delivery to raise delivery errors. @@ -89,13 +90,13 @@ BikeBike::Application.configure do config.action_mailer.smtp_settings = { :enable_starttls_auto => true, :address => 'mail.bikebike.org', - :domain => 'bikebike.org', + :domain => 'preview.bikebike.org', :port => 587, :authentication => :plain, :enable_starttls_auto => true, :openssl_verify_mode => 'none', - :user_name => 'info@bikebike.org', - :password => 'NewOrleans@)!#' + :user_name => 'info@preview.bikebike.org', + :password => 'test' } config.action_mailer.raise_delivery_errors = true config.action_mailer.perform_deliveries = true diff --git a/config/locales/en.yml b/config/locales/en.yml index 6327ff3..410e699 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -5191,9 +5191,6 @@ en: use_custom_value: Use a custom value explain_zero_fallback: This translation will use the plural version for the number 0 - test: - one: Test - other: Tests content: needs_translations: This page contains untranslated content requires_translation: This %{model} is in %{language}. @@ -5457,17 +5454,19 @@ en: theme: Which of the themes below best match your workshop? This will help hosts to avoid scheduling conflicts. Select other if none of the options match in any way. - new_workshop: Workshops are organized and run by attendees, they can be about - anything that might concern community bicycle projects and can be in any - format including presentations, hands-on workshops, discussion groups, and - bicycle rides. If you would like to host you own workshop you can click - on the "create workshop" button. - Workshops: Duis bibendum, felis sed interdum venenatis, turpis enim blandit - mi, in porttitor pede justo eu massa. Donec dapibus. Duis at velit eu est - congue elementum. In hac habitasse platea dictumst. Morbi vestibulum, velit - id pretium iaculis, diam erat fermentum justo, nec condimentum neque sapien - placerat ante. Nulla justo. Aliquam quis turpis eget elit sodales scelerisque. - Mauris sit amet eros. Suspendisse accumsan tortor quis turpis. Sed ante + new_workshop: 'Workshops in the past have tended to fit into a few broad categories: + structural/organizational (how to start a shop, how to register a non-profit, + consensus decision making, etc,) mechanical (how to weld two tandems to + a tall bike, building 3-speed hubs out of fishing tackle and old socks, + etc,) anti-oppression (safe spaces, women’s workshops, etc,) and recreational + (touring tips, yoga for cyclists, etc.) This year we would like to try a + panel, a forum, or other types of settings that you think might facilitate + learning – be inventive, let us know what you want to see!' + Workshops: Do you have an exciting skill to share with us?  Want to chat about + creating safe community spaces?  Want to make sure we fit a good bike ride + into the weekend?  Propose a workshop!  Don’t worry if you’re not an expert, + we want to hear about everyone’s experience within the many configurations + of community shops we’re coming from. section_content: bikebike: about_bikebike: Bike!Bike! is an international annual gathering organized by @@ -5521,6 +5520,8 @@ en: Registration_Stats: Registration Stats View_Workshop: View Workshop Workshops: Workshops + Delete_Workshop: Create Workshop + Edit_Workshop: Edit Workshop policy: Safer_Spaces_Policy: Safer Space Agreement '404': diff --git a/config/locales/es.yml b/config/locales/es.yml index 7c88a9f..a2e7cbf 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -791,9 +791,7 @@ es: The_Agreement: Acuerdo del Espacio Mas Seguro permission_denied: paragraphs: - translator_not_logged_in: Sorry you must be a translator to view this page headings: - login_required: Please Login forms: labels: generic: diff --git a/config/routes.rb b/config/routes.rb index 6b28bc8..21aaa2e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -88,7 +88,7 @@ BikeBike::Application.routes.draw do # get '/confirm/:token' => 'application#confirm', :as => :confirm #post '/doconfirm' => 'application#do_confirm', :as => :do_confirm - match '/doconfirm' => 'application#do_confirm', :as => :do_confirm, via: [:get, :post] + post '/doconfirm' => 'application#do_confirm', :as => :do_confirm post '/logout' => 'application#user_logout', :as => :logout post '/translator-request' => 'application#translator_request', :as => :translator_request