refinerycms-core 2.1.5 → 3.0.0

data/config/locales/hu.yml

@@ -53,7 +53,9 @@ hu:
         results_for_html: "Keresési eredmények a következőhöz: &#8216;<em>%{query}</em>&#8217;"
         no_results: 'Sajnáljuk, nincs találat'
         cancel_search: 'Keresés megszakítása'
-        search_input_notice: "Írd ide amit keresel. Minimális hossz 3 karakter."
+        input:
+          placeholder: "Keres&8230;"
+          help: "Írd ide amit keresel. Minimális hossz 3 karakter."
       delete:
         message: "Biztosan ez akarod távolítani ezt: '%{title}'?"
       error_messages:

data/config/locales/it.yml

@@ -41,6 +41,8 @@ it:
         remove_current: "Rimuovi immagine corrente"
         change: "Clicca qui per scegliere un'immagine"
         show: Visualizza
+      locale_picker:
+        language: Lingua
       resource_picker:
         download_current: "Scarica il file corrente"
         opens_in_new_window: Apri in una nuova finestra
@@ -53,7 +55,9 @@ it:
         results_for_html: "Risultati della ricerca per &#8216;<em>%{query}</em>&#8217;"
         no_results: "Spiacenti, nessun risultato trovato"
         cancel_search: 'Annulla ricerca'
-        search_input_notice: "Scrivi qui una stringa di almeno 3 caratteri contenente quello che stai cercando."
+        input:
+          placeholder: "Cerca&8230;"
+          help: "Scrivi qui una stringa di almeno 3 caratteri contenente quello che stai cercando."
       delete:
         message: "Sei sicuro di voler rimuovere '%{title}'?"
       error_messages:

data/config/locales/ja.yml

@@ -59,14 +59,14 @@ ja:
       form_advanced_options_menu:
         advanced_options: その他の設定
         toggle_advanced_options: メタタグの設定とメニューオプションの設定
-        save_as_draft: 準備稿として保存する
+        save_as_draft: 下書きとして保存する
     message:
       close: 閉じる
       close_this_message: このメッセージを閉じる
     draft_page_message:
       not_live: このページはまだ公開されていません。
     footer:
-      copyright: '著作権© %{year} %{site_name}'
+      copyright: 'Copyright © %{year} %{site_name}'
     no_script:
       enable_javascript_html: このページを快適にお使いになるにはJavaScriptを有効にする必要があります。
       here_are:

data/config/locales/pt.yml

@@ -53,7 +53,9 @@ pt:
         results_for_html: "Resultados para &#8216;<em>%{query}</em>&#8217;"
         no_results: 'Não existem resultados para a sua procura'
         cancel_search: 'Cancelar procura'
-        search_input_notice: "Escreva aqui o que está à procura, o mínimo são 3 caractéres."
+        input:
+          placeholder: "Procurar&8230;"
+          help: "Escreva aqui o que está à procura, o mínimo são 3 caractéres."
       delete:
         message: "Tem a certeza que quer remover '%{title}'?"
       error_messages:
@@ -72,11 +74,11 @@ pt:
       copyright: "Copyright © %{year} %{site_name}"
     no_script:
       enable_javascript_html: É necessário que tenha o JavaScript ligado.
-      here_are: Aqui estão as 
+      here_are: Aqui estão as
       instructions_enable_javascript_html: instruções para ligar o JavaScript no seu browser.
   time:
     formats:
       short: "%A, %d %B %Y"
   will_paginate:
     previous_label: "&laquo;"
-    next_label: "&raquo;"
+    next_label: "&raquo;"

data/config/locales/ru.yml

@@ -1,5 +1,8 @@
 ru:
   refinery:
+    js:
+      admin:
+        confirm_changes: Любые сделанные изменения будут потеряны. Вы уверены, что хотите продолжить без сохранения?
     plugins:
       refinery_core:
         title: Refinery
@@ -49,6 +52,10 @@ ru:
         button_text: Поиск
         results_for_html: "Результаты поиска для &#8216;<em>%{query}</em>&#8217;"
         no_results: Ничего не найдено
