lib/ubiquo/template.erb in ubiquo-0.1.3 vs lib/ubiquo/template.erb in ubiquo-0.1.4

@@ -11,11 +11,10 @@
   ubiquo_jobs
   ubiquo_i18n
   ubiquo_activity
   ubiquo_versions
   ubiquo_guides
-  <%= "ubiquo_design" if @opts[:gnuine] %>
 ]
 
 choosen_plugin_set = "<%= @opts[:profile].to_s %>"
 
 case choosen_plugin_set
@@ -161,23 +160,23 @@
   pool: 5
   timeout: 5000
 
 development:
   <<: *base_config  
-  dbfile: db/#{appname}_development.db
+  database: db/#{appname}_development.db
   
 test:
   <<: *base_config
-  dbfile: db/#{appname}_test.db
+  database: db/#{appname}_test.db
 
 preproduction:
   <<: *base_config
-  dbfile: db/#{appname}_preproduction.db
+  database: db/#{appname}_preproduction.db
 
 production:
   <<: *base_config
-  dbfile: db/#{appname}_production.db
+  database: db/#{appname}_production.db
 CODE
 
 choosen_adapter = "<%= @opts[:database] %>"
 case choosen_adapter
   when "mysql" then file 'config/database.yml', mysql
@@ -194,10 +193,11 @@
   map.namespace :ubiquo do |ubiquo|
   end
 
   # Ubiquo plugins routes. See routes.rb from each plugin path.
 #{ubiquo_routes}
+<%= "map.from_plugin :ubiquo_design" if opts[:gnuine] %>
   ############# default routes
   #map.connect ':controller/:action/:id'
   #map.connect ':controller/:action/:id.:format'
 end
 CODE
@@ -242,16 +242,16 @@
 
 # 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}')]
   # config.i18n.default_locale = :de  
   config.i18n.load_path += Dir.glob(File.join("config", "locales", "**","*.{rb,yml}"))
-  config.i18n.default_locale = :en
+  config.i18n.default_locale = :<%= @opts[:locale] %>
 end
 CODE
 ubiquo_branch = <%= @opts[:template] == :edge ? 'nil' : "'0.7-stable'" %>
 add_plugins(selected_plugins + external_plugins, :branch => ubiquo_branch, :devel => <%= @opts[:devel] ? true : false %>)
 
-<% if @opts[:gnuine] %>
+<% if @opts[:gnuine] && opts[:profile] == :complete %>
 plugin 'ubiquo_design', :git => '[e-mail]:ubiquo_design.git', :submodule => true, :branch => ubiquo_branch
 <% end %>
 
 rake("rails:update")
 rake("calendardateselect:install")