Permalink
Browse files

Fixing conflicts

  • Loading branch information...
2 parents ba5e93f + bb33707 commit 690c5f055b7357716ecc4464ce96906bc23bde82 @rorra rorra committed Jan 28, 2012
View
@@ -33,6 +33,7 @@ config/deploy/*.json
!config/deploy/example_site.rb
*.pid
ical
+log/*.db
db/*.db
db/*.sqlite3
config/initializers/your_site_host.rb
View
@@ -15,7 +15,7 @@ gem "friendly_id", '3.3.1'
gem 'will_paginate'
gem "oauth-plugin", ">= 0.4.0.pre1"
gem "twitter", :git => "https://github.com/jnunemaker/twitter.git"
-gem "mysql"
+gem "mysql2"
gem "bitly"
gem "redis"
gem "redis-namespace"
@@ -33,7 +33,8 @@ gem 'routing-filter'
# JVD: having problems getting this working with an empty database
# The gem tries to load the locales table before it exists.
-gem 'i18n_backend_database', :git => "git://github.com/rorra/i18n_backend_database.git"
+# Patched this to fix issues with the Translation model
+gem 'i18n_backend_database', :git => "git://github.com/chewbranca/i18n_backend_database.git"
# JVD: Use this when developing, checkout the i18n_backend_database to ../
# gem 'i18n_backend_database', :path => "../i18n_backend_database"
View
@@ -1,4 +1,11 @@
GIT
+ remote: git://github.com/chewbranca/i18n_backend_database.git
+ revision: 3c5be2c7b79ec9e0c3283de82d913e840e06c9c5
+ specs:
+ i18n_backend_database (0.0.1)
+ rails (>= 3)
+
+GIT
remote: git://github.com/chriseppstein/compass.git
revision: 8c84869b0b6bc5396e264fea15c71d4e346ac5d0
specs:
@@ -190,7 +197,7 @@ GEM
multi_json (1.0.4)
multi_xml (0.4.1)
multipart-post (1.1.4)
- mysql (2.8.1)
+ mysql2 (0.3.11)
net-scp (1.0.4)
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
@@ -368,7 +375,7 @@ DEPENDENCIES
launchy
loofah
mogli
- mysql
+ mysql2
newrelic_rpm
nokogiri
oauth-plugin (>= 0.4.0.pre1)
View
@@ -86,6 +86,7 @@ The primary(required) config files are:
* database.yml
* facebooker.yml -- remember to set callback_url to your base site, ie http://my.site.com
+ * locales.yml -- select the languagues you will be using
The optional config files for advanced settings are:
@@ -96,7 +97,6 @@ The optional config files for advanced settings are:
* menu.yml -- configure what menu items you want to appear in your application
* application.god for use with the [God monitoring system](http://god.rubyforge.org/)
* unicorn.conf.rb
- * locales.yml -- select the languagues you will be using
* There are a number of other advanced files in the config directory
We provide .sample files for the majority of these config files to facilitate easy setup.
@@ -122,8 +122,9 @@ Now that we got the hard part out of the way, there are just a few commands left
# Install the required gems
bundle install
# Run the newscloud setup process, this will create your database along with configuring your application
- LOCALE_FILE=./config/locales.yml rake n2:setup
-
+ rake n2:setup
+ # Load the default locales
+ bundle exec rake i18n:populate:load_default_locales LOCALE_FILE=config/locales.yml
Post Installation
-----------------
Oops, something went wrong.

0 comments on commit 690c5f0

Please sign in to comment.