alchemy_cms 2.5.0.b5 → 2.5.0.b9

data/app/controllers/alchemy/admin/attachments_controller.rb

@@ -35,7 +35,7 @@ module Alchemy
           @options = hashified_options
         end
         @attachments = Attachment.find_paginated(params, per_page_value_for_screen_size)
-        @message = t('File %{name} uploaded succesfully', :name => @attachment.name)
+        @message = _t('File %{name} uploaded succesfully', :name => @attachment.name)
         # Are we using the Flash uploader? Or the plain html file uploader?
         if params[Rails.application.config.session_options[:key]].blank?
           flash[:notice] = @message
@@ -52,7 +52,7 @@ module Alchemy
         @attachment = Attachment.find(params[:id])
         oldname = @attachment.name
         if @attachment.update_attributes(params[:attachment])
-          flash[:notice] = t("File renamed successfully from: '%{from}' to '%{to}'", :from => oldname, :to => @attachment.name)
+          flash[:notice] = _t("File renamed successfully from: '%{from}' to '%{to}'", :from => oldname, :to => @attachment.name)
         else
           render :action => "edit"
         end
@@ -63,7 +63,7 @@ module Alchemy
         @attachment = Attachment.find(params[:id])
         name = @attachment.name
         @attachment.destroy
-        flash[:notice] = t("File: '%{name}' deleted successfully", :name => name)
+        flash[:notice] = _t("File: '%{name}' deleted successfully", :name => name)
       end
 
       def show

data/app/controllers/alchemy/admin/base_controller.rb

@@ -93,7 +93,7 @@ module Alchemy
       def render_errors_or_redirect(object, redirect_url, flash_notice)
         if object.errors.empty?
           @redirect_url = redirect_url
-          flash[:notice] = t(flash_notice)
+          flash[:notice] = _t(flash_notice)
           respond_to do |format|
             format.js   { render :action => :redirect }
             format.html { redirect_to @redirect_url }

data/app/controllers/alchemy/admin/contents_controller.rb

@@ -44,13 +44,13 @@ module Alchemy
           content = Content.find(id)
           content.move_to_bottom
         end
-        @notice = t("Successfully saved content position")
+        @notice = _t("Successfully saved content position")
       end
 
       def destroy
         @content = Content.find(params[:id])
         @content_dup = @content.clone
-        @notice = t("Successfully deleted content", :content => @content.name_for_label)
+        @notice = _t("Successfully deleted content", :content => @content.name_for_label)
         @content.destroy
       end
 

data/app/controllers/alchemy/admin/elements_controller.rb

@@ -70,8 +70,8 @@ module Alchemy
           @element_validated = @element.update_attributes!(params[:element])
         else
           @element_validated = false
-          @notice = t('Validation failed')
-          @error_message = "<h2>#{@notice}</h2><p>#{t(:content_validations_headline)}</p>".html_safe
+          @notice = _t('Validation failed')
+          @error_message = "<h2>#{@notice}</h2><p>#{_t(:content_validations_headline)}</p>".html_safe
         end
       end
 
@@ -116,7 +116,7 @@ module Alchemy
         cell_name = element_with_cell_name.split('#').last
         cell_definition = Cell.definition_for(cell_name)
         if cell_definition.blank?
-          raise "Cell definition not found for #{cell_name}"
+          raise CellDefinitionError, "Cell definition not found for #{cell_name}"
         end
         @page.cells.find_or_create_by_name(cell_definition['name'])
       end

data/app/controllers/alchemy/admin/essence_pictures_controller.rb

@@ -40,7 +40,7 @@ module Alchemy
           end
           @ratio = @options[:fixed_ratio] == 'false' ? false : (@size_x.to_f / @size_y.to_f)
         else
-          @no_image_notice = t('No image found. Did you saved the element?')
+          @no_image_notice = _t('No image found. Did you saved the element?')
         end
         render :layout => false
       end
