alchemy_cms 2.1.12 → 2.2.rc1

data/config/alchemy/config.yml

@@ -81,20 +81,20 @@ default_language:
 # ==== Options:
 # 
 #   page_layout_name:           [String] # A +Alchemy::PageLayout+ name. Used to render the contactform on a page with this layout.
-#   fields:                     [Array]  # An Array of fieldnames.
-#   validate_fields:            [Array]  # An Array of fieldnames to be validated on presence.
+#   fields:                     [Array]  # An Array of fieldnames
+#   validate_fields:            [Hash]   # A Hash with fieldname as key and a Hash (with :message as key and a message_id as value) as value
 # 
 # ==== Translating validation messages:
 # 
-# The validation messages are passed through ::I18n.t so you can translate it in your language yml file.
+# The message_id is passed through Alchemy::I18n.t so you can translate it in your language yml file.
 # 
-# ==== Example:
+# Example:
 # 
 #   de:  
-#     activemodel:
-#       attributes:
-#         alchemy/message:
-#           firstname: Vorname
+#     alchemy:
+#      contactform:
+#         validations:
+#           enter_name: 'Bitte geben Sie einen Namen an'
 # 
 :mailer:
   :page_layout_name: contact
@@ -103,7 +103,11 @@ default_language:
   :mail_from: your.mail@your-domain.com
   :mail_to: your.mail@your-domain.com
   :fields: [salutation, firstname, lastname, address, zip, city, phone, email, message]
-  :validate_fields: [lastname, email]
+  :validate_fields:
+    :lastname:
+      :message: enter_name
+    :email:
+      :message: enter_email
 
 # === User roles
 # You can add own user roles. To set permissions for this roles please add an authorization_rules.rb file in your config folder.

data/config/locales/alchemy.de.yml

@@ -113,6 +113,12 @@ de:
         message: 'Nachricht'
         send: 'absenden'
         mandatory_fields: '*Pflichtfelder. Bitte füllen Sie diese Felder aus.'
+      # Translations for the contactform validations.
+      # Validations are set in the config/alchemy/config.yml mailer section.
+      validations:
+        enter_name: 'Bitte geben Sie Ihren Namen an'
+        enter_email: Bitte geben Sie Ihre E-Mail-Adresse an
+        wrong_email_format: 'Die E-Mail-Adresse scheint nicht richtig zu sein.'
       # The flash message shown after succesfully sending the message.
       messages:
         success: 'Ihre Nachricht wurde erfolgreich übermittelt.'
@@ -226,7 +232,7 @@ de:
     "No EssenceType given": ""
     "No image found. Did you saved the element?": "Es wurde kein Bild gefunden. Haben Sie das Element auch gespeichert?"
     "No items in your clipboard": "Ihre Zwischenablage ist leer"
-    "None": "keine"
+    "None": ""
     "Open Link in": "Link öffnen in"
     "Page deleted": "%{name} wurde gelöscht"
     "Page saved": "%{name} wurde gespeichert"
@@ -247,11 +253,13 @@ de:
     "Picture cache flushed": "Bildercache wurde geleert"
     "Please Signup": "Um Ihre Homepage bearbeiten zu können, müssen Sie als erstes einen Admin Benutzer einrichten."
     "Please choose": "Bitte wählen"
+    "Please choose a page layout.": "Bitte wählen Sie einen Seitentyp."
+    choose_element: "Bitte wählen Sie ein Element."
     "Please log in": "Bitte melden Sie sich an."
     use_alternative_uploader_instead: "Benutzen Sie bitte diesen alternativen Uploader."
     "Publish page": "veröffentlichen"
     "Read the License": "Lizenz lesen"
-    "Redirects to": "Leitet weiter auf"
+    "Redirects to": ""
     "Remove item from clipboard": "Inhalt aus der Zwischenablage entfernen"
     "Remove this content": "Diesen Inhalt entfernen"
     "Reset Imagemask": "Bildmaske zurücksetzen"
@@ -265,6 +273,7 @@ de:
     "Show trash": "Papierkorb anzeigen"
     "Size": "Größe"
     "Sort pages": "Seiten sortieren"