+        cancel_search: Отмена поиска
+        input:
+          placeholder: "Поиск&8230;"
+          help: Введите строку содержащую то, что вы ищете, минимум 3 символа.
       delete:
         message: Вы уверены, что хотите удалить '%{title}'?
       error_messages:

data/config/locales/sl.yml

@@ -18,8 +18,6 @@ sl:
         show:
           save: Shrani
           cancel: Prekliči
-      message:
-        close: Zapri
       continue_editing:
         save_and_continue_editing: "Shrani & nadaljuj z urejanjem"
       form_actions:
@@ -40,7 +38,6 @@ sl:
         download_current: "Prenesi trenutno %{what}"
         opens_in_new_window: Odpri v novem oknu
         remove_current: "Odstrani trenutno %{what}"
-        resource: vir
       search:
         button_text: Išči
         results_for_html: "Iskalni rezultati za &#8216;<em>%{query}</em>&#8217;"

data/config/locales/tr.yml

@@ -2,78 +2,80 @@ tr:
   refinery:
     js:
       admin:
-        confirm_changes: Yaptiginiz degisiklikler kaybolacaktir. Kayit etmeden devam etmek istediginize emin misiniz ?
+        confirm_changes: Yaptığınız değişiklikler kaybolacaktır. Kayıt etmeden devam etmek istediğinize emin misiniz ?
     plugins:
       refinery_core:
         title: Refinery
-        description: Cekirdek refinery eklentisi
+        description: Çekirdek refinery eklentisi
       refinery_dialogs:
-        title: Iletisim
+        title: İletişim
         description: Refinery diyalog eklentisi
     welcome:
-      there_are_no_users: "Henuz kayitli bir kullanici yok. Ilk once sizi kayit edelim."
+      there_are_no_users: "Henüz kayıtlı bir kullanıcı yok. İlk önce sizi kayıt edelim."
     crudify:
-      created: '%{what} basari ile eklendi'
-      updated: '%{what} basari ile guncellendi'
-      destroyed: '%{what} basari ile silindi.'
+      created: '%{what} başarı ile eklendi'
+      updated: '%{what} başarı ile güncellendi'
+      destroyed: '%{what} başarı ile silindi.'
     site_bar:
-      log_out: Cikis Yap
-      switch_to_your_website: Web Siteni Ac
-      switch_to_your_website_editor: Web Site Editorunu Ac
+      log_out: Çıkış Yap
+      switch_to_your_website: Web Siteni Aç
+      switch_to_your_website_editor: Web Site Düzenleyicisini Aç
     admin:
       menu:
-        reorder_menu: Yeniden duzenleme menusu
-        reorder_menu_done: Yeniden duzenleme tamamlandi
+        reorder_menu: Yeniden düzenleme menüsü
+        reorder_menu_done: Yeniden düzenleme tamamlandı
       dialogs:
         show:
-          save: Kayit Et
-          cancel: Vazgec
+          save: Kayıt Et
+          cancel: Vazgeç
       continue_editing:
-        save_and_continue_editing: 'Kaydet & Duzenlemeye Devam Et'
+        save_and_continue_editing: 'Kaydet & Düzenlemeye Devam Et'
       form_actions:
-        save: Kayit Et
-        cancel: Vazgec
-        cancel_lose_changes: Eger vazgec'e tiklarsaniz burada yaptiginiz degisiklikler kaybolacaktir.
+        save: Kayıt Et
+        cancel: Vazgeç
+        cancel_lose_changes: Eğer vazgeç'e tıklarsanız burada yaptığınız değişiklikler kaybolacaktır.
         delete: Sil
         close: Kapat
       image_picker:
-        none_selected: Secilmis bir fotograf bulunmamaktadir. Eklemek icin buraya tiklayin
-        remove_current: Mevcut fotografi sil
-        change: Fotograf secmek icin tiklayin
-        show: Goster
+        none_selected: Seçilmiş bir fotoğraf bulunmamaktadir. Eklemek için buraya tıklayın
+        remove_current: Mevcut fotoğrafı sil
+        change: Fotoğraf seçmek için tıklayın
+        show: Göster
       resource_picker:
-        download_current: Mevcut dosyayi indir
-        opens_in_new_window: Yeni bir pencerede ac
-        remove_current: "Mevcut dosyayi sil"
-        no_resource_selected: 'Herhangi bir dosya secilmemis. Eklemek icin tiklayin'
+        download_current: Mevcut dosyayı indir
+        opens_in_new_window: Yeni bir pencerede aç
+        remove_current: "Mevcut dosyayı sil"
+        no_resource_selected: 'Herhangi bir dosya seçilmemiş. Eklemek icin tıklayın'
         name: Dosya Ekle
         current: Mevcut Dosya
       search:
         button_text: Arama
-        results_for_html: " &#8216;<em>%{query}</em>&#8217; icin arama sonucu"
-        no_results: 'Uzgunum, herhangi bir sonuc bulunamadi'
-        cancel_search: 'Aramayi iptal et'
-        search_input_notice: "Buraya aradiginiz karakterleri iceren en az 3 tane harf girin."
+        results_for_html: " &#8216;<em>%{query}</em>&#8217; için arama sonucu"
+        no_results: 'Üzgünüm, herhangi bir sonuç bulunamadı'
+        cancel_search: 'Aramayı iptal et'
+        input:
+          placeholder: "Arama&8230;"
+          help: "Buraya aradığınız karakterleri içeren en az 3 tane harf girin."
       delete:
-        message: " '%{title}' Silmek istediginize emin misiniz?"
+        message: " '%{title}' Silmek istediğinize emin misiniz?"
       error_messages:
-        problems_in_following_fields: Asagidaki alanlarda problem vardir.
-      help: yardim
+        problems_in_following_fields: Aşağıdaki alanlarda problem vardır.
+      help: yardım
       form_advanced_options_menu:
-        advanced_options: Gelismis Secenekler
-        toggle_advanced_options: Gelismis Secenekleri Ac
+        advanced_options: Gelişmiş Seçenekler
+        toggle_advanced_options: Gelişmiş Seçenekleri Aç
         save_as_draft: Taslak Olarak Kaydet
     message:
       close: Kapat
-      close_this_message: Bu Mesaji Kapat
+      close_this_message: Bu Mesajı Kapat
     draft_page_message:
-      not_live: Bu sayfa halka acik canli goruntuleme degildir.
+      not_live: Bu sayfa halka açık canlı görüntülemede değildir.
     footer:
-      copyright: "Telif Hakki © %{year} %{site_name}"
+      copyright: "Telif Hakkı © %{year} %{site_name}"
     no_script:
-      enable_javascript_html: Bu sayfanin tum fonsiyonlari icin JavaScript'in aktif olmasi gerekmekte
-      here_are: Iste burada
-      instructions_enable_javascript_html: Tarayicinizin JavaScript'ini nasil aktif edilecegi.
+      enable_javascript_html: Bu sayfanın tüm fonksyonları için JavaScript'in aktif olması gerekmekte
+      here_are: İşte burada
+      instructions_enable_javascript_html: Tarayıcınızın JavaScript'inin nasıl aktif edileceğine dair talimatlar
   time:
     formats:
       short: "%A, %d %B %Y"

data/config/routes.rb

@@ -1,14 +1,11 @@
 Refinery::Core::Engine.routes.draw do
   filter(:refinery_locales) if defined?(RoutingFilter::RefineryLocales) # optionally use i18n.
-  get 'wymiframe(/:id)', :to => 'fast#wymiframe', :as => :wymiframe
   get "#{Refinery::Core.backend_route}/message", :to => 'fast#message', :as => :message
 
   namespace :admin, :path => Refinery::Core.backend_route do
-    root :to => 'dashboard#index'
+    root to: 'core#index'
     resources :dialogs, :only => [:index, :show]
   end
 
-  post "/#{Refinery::Core.backend_route}/update_menu_positions", :to => 'admin/core#update_plugin_positions'
-
   get '/sitemap.xml' => 'sitemap#index', :defaults => { :format => 'xml' }
 end