@@ -73,7 +73,7 @@ module Alchemy
         @picture_essence.link = params[:link]
         @picture_essence.link_title = params[:title]
         @picture_essence.open_link_in_new_window = params[:blank]
-        @notice = t("saved_link")
+        @notice = _t("saved_link")
         @picture_essence.save
       end
 

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -28,8 +28,9 @@ module Alchemy
         end
       end
 
+      # Used by page preview iframe in Page#edit view.
+      #
       def show
-        # fetching page via before filter
         @preview_mode = true
         @root_page = Page.language_root_for(session[:language_id])
         # Setting the locale to pages language. so the page content has its correct translation
@@ -63,14 +64,20 @@ module Alchemy
         else
           @page = Page.create(params[:page])
         end
-        render_errors_or_redirect(@page, @page.valid? ? edit_admin_page_path(@page) : admin_pages_path, t("Page created", :name => @page.name))
+        redirect_path =
+          if @page.valid?
+            params[:redirect_to] || edit_admin_page_path(@page)
+          else
+            admin_pages_path
+          end
+        render_errors_or_redirect(@page, redirect_path, _t("Page created", :name => @page.name))
       end
 
       # Edit the content of the page and all its elements and contents.
       def edit
         # fetching page via before filter
         if @page.locked? && @page.locker && @page.locker.logged_in? && @page.locker != current_user
-          flash[:notice] = t("This page is locked by %{name}", :name => (@page.locker.name rescue t('unknown')))
+          flash[:notice] = _t("This page is locked by %{name}", :name => (@page.locker.name rescue _t('unknown')))
           redirect_to admin_pages_path
         else
           @page.lock(current_user)
@@ -95,7 +102,7 @@ module Alchemy
         # storing old page_layout value, because unfurtunally rails @page.changes does not work here.
         @old_page_layout = @page.page_layout
         if @page.update_attributes(params[:page])
-          @notice = t("Page saved", :name => @page.name)
+          @notice = _t("Page saved", :name => @page.name)
           @while_page_edit = request.referer.include?('edit')
         else
           render_remote_errors(@page, "#alchemyOverlay button.button")
@@ -109,7 +116,7 @@ module Alchemy
         @layoutpage = @page.layoutpage?
         if @page.destroy
           @page_root = Page.language_root_for(session[:language_id])
-          @message = t("Page deleted", :name => name)
+          @message = _t("Page deleted", :name => name)
           flash[:notice] = @message
           respond_to do |format|
             format.js
@@ -153,7 +160,7 @@ module Alchemy
       def unlock
         # fetching page via before filter
         @page.unlock
-        flash[:notice] = t("unlocked_page", :name => @page.name)
+        flash[:notice] = _t("unlocked_page", :name => @page.name)
         @pages_locked_by_user = Page.all_locked_by(current_user)
         respond_to do |format|
           format.js
@@ -173,7 +180,7 @@ module Alchemy
         # fetching page via before filter
         @page.public = true
         @page.save
-        flash[:notice] = t("page_published", :name => @page.name)
+        flash[:notice] = _t("page_published", :name => @page.name)
         redirect_back_or_to_default(admin_pages_path)
       end
 
@@ -191,7 +198,7 @@ module Alchemy
         )
         new_language_root.move_to_child_of Page.root
         original_language_root.copy_children_to(new_language_root)
-        flash[:notice] = t('language_pages_copied')
+        flash[:notice] = _t('language_pages_copied')
         redirect_to params[:layoutpage] == "true" ? admin_layoutpages_path : :action => :index
       end
 
@@ -213,7 +220,7 @@ module Alchemy
           prev_item = dbitem.reload
         end
 
-        flash[:notice] = t("Pages order saved")
+        flash[:notice] = _t("Pages order saved")
         @redirect_url = admin_pages_path
         render :action => :redirect
       end

data/app/controllers/alchemy/admin/pictures_controller.rb