+    "Status": ""
     "Successfully added content": "%{content} wurde hinzugefügt"
     "Successfully deleted content": "%{content} wurde gelöscht"
     "Successfully saved content position": "Die Position wurde gespeichert."
@@ -276,6 +285,8 @@ de:
     "Title": "Titel"
     "To manage your website open a browser and go to": "Um die Inhalte Ihrer Webseite zu bearbeiten klicken Sie bitte auf folgenden Link"
     "Trash": "Papierkorb"
+    "URL": ""
+    "URL-Name already token": "Der URL-Name ist bereits vergeben."
     "User created": "%{name} wurde erstellt"
     "User deleted": "%{name} wurde gelöscht"
     "User updated": "%{name} wurde aktualisiert"
@@ -288,6 +299,7 @@ de:
     "Warning: Content is missing its description.": "Warnung: Für Content '%{contentname}' konnte die Vorlage nicht gefunden werden."
     "Warning: Element '%{elementname}' is missing its description.": "Warnung: Für Element '%{elementname}' konnte die Vorlage nicht gefunden werden."
     "Welcome back, %{name}": "Willkommen zurück, %{name}!"
+    "Welcome, %{name}": "Willkommen, %{name}!"
     "Welcome to Alchemy": "Willkommen in Alchemy!"
     "Who else is online": "Wer ist noch online"
     "Yes": "Ja"
@@ -375,6 +387,7 @@ de:
       step1: "Klicken Sie auf 'durchsuchen' und öffnen Sie den Ordner mit Ihren %{name}"
       step2: "Wählen Sie alle %{name} aus, die Sie gleichzeitig hochladen wollen"
       step3: "Klicken Sie auf 'öffnen'. Das Hochladen beginnt!"
+      dragndrop: "Alternativ können Sie Dateien auch von Ihrem Computer mit der Maus auf die untere Fläche ziehen."
     female: "Frau"
     file: "Datei"
     file_rename_error: "Datei konnte nicht umbenannt werden."
@@ -470,6 +483,7 @@ de:
     picture_gallery_editor: 'Bilder'
     place_link: "Text verlinken"
     player_version: "Flashplayer Version"
+    "please enter a name": "Bitte geben Sie einen Namen ein."
     "please enter subject and mail address": "Bitte geben Sie den Betreff und eine Empfängeradresse an."
     please_confirm: "Bitte bestätigen"
     please_wait: "Bitte warten"
@@ -508,6 +522,7 @@ de:
     upload_file: "Datei(en) hochladen"
     upload_image: "Bild(er) hochladen"
     url_name: "URL-Name"
+    urlname_to_short: "Der URL-Name der Seite ist zu kurz (min. 3 Zeichen)"
     username: "Benutzername"
     visible: "sichtbar"
     want_to_create_new_language: "Wollen Sie einen neuen leeren Sprachbaum erstellen?"
@@ -533,7 +548,13 @@ de:
     "You are already logged in": "Sie sind bereits angemeldet."
     "No users found": "Keine Benutzer gefunden."
     "Nothing found": "Keine Einträge gefunden."
-  
+    "Or drag files over here": "Oder ziehen Sie die Dateien hier rauf"
+    "Now drop the files": "Lassen Sie die Dateien nun los"
+    "Queued x files": "x Dateien in der Warteschlange."
+    complete: 'Abgeschlossen'
+    "Uploading": "Hochladen"
+    "Uploaded x files": "x Dateien hochgeladen."
+    
   # END of Alchemy translation
   
   # == Rails translations
@@ -642,19 +663,6 @@ de:
       words_connector: ", "
       two_words_connector: " und "
       last_word_connector: " und "
-
-  activemodel:
-    attributes:
-      alchemy/message:
-        salutation: Anrede
-        firstname: Vorname
-        lastname: Nachname
-        address: Adresse
-        zip: PLZ
-        city: Ort
-        phone: Telefon
-        email: E-Mail
-        message: Nachricht
   
   # Translations for active record database models and error messages.
   activerecord:
@@ -795,25 +803,11 @@ de:
           attributes:
             essence:
               validation_failed: 'Validierung fehlgeschlagen.'
