start to switch to rails 3.2.2

config/application.rb

@@ -2,9 +2,12 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-# If you have a Gemfile, require the gems listed there, including any gems
-# you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env) if defined?(Bundler)
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
 
 module Mailr
   class Application < Rails::Application
@@ -13,47 +16,44 @@ module Mailr
     # -- all .rb files in that directory are automatically loaded.
 
     # Custom directories with classes and modules you want to be autoloadable.
-    config.autoload_paths += %W(#{config.root}/lib)
+    # config.autoload_paths += %W(#{config.root}/extras)
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
-    #config.plugins = [ :acts_as_notes_owner, :all ]
-
-    config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
+    # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
 
     # Activate observers that should always be running.
     # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
 
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    config.time_zone = 'Warsaw'
-
-    #FIXME time zone move to config
+    # config.time_zone = 'Central Time (US & Canada)'
 
     # 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}').to_s]
     # config.i18n.default_locale = :de
 
-    # JavaScript files you want as :defaults (application.js is always included).
-    # config.action_view.javascript_expansions[:defaults] = %w(jquery rails)
-
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types
+    # config.active_record.schema_format = :sql
+
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    # config.active_record.whitelist_attributes = true
+
+    # Enable the asset pipeline
+    config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
   end
 end
-
-class ActiveSupport::BufferedLogger
-    def custom(desc,t)
-        info "\n**** #{desc} *****"
-        info t
-        info "**********************\n\n"
-    end
-end
-
-class MailrException < Exception
-end
-
-

config/database.yml

@@ -0,0 +1,42 @@
+# MySQL.  Versions 4.1 and 5.0 are recommended.
+# 
+# Install the MYSQL driver
+#   gem install mysql2
+#
+# Ensure the MySQL gem is defined in your Gemfile
+#   gem 'mysql2'
+#
+# And be sure to use new-style password hashing:
+#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
+development:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: mailr_development
+  pool: 5
+  username: root
+  password:
+  host: localhost
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+test:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: mailr_test
+  pool: 5
+  username: root
+  password:
+  host: localhost
+
+production:
+  adapter: mysql2
+  encoding: utf8
+  reconnect: false
+  database: mailr_production
+  pool: 5
+  username: root
+  password:
+  host: localhost

config/defaults.yml

@@ -1,53 +0,0 @@
-version: 0.8.7
-
-theme: olive
-locale: pl
-
-themes: [olive]
-locales: [en, pl]
-msgs_per_page_table: [15, 20, 25, 30, 35, 40, 45, 50]
-msg_send_type: [html, text]
-msg_image_view_as: [attachment, thumbnail]
-msg_image_thumbnail_size: [128x128, 128x96, 192x192, 192x144, 256x256, 256x192]
-
-contacts_table_fields: [nick, first_name, last_name, email, info]
-contacts_per_page: 25
-
-links_table_fields: [name, url, info]
-links_per_page: 30
-
-servers_table_fields: [name, port, use_ssl, use_tls, for_imap, for_smtp, auth]
-
-msgs_per_page: 20
-msgs_refresh_time: 300
-msgs_send_type: html
-msgs_update_time: 600
-msgs_inbox_view_fields: [from_addr, subject, date, size]
-msgs_sent_view_fields: [to_addr, subject, date, size]
-
-msg_subject_length: 50
-msg_address_length: 35
-msg_search_fields: [subject, from, to]
-msg_upload_dir: "tmp/uploads"
-
-contact_tmp_filename: contact_import
-
-# if encoding can not be get from data
-msg_unknown_charset: ISO-8859-2
-
-imap_debug: true
-imap_use_ssl: 'false'
-imap_port: 143
-imap_ssl_port: 993
-imap_bye_timeout_retry_seconds: 2
-imap_fetch_slice: 20
-
-smtp_port: 25
-
-session_encryption: true
-session_password: asDD3s2@sAdc983#
-
-mailbox_max_parent_folder_depth: 3
-
-# array of logins which only can login to application, comment it to allow everyone to login
-only_can_logins: [somelogin1, somelogin2]

config/environment.rb

@@ -3,4 +3,3 @@ require File.expand_path('../application', __FILE__)
 
 # Initialize the rails application
 Mailr::Application.initialize!
-

config/environments/development.rb

@@ -2,16 +2,15 @@ Mailr::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on
-  # every request.  This slows down response time but is perfect for development
-  # since you don't have to restart the webserver when you make code changes.
+  # every request. This slows down response time but is perfect for development
+  # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
 
   # Show full error reports and disable caching
-  config.consider_all_requests_local       = false
-  config.action_view.debug_rjs             = true
+  config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send
@@ -22,5 +21,17 @@ Mailr::Application.configure do
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
-end
 
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  config.active_record.auto_explain_threshold_in_seconds = 0.5
+
+  # Do not compress assets
+  config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
+end

config/environments/production.rb

@@ -1,7 +1,6 @@
 Mailr::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
-  # The production environment is meant for finished, "live" apps.
   # Code is not reloaded between requests
   config.cache_classes = true
 
@@ -9,31 +8,46 @@ Mailr::Application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  config.serve_static_assets = false
+
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
+
+  # Generate digests for assets URLs
+  config.assets.digest = true
+
+  # Defaults to Rails.root.join("public/assets")
+  # config.assets.manifest = YOUR_PATH
+
   # Specifies the header that your server uses for sending files
-  #config.action_dispatch.x_sendfile_header = "X-Sendfile"
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
-  # For nginx:
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
-
-  # If you have no front-end server that supports something like X-Sendfile,
-  # just comment this out and Rails will serve the files
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
 
   # See everything in the log (default is :info)
   # config.log_level = :debug
 
+  # Prepend all log lines with the following tags
+  # config.log_tags = [ :subdomain, :uuid ]
+
   # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
 
-  # Disable Rails's static asset server
-  # In production, Apache or nginx will already do this
-  config.serve_static_assets = false
-
-  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # Enable serving of images, stylesheets, and JavaScripts from an asset server
   # config.action_controller.asset_host = "http://assets.example.com"
 
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # config.assets.precompile += %w( search.js )
+
   # Disable delivery errors, bad email addresses will be ignored
   # config.action_mailer.raise_delivery_errors = false
 
@@ -46,4 +60,8 @@ Mailr::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  # config.active_record.auto_explain_threshold_in_seconds = 0.5
 end

config/environments/test.rb

@@ -2,12 +2,16 @@ Mailr::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
+  # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
+  # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
-  # Log error messages when you accidentally call methods on nil.
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
+
+  # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
 
   # Show full error reports and disable caching
@@ -25,10 +29,8 @@ Mailr::Application.configure do
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

config/initializers/inflections.rb

@@ -8,3 +8,8 @@
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
+#
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.acronym 'RESTful'
+# end

config/initializers/secret_token.rb

@@ -4,4 +4,4 @@
 # If you change this key, all old signed cookies will become invalid!
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
-Mailr::Application.config.secret_token = 'f07b5830035b1471d3c008debde5c152077eaff97f0dfcebaf265fe96db24dc5af46eb27e149e3077df89d7dbe2eb088ab7ef7b0e8b496d7ca005e31f6dc3017'
+Mailr::Application.config.secret_token = '014b3111b40bea36f7c0ab07ff2ae820f71b19bb67970baf1f7b44dc1555aae92a68395db757548058884dd4884b1267823d4d44a783160a595e2668d2e904a8'

config/initializers/show_exceptions.rb

@@ -1,16 +0,0 @@
-require 'action_dispatch/middleware/show_exceptions'
-
-module ActionDispatch
-  class ShowExceptions
-    private
-      def render_exception_with_template(env, exception)
-        body = InternalController.action(rescue_responses[exception.class.name]).call(env)
-        log_error(exception)
-        body
-      rescue
-        render_exception_without_template(env, exception)
-      end
-
-      alias_method_chain :render_exception, :template
-  end
-end

config/initializers/wrap_parameters.rb

@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters :format => [:json]
+end
+
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end

config/locales/en.yml

@@ -1,63 +1,5 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
 en:
-  activerecord:
-    attributes:
-      prefs:
-        theme: Theme
-        locale: Locale
-        msgs_per_page: Messages per page
-        msg_send_type: Message send format
-  contact:
-    compose_to_selected: Compose to selected
-    delete_selected: Delete selected
-    modifying: Modifying contact
-    creating_new: Creating new contact
-    create_new: Create new contact
-    contacts: Contacts
-    contact: Contact
-    no_selected: No contact selected
-    total_entries: Total contacts entries
-    no_entries: No contacts
-    was_created: Contact was created
-    are_you_sure_to_delete_contact: Are You sure to delete contact?
-
-  prefs:
-    prefs: Preferences
-
-  folder:
-    folders: Folders
-    no_shown: No folders shown
-    parent: Parent folder
-    to_create: Folder to create
-    to_delete: Folder to delete
-    shown: Shown folders
-    emptybin: Empty
-    current: Current folder
-    no_selected: No folder selected
-    to_create_empty: No folder name
-    max_depth: Maximum folder depth reached
-    can_not_create: Can not create folder
-    was_created: Folder was created
-    to_delete_empty: No folder to delete
-    can_not_delete: Can not delete folder
-    was_deleted: Folder was deleted
-
-  message:
-    messages: Messages
-
-  compose:
-    compose: Compose
-
-  user:
-    login_failure: Login failure. Bad email or password
-    logged_out: User was logged out
-    setup_done: Setup done. Please login in
-
-  must_be_unique: must be unique
-  some_add_info: some additional information
-  example: example
-  refresh: Refresh
-  create: Create
-  delete: Delete
-  show_hide: Show/Hide
-  mailr: Mailr
-  save: Save
+  hello: "Hello world"

config/locales/en.yml.old

@@ -1,160 +0,0 @@
-en:
-  activerecord:
-    attributes:
-      prefs:
-        theme: Theme
-        locale: Locale
-        msgs_per_page: Messages per page
-        msg_send_type: Message send format
-  contact:
-    compose_to_selected: Compose to selected
-    delete_selected: Delete selected
-    modifying: Modifying contact
-    creating_new: Creating new contact
-    create_new: Create new contact
-    contacts: Contacts
-    contact: Contact
-    no_selected: No contact selected
-    total_entries: Total contacts entries
-    no_entries: No contacts
-    was_created: Contact was created
-    are_you_sure_to_delete_contact: Are You sure to delete contact?
-
-  prefs:
-    prefs: Preferences
-
-  folder:
-    folders: Folders
-    no_shown: No folders shown
-    parent: Parent folder
-    to_create: Folder to create
-    to_delete: Folder to delete
-    shown: Shown folders
-    emptybin: Empty
-    current: Current folder
-    no_selected: No folder selected
-
-  message:
-    messages: Messages
-
-  compose:
-    compose: Compose
-
-  must_be_unique: must be unique
-  some_add_info: some additional information
-  example: example
-  refresh: Refresh
-  create: Create
-  delete: Delete
-  show_hide: Show/Hide
-
-  mailr:          Mailr
-  email:          Email
-  password:       Password
-  log_in:         Log In
-  wrong_email_or_password:  Wrong email or password specified.
-  mailbox:        Mailbox
-  empty:          Empty
-  logout:         Logout
-  filters:        Filters
-  search:         Search
-  search_txt:     Search in message field
-  operations:     Operations
-  operations_txt: Operations on marked messages
-  copy:           copy
-  move:           move
-  mark_read:      mark read
-  mark_unread:    mark unread
-  destination_txt:  Destination for move and copy operations
-  for:            for
-  to:             To
-  subject:        Subject
-  date:           Date
-  size:           Size
-  from:           From
-  show_all:       Show all
-  pages:          Pages
-  first:          First
-  prev:           Prev
-  next:           Next
-  last:           Last
-  back_to_list:   Back to list
-  back_to_message:  Back to message
-  reply:          Reply
-  forward:        Forward
-  delete:         Delete
-  view_source:    View source
-  add_filter:     Add filter
-  cc:             CC
-  bcc:            BCC
-  send:           Send
-  choose_address: Choose addresses from contacts
-  compose_txt:    Compose new mail
-  attachment:     Attachment
-  add:            Add
-  first_name:     First name
-  last_name:      Last name
-  send_type:      Send type message
-  messages_per_page:    Messages per page
-  check_external_mail:  Check external mail?
-  check_external_mail_txt:  Note that by selecting this option webmail system will try to log you using your original email on a local server.
-  save:           Save
-  cancel:         Cancel
-  add_one_contact:  Add one contact
-  add_multiple:   Add multiple
-  name:           name
-  add_folder:     Add folder
-  total_messages: Total messages
-  unseen:         Unseen
-  please_login: Log in
-  site_link: https://github.com/lmanolov/mailr
-  user_logged_out: User was logged out
-  unknown_user_title: Unknown user
-  unknown_user_flash: Your email identifier was not found in database
-  unknown_user_login: Go to login page and try to login once more.
-  unknown_user_setup: Go to setup page and do the setup of Your mail account.
-  setup_title: Setup
-  server_name: Server name
-  setup_done: Setup done. Please log in
-  login_failure: Login failure. Bad email or password
-  general_error: General error
-  unspecified_error: Unspecified error occured
-  imap_error: IMAP Error
-  folder_to_create: Folder to create
-  subscribe_unsubscribe: (Un)Subscribe
-  folders_subscribed_selected: Folders subscribed
-  messages: Messages
-  folder_to_create_empty: Folder to create is empty
-  folder_was_created: Folder was created
-  can_not_create_folder: Can not create folder
-  folder_max_depth: Maximum folder depth reached
-  folder_to_delete_empty: Folder to delete empty
-  folder_was_deleted: Folder was deleted
-  can_not_delete_folder: Can not delete folder
-  system_folder: System folder
-  refresh_folders: Refresh folders
-  show_hide: Show/Hide
-  page_not_found: Page not found
-  bytes: Bytes
-  kbytes: Kb
-  mbytes: MB
-  previous_page: Previous page
-  next_page: Next page
-  copy: Copy
-  move: Move
-  checked_messages: checked messages
-  to: to
-  to_folder: folder
-  set_read: Set read
-  set_unread: Set unread
-  search: Search
-  in_message_field: in message field
-  string: string
-  total_messages: Total messages
-  no_messages_in: No messages in folder
-  no_subject: No subject
-  no_messages_selected: No messages selected
-
-
-
-

config/locales/es-ES.yml

@@ -1,91 +0,0 @@
-es-ES:
-  mailr:          Mailr
-  email:          Email
-  password:       Contraseña 
-  log_in:         Iniciar sesión
-  wrong_email_or_password:  Email o contraseña incorrecta
-  mailbox:        Buzon de Correo
-  folders:        Carpetas
-  folder:         Carpeta
-  empty:          Vaciar
-  logout:         Cerrar sesión
-  compose:        Redactar
-  preferences:    Opciones
-  filters:        Filtros
-  contacts:       Contactos
-  search:         Buscar
-  search_txt:     Buscar en el campo
-  refresh:        Refrescar
-  operations:     Operaciones
-  operations_txt: Operaciones en mensajes marcados
-  delete:         borrar
-  copy:           copiar
-  move:           mover
-  junk:           Basura
-  sent:           Enviados
-  inbox:          Bandeja de Entrada
-  trash:          Basura
-  drafts:         Borradores
-  mark_read:      marcar como leido
-  mark_unread:    marcar comono leido
-  destination_txt:  Destino para operaciones de copiado y movido
-  for:            para
-  to:             Para
-  subject:        Asunto
-  date:           Fecha
-  size:           Tamaño
-  from:           De
-  show_all:       Mostrar todos
-  pages:          Páginas
-  first:          Primero
-  prev:           Previo
-  next:           Siguiente
-  last:           Último
-  back_to_list:   Volver a la lista
-  back_to_message:  Volver al mensaje
-  reply:          Responder
-  forward:        Reenviar
-  view_source:    Ver fuente
-  add_filter:     Agregar filtro
-  cc:             CC
-  bcc:            BCC
-  send:           Enviar
-  choose_address: Elegir dirección desde contactos
-  choose:         Elegir
-  compose_txt:    Componer nuevo correo
-  groups:         Grupos
-  attachment:     Adjunto
-  add:            Agregar
-  first_name:     Nombre
-  last_name:      Apellido
-  send_type:      Enviar mensaje tipo
-  messages_per_page:    Mensajes por página
-  check_external_mail:  Comprobar correos externos?
-  check_external_mail_txt:  Note that by selecting this option webmail system will try to log you using your original email on a local server.
-  save:           Guardar
-  save_and_add_another:           Guardar y agregar otro
-  cancel:         Cancelar
-  add_one_contact:  Agregar un contacto
-  add_multiple:   Agregar multiples
-  add_multiple_contacts:   Agregar multiples contactos
-  name:           nombre
-  add_folder:     Agregar carpeta
-  total_messages: Mensajes totales
-  unseen:         No leidos
-  edit_create_contact: Editar o crear contacto
-  back_to_contacts: Volver a contactos
-  email_exists: Una cuenta con ese correo electrónico ya existe.
-  delete_contact_question: "Desea borrar este contacto? {{name}} - {{email}}"
-  validate_fname_error: Por favor, ingrese un nombre (2 a 20 caracteres)
-  validate_lname_error: Por favor, ingrese un apellido (2 a 20 caracteres)
-  validate_email_error: Por favor, ingrese una dirección email válida.
-  contact_cannot_be_changed: El email del contacto no puede ser cambiado
-  csv_file: Archivo separado por comas(CSV)
-  tab_file: Archivo separado por tabulaciones
-  select_file: Selecionar archivo
-  import: Importar
-  back_to_folders: Volver a carpetas
-  add_edit_folder: agregar/editar
-  user_logged_out: Sesión cerrada correctamente
-  please_login: Por favor, inicie sesión
-  want_to_empty_trash_message: ¿Realmente quieres vaciar la papelera?

config/locales/pl.yml

@@ -1,227 +0,0 @@
-pl:
-  date:
-    day_names: [Niedziela, Poniedziałek, Wtorek, Środa, Czwartek, Piątek, Sobota]
-    abbr_day_names: [Ni, Po, Wt, Śr, Cz, Pi, So]
-    month_names: [~, Styczeń, Luty, Marzec, Kwiecień, Maj, Czerwiec, Lipiec, Sierpień, Wrzesień, Październik, Listopad, Grudzień]
-    abbr_month_names: [~, Sty, Lut, Mar, Kwi, Maj, Czer, Lip, Sier, Wrze, Paź, Lis, Grudz]
-    order: [ :year, :month, :day ]
-  activerecord:
-    errors:
-      messages:
-        blank: "nie może być pust(a/e/y) "
-        too_short: "za krótki(e) (min. %{count} znak(i/ów)) "
-        too_long: "za długi(e) (max. %{count} znak(i/ów)) "
-        invalid: "ma niepoprawny format "
-        not_unique: "musi być unikalny "
-        taken: "musi być unikalny"
-        record_invalid: Nieprawidłowy format danych
-    models:
-      contact: Kontakt
-      server: Serwer
-      link: Sznurek
-    attributes:
-      link:
-        name: Nazwa
-        url: Adres
-        info: Informacje
-      contact:
-        nick: Pseudonim
-        first_name: Imię
-        last_name: Nazwisko
-        email: E-mail
-        info: Informacje dodatkowe
-      prefs:
-        theme: Temat
-        locale: Ustawienia językowe
-        msgs_per_page: Ilość wiadomości wyświetlanych na stronie
-        msg_send_type: Format wysyłanej wiadomości
-        msg_image_view_as: Prezentuj obraz jako
-        msg_image_thumbnail_size: Rozmiar miniaturki obrazu
-      message:
-        from_addr: Od
-        to_addr: Do
-        subject: Temat
-        size: Rozmiar
-        date: Data
-        body: Treść
-        cc_addr: Dw
-        bcc_addr: UDw
-      user:
-        email: E-mail
-        password: Hasło
-        first_name: Imię
-        last_name: Nazwisko
-        domain: Domena
-      server:
-        name: Nazwa serwera
-        port: Port
-        use_ssl: SSL?
-        use_tls: TLS?
-        for_imap: IMAP?
-        for_smtp: SMTP?
-        auth: Metoda autoryzacji
-
-  contact:
-    compose_to_selected: Napisz do wybranych
-    delete_selected: Usuń wybrane
-    modifying: Modyfikacja kontaktu
-    creating_new: Nowy kontakt
-    create_new: Utwórz nowy kontakt
-    contacts: Kontakty
-    contact: Kontakt
-    no_selected: Nie wybrano żadnego kontaktu
-    total_entries: Liczba kontaktów
-    no_entries: Brak kontaktów
-    was_created: Kontakt został utworzony
-    are_you_sure_to_delete_contact: Czy na pewno chcesz usunąć kontakt?
-    export: Export
-    import: Import
-    were_imported: Kontakty zostały zaimportowane
-    format_error: Nieprawidłowy format kontaktu
-
-  link:
-    link: Sznurek
-    links: Sznurki
-    create_new: Utwórz nowy sznurek
-    no_entries: Brak sznurków
-    total_entries: Liczba sznurków
-    delete_selected: Usuń wybrane
-
-  prefs:
-    prefs: Ustawienia
-    look: Wygląd
-    identity: Tożsamość
-    servers: Serwery
-    were_saved: Ustawienia zostały zapisane
-    thumbnail: Miniaturka
-    attachment: Załącznik
-
-  folder:
-    folder: Folder
-    folders: Foldery
-    no_shown: Nie prezentowany jest żaden folder. Skonfiguruj widok folderów w zakładce
-    parent: Folder nadrzędny
-    to_create: Folder do utworzenia
-    to_delete: Folder do usunięcia
-    shown: Wyświetlane foldery
-    emptybin: Opróżnij
-    current: Folder bieżący
-    no_selected: Nie wybrano żadnego folderu
-    to_create_empty: Nie podano nazwy folderu
-    max_depth: Osiągnięto maksymalne zagnieżdzenie fodlderów
-    can_not_create: Nie można utworzyć folderu
-    was_created: Folder został utworzony
-    to_delete_empty: Nie wybrano folderu do usunięcia
-    can_not_delete: Nie można usunąć folderu
-    was_deleted: Folder został usunięty
-    to_folder: do folderu
-    system: Folder systemowy
-    not_all_configured: Nie wszystkie systemowe foldery zostały skonfigurowane
-    inbox_name: Odebrane
-    sent_name: Wysłane
-    trash_name: Kosz
-    drafts_name: Roboczy
-    not_configured_drafts: Folder Roboczy nie został przypisany
-    not_configured_sent: Folder Wysłany nie został przypisany
-    not_configured_trash: Folder Kosz nie został przypisany
-    not_configured_inbox: Folder Odebrane nie został przypisany
-    show_hide: Pokaż/Ukryj
-    refresh: Odśwież
-
-  message:
-    messages: Wiadomości
-    no_selected: Nie wybrano żadnej wiadomości
-    total: Liczba wszystkich wiadomości
-    checked: zaznaczone wiadomości
-    set_read: Ustaw jako przeczytane
-    set_unread: Ustaw jako nieprzeczytane
-    no_in: Nie ma żadnych wiadomości w bieżącym folderze
-    no_subject: Brak tematu
-    no_content: Wiadomość nie zawiera treści
-    attachments: Załączniki
-    content: Treść wiadomości
-    header_source: Nagłówek wiadomości
-    show_header: Pokaż nagłówek
-    edit: Edycja
-    images: Obrazy
-    delete: Usuń zaznaczone
-    move: Przenieś
-    copy: Skopiuj
-    trash: Usuń zaznaczone
-    no_date: Brak daty
-
-  compose:
-    compose: Nowa wiadomość
-    new_message: Nowa wiadomość
-    not_contain_at: ",jeżeli nie zawiera znaku @, adres będzie szukany w kontaktach"
-    subject_of_the_message: Temat wiadomości
-    write_your_message_here: Tu wpisz swoją wiadomość
-    was_sent: Wiadomość została wysłana
-    was_saved: Wiadomość została zapisana w katalogu roboczym
-    not_configured_smtp: Brak konfiguracji SMTP
-    select_file: Wybierz plik
-    delete_marked: Usuń zaznaczone
-    upload: Wyślij plik
-    sendout: Wyślij
-    save: Zapisz w katalogu roboczym
-
-  show:
-    reply: Odpowiedz
-    show_header: Pokaż nagłówek
-    delete: Usuń
-    reply_string: "Odp: "
-    trash: Usuń
-
-  user:
-    login_failure: Nieudane logowanie. Podano błędny e-mail lub hasło.
-    logged_out: Użytkownik wylogowany
-    setup_done: Konfiguracja zakończona. Proszę się zalogować.
-    please_login: Logowanie
-    unknown_title: Nieznany użytkownik
-    unknown_flash: Twój identyfikator użytkownika nie został odnaleziony w bazie
-    unknown_login: Idź do strony logowania i zaloguj sie jeszcze raz
-    unknown_setup: Idź do strony konfiguracyjnej i skonfiguruj swój dostęp
-    setup: Konfiguracja
-    login: Logowanie
-    only_can_logins: Podany identyfikator użytkownika nie uprawnia do korzystania z aplikacji
-    logout: Wyloguj
-    has_no_domain: Użytkownik nie ma ustawionej domeny
-
-  internal:
-    imap_error: Błąd protokołu IMAP
-    unspecified_error: Nieoczekiwany błąd
-    not_found: Nie znaleziono żądanej strony
-    internal_server_error: Błąd aplikacji
-    unprocessable_entity: Błąd procesowania
-    about: Informacje o programie
-    current_version: Aktualna wersja
-    general_error: Błąd aplikacji
-
-  common:
-    false_answer: Nie
-    true_answer: Tak
-    file_format_error: Błędny format pliku
-    no_tmp_dir: Brak katalogu tymczasowego
-    must_be_unique: musi być unikalny
-    some_add_info: jakieś dodatkowe informacje
-    example: przykład
-    create: Utwórz
-    delete: Usuń
-    mailr: MailR
-    save: Zapisz
-    copy: Skopiuj
-    move: Przenieś
-    to: do
-    previous_page: Poprzednia
-    next_page: Następna
-    bytes: B
-    kbytes: kB
-    mbytes: MB
-    site_link: https://github.com/lmanolov/mailr
-    no_data: Brak danych
-    download: Pobierz
-    view: Pokaż
-    version: Wersja
-    set: Ustaw
-    no_file_chosen: Nie wybrano żadnego pliku
-    calendar: Kalendarz

config/routes.rb

@@ -1,79 +1,58 @@
 Mailr::Application.routes.draw do
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
 
-    namespace :prefs do
-        post "update_look"
-        post "update_identity"
-        post "update_servers"
-    end
-    match "prefs/look" => "prefs#look", :as => :prefs_look
-    match "prefs/identity" => "prefs#identity", :as => :prefs_identity
-    match "prefs/servers" => "prefs#servers", :as => :prefs_servers
+  # Sample of regular route:
+  #   match 'products/:id' => 'catalog#view'
+  # Keep in mind you can assign values other than :controller and :action
 
-    namespace :contacts do
-        post "ops"
-        get "export"
-    end
-    match "/external" => "contacts#external", :as => :contacts_external
+  # Sample of named route:
+  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
+  # This route can be invoked with purchase_url(:id => product.id)
 
-    resources :contacts
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
 
-    namespace :links do
-        post "ops"
-        get "export"
-    end
-    #match "/external" => "contacts#external", :as => :contacts_external
+  # Sample resource route with options:
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
+  #
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
 
+  # Sample resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
 
-    resources :links
+  # Sample resource route with more complex sub-resources
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', :on => :collection
+  #     end
+  #   end
 
-    namespace :folders do
-        post "create"
-        post "delete"
-        post "system"
-        post "show_hide"
-        post "refresh"
-        get "refresh_status"
-        get "emptybin"
-    end
-    match "/folders/index" => 'folders#index', :as => :folders
-    match "/folders/select/:id" => 'folders#select', :as => :folders_select
+  # Sample resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
 
-    namespace :internal do
-        get "error"
-        get "imaperror"
-        get "loginfailure"
-        get "onlycanlogins"
-    end
-    match "/internal/about" => 'internal#about' ,:as => :about
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  # root :to => 'welcome#index'
 
-    match "/messages_ops/single" => 'messages_ops#single'
-    match "/messages_ops/multi" => 'messages_ops#multi'
-    match "/messages_ops/sendout_or_save" => 'messages_ops#sendout_or_save' ,:as =>:sendout_or_save
-    match "/messages_ops/upload" => 'messages_ops#upload',:as => :upload
-    match "/messages_ops/edit/:id" => 'messages_ops#edit', :as => :edit
-    match "/messages_ops/composed" => 'messages_ops#composed', :as => :composed
+  # See how all your routes lay out with "rake routes"
 
-	root :to => "messages#index"
-
-    match "/messages/index" => 'messages#index', :as => :messages
-    match "/messages/compose" => 'messages#compose', :as => :compose
-    match "/messages/compose/:cid" => 'messages#compose', :as => :compose_contact
-    match "/messages/show/:id" => 'messages#show'
-    match "/messages/html_body/:id" => 'messages#html_body' , :as => :html_body
-    match "/messages/attachment/:id/:idx" => 'messages#attachment', :as => :attachment_download
-
-    namespace :user do
-        get "logout"
-        post "authenticate"
-        post "create"
-        get "login"
-        get "setup"
-        get "unknown"
-    end
-    match "/user/setup/:login" => 'user#setup'
-
-	themes_for_rails
-
-    #match '*a', :to => 'internal#not_found'
-    #match ':controller(/:action(/:id(.:format)))'
+  # This is a legacy wild controller route that's not recommended for RESTful applications.
+  # Note: This route will make all actions in every controller accessible via GET requests.
+  # match ':controller(/:action(/:id))(.:format)'
 end