@@ -57,7 +57,7 @@ module Alchemy
           @per_page = pictures_per_page_for_size(@size)
         end
         @pictures = Picture.find_paginated(params, pictures_per_page_for_size(@size))
-        @message = t('Picture uploaded succesfully', :name => @picture.name)
+        @message = _t('Picture uploaded succesfully', :name => @picture.name)
         # Are we using the single file uploader?
         if params[Rails.application.config.session_options[:key]].blank?
           flash[:notice] = @message
@@ -82,9 +82,9 @@ module Alchemy
         @picture = Picture.find(params[:id])
 
         if @picture.update_attributes(params[:picture])
-          flash[:notice] = t('picture_updated_successfully', :name => @picture.name)
+          flash[:notice] = _t('picture_updated_successfully', :name => @picture.name)
         else
-          flash[:error] = t('picture_update_failed')
+          flash[:error] = _t('picture_update_failed')
         end
         redirect_to_index
       end
@@ -97,7 +97,7 @@ module Alchemy
           picture.tag_list = params[:pictures_tag_list]
           picture.save
         end
-        flash[:notice] = t("Pictures updated successfully")
+        flash[:notice] = _t("Pictures updated successfully")
         redirect_to_index
       end
 
@@ -110,9 +110,9 @@ module Alchemy
             names << picture.name
             picture.destroy
           end
-          flash[:notice] = t("Pictures deleted successfully", :names => names.to_sentence)
+          flash[:notice] = _t("Pictures deleted successfully", :names => names.to_sentence)
         else
-          flash[:notice] = t("Could not delete Pictures")
+          flash[:notice] = _t("Could not delete Pictures")
         end
       rescue Exception => e
         flash[:error] = e.message
@@ -124,7 +124,7 @@ module Alchemy
         @picture = Picture.find(params[:id])
         name = @picture.name
         @picture.destroy
-        flash[:notice] = t("Picture deleted successfully", :name => name)
+        flash[:notice] = _t("Picture deleted successfully", :name => name)
       rescue Exception => e
         flash[:error] = e.message
       ensure
@@ -135,7 +135,7 @@ module Alchemy
       def flush
         # FileUtils.rm_rf only takes arrays of folders...
         FileUtils.rm_rf Dir.glob(Rails.root.join('public', Alchemy.mount_point, 'pictures', '*'))
-        @notice = t('Picture cache flushed')
+        @notice = _t('Picture cache flushed')
       end
 
       def show_in_window

data/app/controllers/alchemy/admin/resources_controller.rb

@@ -75,7 +75,7 @@ module Alchemy
         when :destroy
           verb = "removed"
         end
-        flash[:notice] = t("#{resource_handler.model_name.classify} successfully #{verb}", :default => t("Succesfully #{verb}"))
+        flash[:notice] = _t("#{resource_handler.model_name.classify} successfully #{verb}", :default => _t("Succesfully #{verb}"))
       end
 
       def is_alchemy_module?

data/app/controllers/alchemy/admin/tags_controller.rb

@@ -17,7 +17,7 @@ module Alchemy
 
       def create
         @tag = ActsAsTaggableOn::Tag.create(params[:tag])
-        render_errors_or_redirect @tag, admin_tags_path, t('New Tag Created')
+        render_errors_or_redirect @tag, admin_tags_path, _t('New Tag Created')
       end
 
       def edit
@@ -29,12 +29,12 @@ module Alchemy
         if params[:replace]
           @new_tag = ActsAsTaggableOn::Tag.find(params[:tag][:merge_to])
           Tag.replace(@tag, @new_tag)
-          operation_text = t('Replaced Tag %{old_tag} with %{new_tag}') % {:old_tag => @tag.name, :new_tag => @new_tag.name}
+          operation_text = _t('Replaced Tag %{old_tag} with %{new_tag}') % {:old_tag => @tag.name, :new_tag => @new_tag.name}
           @tag.destroy
         else
           @tag.update_attributes(params[:tag])
           @tag.save