data/lib/generators/refinery/cms/cms_generator.rb

@@ -10,7 +10,7 @@ module Refinery
                            :desc => "Allow Refinery to remove default Rails files in a fresh installation"
     class_option :heroku,  :type => :string, :default => nil, :group => :runtime, :banner => 'APP_NAME',
                            :desc => "Deploy to Heroku after the generator has run."
-    class_option :stack,   :type => :string, :default => 'cedar', :group => :runtime,
+    class_option :stack,   :type => :string, :default => 'cedar-14', :group => :runtime,
                            :desc => "Specify which Heroku stack you want to use. Requires --heroku option to function."
     class_option :skip_db, :type => :boolean, :default => false, :aliases => nil, :group => :runtime,
                            :desc => "Skip over any database creation, migration or seeding."
@@ -42,14 +42,12 @@ module Refinery
 
       run_additional_generators! if self.options[:fresh_installation]
 
-      migrate_database!
-
-      seed_database!
+      prepare_database!
 
       deploy_to_hosting?
     end
 
-  protected
+    protected
 
     def append_asset_pipeline!
       application_css = 'app/assets/stylesheets/application.css'
@@ -77,20 +75,33 @@ end}  end
     end
 
     def append_heroku_gems!
-      append_file 'Gemfile', %q{
+      append_file 'Gemfile', %Q{
+# The Ruby version is specified here so that Heroku uses the right version.
+ruby #{ENV['RUBY_VERSION'].inspect}
+
 # The Heroku gem allows you to interface with Heroku's API
 gem 'heroku'
 
-# Fog allows you to use S3 assets (added for Heroku)
-gem 'fog'
+group :production do
+  # Dragonfly's S3 Data Store extension allows you to use S3 assets (added for Heroku)
+  gem 'dragonfly-s3_data_store'
+
+  # Gems that are recommended for using Heroku:
+  gem 'rails_12factor'
+  gem 'puma'
 }
       # If postgres is not the database in use, Heroku still needs it.
       if destination_path.join('Gemfile').file? && destination_path.join('Gemfile').read !~ %r{gem ['"]pg['"]}
         append_file 'Gemfile', %q{
-# Postgres support (added for Heroku)
-gem 'pg'
+  # Postgres support (added for Heroku)
+  gem 'pg'
 }
       end
+
+      append_file 'Gemfile', %q{
+end
+
+} # close the production group that was opened for dragonfly, and pg.
     end
 
     def bundle!
@@ -99,7 +110,7 @@ gem 'pg'
 
     def copy_files!
       # The extension installer only installs database templates.
-      Pathname.glob(self.class.source_root.join('**', '*')).reject{|f|
+      Pathname.glob(self.class.source_root.join('**', '*')).reject{ |f|
         f.directory? or f.to_s =~ /\/db\//
       }.sort.each do |path|
         copy_file path, path.to_s.gsub(self.class.source_root.to_s, destination_path.to_s)
@@ -109,20 +120,47 @@ gem 'pg'
     def create_decorators!
       # Create decorator directories
       %w[controllers models].each do |decorator_namespace|
-        src_file_path = "app/decorators/#{decorator_namespace}/refinery/.gitkeep"
+        src_file_path = "app/decorators/#{decorator_namespace}/refinery/.keep"
         copy_file self.class.source_root.join(src_file_path), destination_path.join(src_file_path)
       end
     end
 
+    def create_heroku_procfile!
+      create_file "Procfile" do
+        "web: bundle exec puma -C config/puma.rb"
+      end unless destination_path.join('Procfile').file?
+
+      create_file "config/puma.rb" do
+%{threads Integer(ENV['MIN_THREADS']  || 1), Integer(ENV['MAX_THREADS'] || 16)
+
+workers Integer(ENV['PUMA_WORKERS'] || 3)
+
+rackup DefaultRackup
+port ENV['PORT'] || 3000
+environment ENV['RACK_ENV'] || 'development'
+preload_app!
+
+on_worker_boot do
+  # worker specific setup
+  ActiveSupport.on_load(:active_record) do
+    ActiveRecord::Base.establish_connection
+  end
+end
+}
+      end unless destination_path.join('config', 'puma.rb').file?
+    end
+
     def deploy_to_hosting?
       if heroku?
         append_heroku_gems!
 
-        bundle!
-
         # Sanity check the heroku application name and save whatever messages are produced.
         message = sanity_check_heroku_application_name!
 
+        create_heroku_procfile!
+
+        bundle!
+
         # Supply the deploy process with the previous messages to make them visible.
         deploy_to_hosting_heroku!(message)
       end
@@ -144,7 +182,10 @@ gem 'pg'
       run "git push heroku master"
 
       say_status "Setting up the Heroku database..", nil
-      run "heroku#{' run' if options[:stack] == 'cedar'} rake db:migrate"
+      run "heroku#{' run' if options[:stack] == 'cedar-14'} rake db:migrate"
+
+      say_status "Seeding the Heroku database..", nil
+      run "heroku#{' run' if options[:stack] == 'cedar-14'} rake db:seed"
 
       say_status "Restarting servers...", nil
       run "heroku restart"
@@ -157,7 +198,7 @@ gem 'pg'
 
     def ensure_environments_are_sane!
       # Massage environment files
-      %w(development test production).map{|e| "config/environments/#{e}.rb"}.each do |env|
+      %w(development test production).map{ |e| "config/environments/#{e}.rb"}.each do |env|
         next unless destination_path.join(env).file?
 
         # Refinery does not necessarily expect action_mailer to be available as
@@ -204,10 +245,14 @@ gem 'pg'
       end
     end
 
-    def migrate_database!
+    def prepare_database!
       unless self.options[:skip_migrations]
-        rake 'railties:install:migrations'
-        rake 'db:create db:migrate' unless self.options[:skip_db]
+        command = %w[railties:install:migrations]
+        unless self.options[:skip_db]
+          command |= %w[db:create db:migrate]
+          command |= %w[db:seed] unless self.options[:skip_migrations]
+        end
+        rake command.join(' ')
       end
     end
 
@@ -217,14 +262,15 @@ gem 'pg'
         mount = %Q{
   # This line mounts Refinery's routes at the root of your application.
   # This means, any requests to the root URL of your application will go to Refinery::PagesController#home.
-  # If you would like to change where this extension is mounted, simply change the :at option to something different.
+  # If you would like to change where this extension is mounted, simply change the
+  # configuration option `mounted_path` to something different in config/initializers/refinery/core.rb
   #
   # We ask that you don't use the :as option here, as Refinery relies on it being the default of "refinery"
-  mount Refinery::Core::Engine, :at => '/'
+  mount Refinery::Core::Engine, at: Refinery::Core.mounted_path
 
 }
 
-        inject_into_file 'config/routes.rb', mount, :after => "Application.routes.draw do\n"
+        inject_into_file 'config/routes.rb', mount, after: ".routes.draw do"
       end
     end
 
@@ -262,10 +308,6 @@ gem 'pg'
       options[:heroku] = '' if options[:heroku] == 'heroku'
     end
 
-    def seed_database!
-      rake 'db:seed' unless self.options[:skip_db] || self.options[:skip_migrations]
-    end
-
     def start_pretending?
       # Only pretend to do the next actions if this is Refinery to stay DRY
       if destination_path == Refinery.root

data/lib/generators/refinery/cms/templates/config/database.yml.mysql

@@ -3,18 +3,18 @@ development: &development
   host: localhost
   username: root
   password:
-  database: your_local_database
+  database: <%= Rails.application.engine_name.gsub(/_application/,'').downcase %>_development
 
 test: &test
   adapter: mysql2
   host: localhost
   username: root
   password:
-  database: your_test_database
+  database: <%= Rails.application.engine_name.gsub(/_application/,'').downcase %>_test
 
 production: &production
   adapter: mysql2
   host: localhost
-  database: your_production_database
+  database: <%= Rails.application.engine_name.gsub(/_application/,'').downcase %>_production
   username: your_production_database_login
   password: your_production_database_password