-        alchemy/element:
-          attributes:
-            name:
-              blank: "^Bitte wählen Sie ein Element."
         alchemy/language:
           attributes:
             language_code:
               invalid: 'ist nicht korrekt. Bitte exakt zwei Kleinbuchstaben verwenden.'
               taken: 'ist für dieses Länderkürzel bereits vergeben.'
-        alchemy/page:
-          attributes:
-            name:
-              blank: "^Bitte geben Sie einen Namen ein."
-            page_layout:
-              blank: "^Bitte wählen Sie einen Seitentyp."
-            urlname:
-              too_short: "^Der URL-Name der Seite ist zu kurz (min. 3 Zeichen)"
-              taken: "^Der URL-Name ist bereits vergeben."
-              exclusion: "^Der URL-Name der Seite kann nicht benutzt werden."
   
   # Translations for the authentication system used in alchemy.
   authlogic:

data/config/locales/alchemy.en.yml

@@ -96,6 +96,12 @@ en:
         message: 'Message'
         send: 'Send'
         mandatory_fields: '*Mandatory fields.'
+      # Translations for the contactform validations.
+      # Validations are set in the config/alchemy/config.yml mailer section.
+      validations:
+        enter_name: 'Please enter your name'
+        enter_email: 'Please enter your email'
+        wrong_email_format: 'Email has wrong format'
       # The flash message shown after succesfully sending the message.
       messages:
         success: 'Your message was delivered succesfully.'
@@ -180,6 +186,7 @@ en:
     big_thumbnails: "Big thumbnails"
     choose_element_as_target: "Please choose an element as target"
     choose_element_to_link: "Please choose an element"
+    choose_element: "Please choose an element."
     choose_file_to_link: "Please choose a file to link"
     click_to_show_all: "Click to show all again."
     confirm_to_delete_file: "Do you really want to delete this file from the server?"
@@ -293,7 +300,7 @@ en:
     "Page created": "Page: '%{name}' created."
     page_for_links.choose_page: "Choose %{name}"
     page_locked: "This page is locked by another user."
-    page_properties: "page properties"
+    page_properties: "Page properties"
     page_public: "published"
     page_published: "Published page"
     page_restricted: "restricted"
@@ -319,6 +326,7 @@ en:
     "Picture deleted successfully": "Picture %{name} deleted"
     place_link: "Link text"
     player_version: "Flashplayer Version"
+    "please enter a name": "Please enter a name."
     "please enter subject and mail address": "Please enter recipient and subject."
     please_confirm: "Please confirm"
     please_wait: "Please wait"
@@ -351,6 +359,7 @@ en:
     upload_file: "Upload file(s)"
     upload_image: "Upload image(s)"
     url_name: "URL-Name"
+    urlname_to_short: "The pages urlname is too short (minimum of 3 characters)"
     username: "Username"
     want_to_create_new_language: "Do you want to create a new empty language tree?"
     want_to_make_copy_of_existing_language: "Do you want to copy an existing language tree?"
@@ -479,18 +488,6 @@ en:
         one:  "over 1 year" 
         many: "over %{count} years"
   
-  activemodel:
-    attributes:
-      alchemy/message:
-        salutation: 'Salutation'
-        firstname: 'Firstname'
-        lastname: 'Lastname'
-        address: 'Street / No.'
-        zip: 'Zipcode / City'
-        phone: 'Telephone'
-        email: 'Email'
-        message: 'Message'
-
   # Translations for active record database models and error messages.
   activerecord:
     
@@ -592,24 +589,10 @@ en:
           attributes:
             essence:
               validation_failed: 'Validation failed.'
-        alchemy/element:
-          attributes:
-            name:
-              blank: "^Please choose an element."
         alchemy/language:
           attributes:
             code:
-              invalid: '^Format of languagecode is not valid. Please use exactly two lowercase characters.'
-        alchemy/page:
-          attributes:
-            name:
-              blank: "^Please enter a name."
-            page_layout:
-              blank: "^Please choose a page layout."
-            urlname:
-              too_short: "^The pages urlname is too short (minimum of 3 characters)."
-              taken: "^URL-Name already taken."
-              exclusion: "^URL-Name reserved."
+              invalid: 'Format of languagecode is not valid. Please use exactly two lowercase characters.'
 
   # Translations for the authentication system used in alchemy.
   authlogic:

data/config/routes.rb

@@ -1,150 +1,150 @@
 Alchemy::Engine.routes.draw do
 
-	root :to => 'pages#show'
-
-	match '/admin' => redirect(
-		"#{Alchemy.mount_point}/admin/dashboard"
-	)
-	match '/admin/login' => 'user_sessions#login',
-		:as => :login
-	match '/admin/signup' => 'user_sessions#signup',
-		:as => :signup
-	match '/admin/leave' => 'user_sessions#leave',
-		:as => :leave_admin
-	match '/admin/logout' => 'user_sessions#logout',
-		:as => :logout
-	match '/admin/dashboard' => 'admin/dashboard#index',
-		:as => :admin_dashboard
-
-	match '/attachment/:id/download(/:name)(.:format)' => 'attachments#download',
-		:as => :download_attachment
-
-	# catching legacy download urls
-	match '/wa_files/download/:id' => 'attachments#download'
-	match '/uploads/files/0000/:id/:name(.:suffix)' => 'attachments#download'
-
-	match '/attachment/:id/show' => 'attachments#show',
-		:as => :show_attachment
-
-	match "/pictures/:id/show(/:size)(/:crop)(/:crop_from/:crop_size)/:name.:format" => 'pictures#show',
-		:as => :show_picture, :defaults => { :format => Alchemy::Config.get(:image_output_format) }
-	match '/pictures/:id/zoom/:name.:format' => 'pictures#zoom',
-		:as => :zoom_picture, :defaults => { :format => Alchemy::Config.get(:image_store_format) }
-	match  "/pictures/:id/thumbnails/:size(/:crop)(/:crop_from/:crop_size)/:name.:format" => 'pictures#thumbnail',
-		:as => :thumbnail, :defaults => { :format => 'png', :name => "thumbnail" }
-
-	resources :messages, :only => [:index, :new, :create]
-
-	resources :user_sessions
-	resources :elements, :only => :show
-
-	namespace :admin do
-
-		resources :users
-
-		resources :contents do
-			collection do
-				post :order
-			end
-		end
-
-		resources :pages do
-			resources :elements
-			collection do
-				post :order
-				post :flush
-				post :copy_language_tree
-				get :switch_language
-				get :create_language
-				get :link
-				get :sort
-			end
-			member do
-				post :unlock
-				post :publish
-				post :fold
-				post :visit
-				get :configure
-				get :preview
-			end
-		end
-
-		resources :elements do
-			resources :contents
-			collection do
-				get :list
-				post :order
-			end
-			member do
-				post :fold
-				delete :trash
-			end
-		end
-
-		resources :layoutpages, :only => :index
-
-		resources :pictures do
-			collection do
-				post :flush
-			end
-			member do
-				get :show_in_window
-				delete :remove
-			end
-		end
-
-		resources :attachments do
-			member do
-				get :download
-			end
-		end
-
-		resources :essence_pictures, :except => [:show, :new, :create] do 
-			collection do
-				put :assign
-			end
-			member do 
-				get :crop
-			end
-		end
-
-		resources :essence_files, :only => [:edit, :update] do
-			collection do
-				put :assign
-			end
-		end
-
-		resources :essence_videos
-
-		resources :languages
-
-		# OHOHOH lovely Rails! Why, oh why I always have to hack thou?
-		resource :clipboard, :only => :index, :controller => 'clipboard' do
-			collection do
-				get :index
-				delete :clear
-				delete :remove
-				post :insert
-			end
-		end
-
-		# OHOHOH lovely Rails! Why, oh why I always have to hack thou?
-		resource :trash, :only => :index, :controller => 'trash' do
-			collection do
-				get :index
-				delete :clear
-			end
-		end
-
-	end
-
-	match '/:lang' => 'pages#show',
-		:constraints => {:lang => /[a-z]{2}(-[a-z]{2})?/},
-		:as => :show_language_root
-
-	# The page show action has to be last route
-	match '(/:lang)(/:level1(/:level2(/:level3)))/:urlname(.:format)' => 'pages#show',
-		:constraints => {:lang => /[a-z]{2}(-[a-z]{2})?/},
-		:as => :show_page
+  root :to => 'pages#show'
+
+  match '/admin' => redirect(
+    "#{Alchemy.mount_point}/admin/dashboard"
+  )
+  match '/admin/login' => 'user_sessions#login',
+        :as => :login
+  match '/admin/signup' => 'user_sessions#signup',
+        :as => :signup
+  match '/admin/leave' => 'user_sessions#leave',
+        :as => :leave_admin
+  match '/admin/logout' => 'user_sessions#logout',
+        :as => :logout
+  match '/admin/dashboard' => 'admin/dashboard#index',
+        :as => :admin_dashboard
+
+  match '/attachment/:id/download(/:name)(.:format)' => 'attachments#download',
+        :as => :download_attachment
+
+  # catching legacy download urls
+  match '/wa_files/download/:id' => 'attachments#download'
+  match '/uploads/files/0000/:id/:name(.:suffix)' => 'attachments#download'
+
+  match '/attachment/:id/show' => 'attachments#show',
+        :as => :show_attachment
+
+  match "/pictures/:id/show(/:size)(/:crop)(/:crop_from/:crop_size)/:name.:format" => 'pictures#show',
+        :as => :show_picture
+  match '/pictures/:id/zoom/:name.:format' => 'pictures#zoom',
+        :as => :zoom_picture
+  match "/pictures/:id/thumbnails/:size(/:crop)(/:crop_from/:crop_size)/:name.:format" => 'pictures#thumbnail',
+        :as => :thumbnail, :defaults => {:format => 'png', :name => "thumbnail"}
+
+  resources :messages, :only => [:index, :new, :create]
+
+  resources :user_sessions
+  resources :elements, :only => :show
+
+  namespace :admin do
+
+    resources :users
+
+    resources :contents do
+      collection do
+        post :order
+      end
+    end
+
+    resources :pages do
+      resources :elements
+      collection do
+        post :order
+        post :flush
+        post :copy_language_tree
+        get :switch_language
+        get :create_language
+        get :link
+        get :sort
+      end
+      member do
+        post :unlock
+        post :publish
+        post :fold
+        post :visit
+        get :configure
+        get :preview
+      end
+    end
+
+    resources :elements do
+      resources :contents
+      collection do
+        get :list
+        post :order
+      end
+      member do
+        post :fold
+        delete :trash
+      end
+    end
+
+    resources :layoutpages, :only => :index
+
+    resources :pictures do
+      collection do
+        post :flush
+      end
+      member do
+        get :show_in_window
+        delete :remove
+      end
+    end
+
+    resources :attachments do
+      member do
+        get :download
+      end
+    end
+
+    resources :essence_pictures, :except => [:show, :new, :create] do
+      collection do
+        put :assign
+      end
+      member do
+        get :crop
+      end
+    end
+
+    resources :essence_files, :only => [:edit, :update] do
+      collection do
+        put :assign
+      end
+    end
+
+    resources :essence_videos
+
+    resources :languages
+
+    # OHOHOH lovely Rails! Why, oh why I always have to hack thou?
+    resource :clipboard, :only => :index, :controller => 'clipboard' do
+      collection do
+        get :index
+        delete :clear
+        delete :remove
+        post :insert
+      end
+    end
+
+    # OHOHOH lovely Rails! Why, oh why I always have to hack thou?
+    resource :trash, :only => :index, :controller => 'trash' do
+      collection do
+        get :index
+        delete :clear
+      end
+    end
+
+  end
+
+  match '/:lang' => 'pages#show',
+        :constraints => {:lang => /[a-z]{2}(-[a-z]{2})?/},
+        :as => :show_language_root
+
+  # The page show action has to be last route
+  match '(/:lang)(/:level1(/:level2(/:level3)))/:urlname(.:format)' => 'pages#show',
+        :constraints => {:lang => /[a-z]{2}(-[a-z]{2})?/},
+        :as => :show_page
 
 end