-          operation_text = t(:successfully_updated_tag)
+          operation_text = _t(:successfully_updated_tag)
         end
         render_errors_or_redirect @tag, admin_tags_path, operation_text
       end
@@ -42,7 +42,7 @@ module Alchemy
       def destroy
         if request.delete?
           @tag.destroy
-          flash[:notice] = t(:successfully_deleted_tag)
+          flash[:notice] = _t(:successfully_deleted_tag)
         end
         @redirect_url = admin_tags_path
         render :action => :redirect

data/app/controllers/alchemy/admin/users_controller.rb

@@ -39,7 +39,7 @@ module Alchemy
         render_errors_or_redirect(
           @user,
           admin_users_path,
-          t("User created", :name => @user.name)
+          _t("User created", :name => @user.name)
         )
       end
 
@@ -55,7 +55,7 @@ module Alchemy
         render_errors_or_redirect(
           @user,
           admin_users_path,
-          t("User updated", :name => @user.name)
+          _t("User updated", :name => @user.name)
         )
       end
 
@@ -63,7 +63,7 @@ module Alchemy
         # User is fetched via before filter
         name = @user.name
         if @user.destroy
-          flash[:notice] = t("User deleted", :name => name)
+          flash[:notice] = _t("User deleted", :name => name)
         end
         @redirect_url = admin_users_path
         render :action => :redirect

data/app/controllers/alchemy/base_controller.rb

@@ -10,7 +10,7 @@ module Alchemy
     before_filter :set_language
     before_filter :mailer_set_url_options
 
-    helper_method :current_server, :current_site, :t
+    helper_method :current_server, :current_site
 
     # Returns a host string with the domain the app is running on.
     def current_server
@@ -39,9 +39,9 @@ module Alchemy
       raise ActionController::RoutingError.new('Not Found')
     end
 
-    # Overriding +I18n+s default +t+ helper, so we can pass it through +Alchemy::I18n+
-    def t(key, *args)
-      ::Alchemy::I18n.t(key, *args)
+    # Shortcut for Alchemy::I18n.translate method
+    def _t(key, *args)
+      I18n.t(key, *args)
     end
 
   private
@@ -74,10 +74,8 @@ module Alchemy
         session[:current_locale] = ::I18n.locale = params[:locale]
       elsif current_user && current_user.language.present?
         ::I18n.locale = current_user.language
-      elsif Rails.env == 'test' # OMG I hate to do this. But it helps...
-        ::I18n.locale = 'en'
       else
-        ::I18n.locale = request.env['HTTP_ACCEPT_LANGUAGE'].try(:scan, /^[a-z]{2}/).try(:first)
+        ::I18n.locale = request.env['HTTP_ACCEPT_LANGUAGE'].try(:scan, /^[a-z]{2}/).try(:first) || ::I18n.default_locale
       end
     end
 
@@ -117,7 +115,7 @@ module Alchemy
     end
 
     def load_language_default
-      Language.get_default
+      Language.get_default || raise(DefaultLanguageNotFoundError)
     end
 
     def store_language_in_session(language)
@@ -201,19 +199,19 @@ module Alchemy
           elsif request.xhr?
             respond_to do |format|
               format.js {
-                render :js => "Alchemy.growl('#{t('You are not authorized')}', 'warning'); Alchemy.Buttons.enable();"
+                render :js => "Alchemy.growl('#{_t('You are not authorized')}', 'warning'); Alchemy.Buttons.enable();"
               }
               format.html {
-                render :partial => 'alchemy/admin/partials/flash', :locals => {:message => t('You are not authorized'), :flash_type => 'warning'}
+                render :partial => 'alchemy/admin/partials/flash', :locals => {:message => _t('You are not authorized'), :flash_type => 'warning'}
               }
             end
           else
-            flash[:error] = t('You are not authorized')
+            flash[:error] = _t('You are not authorized')
             redirect_to alchemy.admin_dashboard_path
           end
         end
       else
-        flash[:info] = t('Please log in')
+        flash[:info] = _t('Please log in')
         if request.xhr?
           render :action => :permission_denied
         else

data/app/controllers/alchemy/messages_controller.rb

@@ -17,7 +17,7 @@ module Alchemy
   #     - name: mail_from
   #       type: EssenceText
   #     - name: success_page
-  #       type: EssenceText
+  #       type: EssenceSelect
   #
   # The fields +mail_to+, +mail_from+, +subject+ and +success_page+ are recommended.
   # The +Alchemy::MessagesController+ uses them to send your mails. So your customer has full controll of these values inside his contactform element.
@@ -99,12 +99,12 @@ module Alchemy
     end
 
     def redirect_to_success_page
+      flash[:notice] = _t(:success, :scope => 'contactform.messages')
       if @element.ingredient("success_page")
         urlname = @element.ingredient("success_page")
       elsif mailer_config['forward_to_page'] && mailer_config['mail_success_page']
         urlname = Page.find_by_urlname(mailer_config['mail_success_page']).urlname
       else
-        flash[:notice] = t(:success, :scope => 'contactform.messages')
         urlname = Page.language_root_for(session[:language_id]).urlname
       end
       redirect_to show_page_path(:urlname => urlname, :lang => multi_language? ? session[:language_code] : nil)

data/app/controllers/alchemy/pages_controller.rb

@@ -80,7 +80,7 @@ module Alchemy
 
     def enforce_primary_host_for_site
       if needs_redirect_to_primary_host?
-        redirect_to url_for(host: current_site.host)
+        redirect_to url_for(host: current_site.host), :status => 301
       end
     end
 
@@ -94,6 +94,9 @@ module Alchemy
       @page ||= load_page
       if User.admins.count == 0 && @page.nil?
         redirect_to signup_path
+      elsif @page.nil? && legacy_url = LegacyPageUrl.where(urlname: params[:urlname]).last
+        @page = legacy_url.page
+        redirect_page
       elsif @page.blank?
         raise_not_found_error
       elsif multi_language? && params[:lang].blank?

data/app/controllers/alchemy/pictures_controller.rb

@@ -33,6 +33,7 @@ module Alchemy
         image_file = image_file.process(:resize, size + '>')
       end
 
+      expires_in 1.month, public: !@picture.restricted?
       respond_to { |format| send_image(image_file, format) }
     end
 
@@ -106,8 +107,4 @@ module Alchemy
     end
 
   end
-
-  class MissingImageFileError < StandardError
-  end
-
 end

data/app/controllers/alchemy/user_sessions_controller.rb

@@ -21,22 +21,22 @@ module Alchemy
           if params[:send_credentials]
             Notifications.admin_user_created(@user).deliver
           end
-          flash[:notice] = t('Successfully signup admin user')
+          flash[:notice] = _t('Successfully signup admin user')
           redirect_to admin_dashboard_path
         end
       end
     rescue Errno::ECONNREFUSED => e
-      flash[:error] = t(:signup_mail_delivery_error)
+      flash[:error] = _t(:signup_mail_delivery_error)
       redirect_to admin_dashboard_path
     end
 
     def login
       if current_user
-        redirect_to admin_dashboard_path, :notice => t('You are already logged in')
+        redirect_to admin_dashboard_path, :notice => _t('You are already logged in')
       else
         if request.get?
           @user_session = UserSession.new()
-          flash.now[:info] = params[:message] || t("welcome_please_identify_notice")
+          flash.now[:info] = params[:message] || _t("welcome_please_identify_notice")
         else
           @user_session = UserSession.new(params[:alchemy_user_session])
           store_screen_size
@@ -59,7 +59,7 @@ module Alchemy
     end
 
     def logout
-      message = params[:message] || t("logged_out")
+      message = params[:message] || _t("logged_out")
       @user_session = UserSession.find
       if @user_session
         @user_session.destroy