fae-rails 2.0.0 → 2.1.0

data/app/models/concerns/fae/user_concern.rb

@@ -1 +1,10 @@
-module Fae::UserConcern; end
+module Fae
+  module UserConcern
+    extend ActiveSupport::Concern
+    module ClassMethods
+      def available_languages
+        [:en]
+      end
+    end
+  end
+end

data/app/models/fae/static_page.rb

@@ -42,7 +42,7 @@ module Fae
           languages.each do |lang|
             # Save with suffix for form fields
             define_association("#{name}_#{lang}", type)
-            define_validations("#{name}_#{lang}", type, value[:validates]) if value.try(:[], :validates).present?
+            define_validations("#{name}_#{lang}", type, value[:validates]) if supports_validation(type, value)
           end
           # Save with lookup to have default language return in front-end use (don't need to worry about validations here)
           default_language = Rails.application.config.i18n.default_locale || languages.first
@@ -50,7 +50,7 @@ module Fae
         else
           # Normal content_blocks
           define_association(name, type)
-          define_validations(name, type, value[:validates]) if value.try(:[], :validates).present?
+          define_validations(name, type, value[:validates]) if supports_validation(type, value)
         end
       end
 
@@ -75,6 +75,11 @@ module Fae
       end
     end
 
+    def self.supports_validation(type, value)
+      # validations are only supported on Fae::TextField and Fae::TextArea
+      poly_sym(type) == :contentable && value.try(:[], :validates).present?
+    end
+
     def self.poly_sym(assoc)
       case assoc.name
       when 'Fae::TextField', 'Fae::TextArea'

data/app/models/fae/user.rb

@@ -16,9 +16,8 @@ module Fae
       presence: true,
       uniqueness: { message: 'That email address is already in use. Give another one a go.' },
       format: {
-        with: /^\s*(([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})[\s\/,;]*)+$/i,
-        message: 'is invalid',
-        multiline: true
+        with: Fae.validation_helpers.email_regex,
+        message: 'is invalid'
       }
     validates :password,
       presence: { on: :create },

data/app/uploaders/fae/file_uploader.rb

@@ -18,7 +18,7 @@ module Fae
 
     # Add a white list of extensions which are allowed to be uploaded.
     # For images you might use something like this:
-    def extension_white_list
+    def extension_whitelist
       %w(jpg jpeg gif png pdf)
     end
 

data/app/uploaders/fae/image_uploader.rb

@@ -10,7 +10,7 @@ module Fae
       model.file_size = file.size
     end
 
-    def extension_white_list
+    def extension_whitelist
       %w(jpg jpeg gif png ico)
     end
 

data/app/views/fae/application/_file_uploader.html.slim

@@ -28,7 +28,10 @@ ruby:
         .asset-actions.-files
           a.asset-title href=the_file.asset.url target="_blank" = the_file.asset.file.filename
 
-          = link_to '', fae.delete_file_path(the_file.id), class: 'asset-delete js-asset-delete', remote: true, method: :delete, data: { confirm: t('fae.delete_confirmation') }
+          - if the_file.id.present?
+            = link_to '', fae.delete_file_path(the_file.id), class: 'asset-delete js-asset-delete', remote: true, method: :delete, data: { confirm: t('fae.delete_confirmation') }
+          - else
+            a.js-file-clear.asset-delete.js-asset-delete
 
       .asset-inputs style="#{'display: none;' unless the_file.asset.blank?}"
         = i.input :asset, as: :file, label: false, input_html: { data: { limit: Fae.max_file_upload_size, exceeded: t('fae.exceeded_upload_limit') } }

data/app/views/fae/application/_global_search_results.html.slim

@@ -34,4 +34,4 @@ ul.search-results.js-search-results
 
   - else
 
-    li No results
+    li = t('fae.navbar.no_results')

data/app/views/fae/application/_header.slim

@@ -19,22 +19,22 @@ header.main-header#js-main-header
         a.grabatar-link href="#"
           img.grabatar src=fae_avatar alt=current_user.full_name
         ul
-          li: a href=fae.destroy_user_session_path Log Out
-          li: a href=fae.settings_path Your Settings
+          li: a href=fae.destroy_user_session_path = t('fae.navbar.logout')
+          li: a href=fae.settings_path = t('fae.navbar.your_settings')
 
       li.utility-dropdown.js-utility-dropdown
         a href="#"
           i.icon-settings
         ul
           - if current_user.super_admin_or_admin?
-            li: a href=fae.users_path Users
-            li: a href=fae.activity_log_path Activity Log
+            li: a href=fae.users_path = t('fae.navbar.users')
+            li: a href=fae.activity_log_path = t('fae.navbar.activity_log')
           - if current_user.super_admin?
-            li: a href=fae.option_path Root Settings
+            li: a href=fae.option_path = t('fae.navbar.root_settings')
           - if @option.live_url.present?
-            li: a href=@option.live_url target="_blank" Live Site
+            li: a href=@option.live_url target="_blank" = t('fae.application.live_site')
           - if @option.stage_url.present?
-            li: a href=@option.stage_url target="_blank" Stage Site
+            li: a href=@option.stage_url target="_blank" = t('fae.application.stage_site')
 
       li
         a href=fae.help_path
@@ -45,6 +45,6 @@ header.main-header#js-main-header
 
         .utility-search-hit-area#js-utility-search-wrapper
           .utility-search-wrapper
-            input#js-global-search type="text" placeholder="Jump to..."
+            input#js-global-search type="text" placeholder=t('fae.navbar.jump_to')
 
             == render 'global_search_results', show_nav: true

data/app/views/fae/application/_markdown_helper.slim

@@ -1,41 +1,41 @@
 .markdown-hint
   .markdown-hint-wrapper
-    h3 Markdown Options
+    h3 = t('fae.application.markdown_opts')
 
-    h4 Links
+    h4 = t('fae.application.links')
     p
-      | To link text, place a [bracket] around the link title and use a (/url) to house the url.
+      = t('fae.application.links_help')
       br
       | Internal Link: [link to about](/about)
       br
       | External link: [link to about](http://www.google.com/about)
 
-    h4 Formatting
+    h4 = t('fae.application.formatting')
     p
-      | Emphasize text in a variety of ways by placing **asterisks** to bold, _underscores_ to italicize.
+      = t('fae.application.formatting_help')
       br
-      | Bold **bold**
+      = t('fae.application.bold')
       br
-      | Italicize _italic
+      = t('fae.application.italic')
 
-    h4 Headers
+    h4 = t('fae.application.headers')
     p
-      | Use up to six hashtags to identify the importance of the section header.
+      = t('fae.application.headers_help')
       br
-      | Page Header: # Page Header
+      = t('fae.apllication.headers_example')
       br
-      | Sub Header: ## Sub Header
+      = t('fae.application.subheaders_example')
 
-    h4 List
+    h4 = t('fae.application.list')
     p
-      | Format lists by swapping out the characters that lead the list item.
+      = t('fae.application.list_help')
       br
-      span Bulleted List:
+      span = t('fae.application.bulleted_list')
       br
       == ['* bullet', '* bullet 2'].join('<br />')
       br
-      span Numbered List
+      span = t('fae.application.numbered_list')
       == ['1. line item', '2. line item'].join('<br />')
 
-    h4 Paragraph break
-    p Adding a blank line in between your paragraphs makes a paragraph break.
+    h4 = t('fae.application.paragraph_break')
+    p = t('fae.application.paragraph_break_help')

data/app/views/fae/application/_mobilenav.slim

@@ -55,12 +55,12 @@ nav.nav.mobilenav
     - if @option.stage_url.present? || @option.live_url.present?
       li class=view_site_class
         - if site_urls_are_present
-          a href="#" View Site
+          a href="#" = t('fae.application.view_site')
           ul.subnav.js-subnav
-            li: span.mobilenav-subheader.js-mobile-back View Site
-            li: a.-viewsite href=@option.stage_url target="_blank" Preview Site
-            li: a.-viewsite href=@option.live_url target="_blank" Live Site
+            li: span.mobilenav-subheader.js-mobile-back = t('fae.application.view_site')
+            li: a.-viewsite href=@option.stage_url target="_blank" = t('fae.application.preview_site')
+            li: a.-viewsite href=@option.live_url target="_blank" = t('fae.application.live_site')
         - elsif @option.stage_url.present?
-          a.-viewsite href=@option.stage_url target="_blank" Preview Site
+          a.-viewsite href=@option.stage_url target="_blank" = t('fae.application.preview_site')
         - elsif @option.live_url.present?
-          a.-viewsite href=@option.live_url target="_blank" Live Site
+          a.-viewsite href=@option.live_url target="_blank" = t('fae.application.live_site')

data/app/views/fae/application/_user_log.html.slim

@@ -28,9 +28,9 @@
               - if changed.present?
                 tr
                   td = version.created_at
-                  td = version.user.present? ? version.user.full_name : content_tag(:em, "user no longer exists")
+                  td = version.user.present? ? version.user.full_name : content_tag(:em, t('fae.application.user_absent'))
                   td = changed.join(', ')
 
           - else
             tr
-              td colspan="3" No logs available.
+              td colspan="3" = t('fae.application.no_logs')

data/app/views/fae/images/_image_uploader.html.slim

@@ -7,7 +7,7 @@ ruby:
   alt_label           ||= "#{label} Alt Text"
   caption_label       ||= "#{label} Caption"
   helper_text         ||= ""
-  alt_helper_text     ||= 'Brief description of image contents, used in hover text and by visually impaired users.'
+  alt_helper_text     ||= t('fae.images.alt_helper')
   caption_helper_text ||= ""
   show_alt              = true if show_alt.nil?
   show_caption        ||= false

data/app/views/fae/options/_form.html.slim

@@ -2,15 +2,15 @@
   header.content-header.js-content-header
     h1 Root Settings
     .content-header-buttons
-      a.button#js-header-cancel href=fae.root_path(cancelled: true) Cancel
-      = f.submit 'Save'
+      a.button#js-header-cancel href=fae.root_path(cancelled: true) = t('fae.form.cancel')
+      = f.submit t('fae.form.save')
 
   == render 'flash_messages'
 
   section.content
-    = fae_input f, :title, label: 'Project Name'
+    = fae_input f, :title, label: t('fae.options.project.name')
     = fae_input f, :time_zone, wrapper_class: 'select'
-    = fae_input f, :live_url, label: 'Live URL', helper_text: 'Include http:// for external links.'
-    = fae_input f, :stage_url, label: 'Stage URL', helper_text: 'Include http:// for external links.'
-    = fae_image_form f, :logo, helper_text: 'Used on login page, 300x300px .jpg'
+    = fae_input f, :live_url, label: t('fae.options.live_url'), helper_text: t('fae.options.url_helper')
+    = fae_input f, :stage_url, label: t('fae.options.stage_url'), helper_text: t('fae.options.url_helper')
+    = fae_image_form f, :logo, helper_text: t('fae.options.logo_helper')
     = fae_image_form f, :favicon

data/app/views/fae/pages/activity_log.html.slim

@@ -2,20 +2,20 @@
 
 main.content
 
-  == fae_filter_form title: 'Search Changes', action: fae.activity_log_filter_path do
-    == fae_filter_select :user, options: Fae::User.all.map { |u| [u.full_name, u.id] }
-    == fae_filter_select :model, options: Fae::Change.unique_changeable_types
-    == fae_filter_select :type, options: ['created', 'updated', 'deleted']
-    == fae_filter_select :date, options: ['Last Hour', 'Last Day', 'Last Week', 'Last Month'], placeholder: 'All Time'
+  == fae_filter_form title: t('fae.changes.title'), action: fae.activity_log_filter_path do
+    == fae_filter_select :user, options: Fae::User.all.map { |u| [u.full_name, u.id] }, translation_path: 'fae.changes.models'
+    == fae_filter_select :model, options: Fae::Change.unique_changeable_types, translation_path: 'fae.changes.models'
+    == fae_filter_select :type, options: [t('fae.changes.created'), t('fae.changes.updated'), t('fae.changes.deleted')], translation_path: 'fae.changes.models'
+    == fae_filter_select :date, options: [t('fae.changes.last_hour'), t('fae.changes.last_day'), t('fae.changes.last_week'), t('fae.changes.last_month')], placeholder: t('fae.changes.all_time')
 
   table.js-results-table
     thead
       tr
-        th data-sort="user.first_name" User
-        th data-sort="changeable_type" Item
-        th data-sort="change_type" Type
-        th Attribute(s) Updated
-        th data-sort="updated_at" Modified
+        th data-sort="user.first_name" = t('fae.changes.user')
+        th data-sort="changeable_type" = t('fae.changes.item')
+        th data-sort="change_type" = t('fae.changes.type')
+        th = t('fae.changes.attrs')
+        th data-sort="updated_at" = t('fae.changes.modified')
     tbody
       - if @items.present?
         - @items.each do |change|
@@ -27,6 +27,6 @@ main.content
             td = fae_datetime_format(change.updated_at)
       - else
         tr
-          td colspan=5 No changes recorded
+          td colspan=5 = t('fae.changes.no_changes')
 
   == fae_paginate @items

data/app/views/fae/pages/disabled_environment.html.slim

@@ -1,4 +1,4 @@
 .center
   .sad_face
-  h1 Disabled Admin
-p The admin on this domain has been disabled. This usually occurs on a staging domain where content is managed in production. Contact application support for more information.
+  h1 = t('fae.page.disabled_title')
+p = t('fae.page.disabled_text')

data/app/views/fae/pages/error404.html.slim

@@ -2,6 +2,8 @@
   .sad_face
   h1 Oops!
 p
-  | The page you requested can not be found. Please 
-  a href=fae.root_path click here
-  |  to be taken to our home page.
+  = t('fae.page.error_start')
+  | 
+  a href=fae.root_path = t('fae.page.click')
+  |  
+  = t('fae.page.error_end')

data/app/views/fae/pages/home.html.slim

@@ -1,7 +1,8 @@
 header.content-header.js-content-header.-dashboard
   div
     i.icon-home>
-    |   Hello
+    |   
+    = t('fae.page.hello')
     strong< = current_user.full_name
 
 == render 'flash_messages'
@@ -11,9 +12,9 @@ header.content-header.js-content-header.-dashboard
     table.js-sort-column
       thead
         tr
-          th Name
-          th Type
-          th.-action-wide Modified
+          th = t('fae.common.name')
+          th = t('fae.changes.type')
+          th.-action-wide = t('fae.changes.modified')
       tbody
         - @list.each do |item|
           - begin
@@ -28,9 +29,9 @@ header.content-header.js-content-header.-dashboard
 - else
   section.help-section
     article.content
-      h2 Welcome to Fae
+      h2 = t('fae.page.welcome')
       p
-        ' You don'thave any objects setup to manage. If you need help getting started, check out the
+        = t('fae.page.no_objs_start')
         br
-        a href="https://www.faecms.com/documentation/quickstart-guide" target="_blank" Quickstart Guide and Documentation site
-        ' .
+        a href="https://www.faecms.com/documentation/quickstart-guide" target="_blank"
+        = t('fae.page.no_objs.end')

data/app/views/fae/setup/first_user.html.slim

@@ -1,11 +1,11 @@
 .first_user-form
-  p Please create your super admin user.
+  p = t('fae.setup.prompt')
 
   = simple_form_for(@user, html: { multipart: true, novalidate: true }, url: fae.first_user_path) do |f|
     = fae_input f, :first_name
     = fae_input f, :last_name
     = fae_input f, :email
-    = fae_input f, :password, helper_text: 'Passwords must contain at least 8 characters.'
+    = fae_input f, :password, helper_text: t('fae.setup.password')
     = fae_input f, :password_confirmation
     .login-form-actions
-      = f.button :submit, "Submit"
+      input name="commit" type="submit" value=t('fae.form.save')

data/app/views/fae/shared/_form_header.html.slim

@@ -1,9 +1,9 @@
 ruby:
   require_locals ['header'], local_assigns
-  save_button_text    ||= 'Save'
-  cancel_button_text  ||= 'Cancel'
+  save_button_text    ||= t('fae.form.save')
+  cancel_button_text  ||= t('fae.form.cancel')
   cloneable           ||= false
-  clone_button_text   ||= 'Clone'
+  clone_button_text   ||= t('fae.form.clone')
   subnav              ||= []
   header_as_string      = header.is_a?(String) ? header : header.class.name.split('::').last
   header_as_string      = header_as_string.singularize

data/app/views/fae/shared/_index_header.html.slim

@@ -3,7 +3,8 @@ ruby:
   title       ||= @klass_humanized.pluralize.titleize
   new_button    = !local_assigns[:new_button].eql?(false)
   new_path    ||= "new_#{fae_path}_#{@klass_singular}_path"
-  button_text ||= "Add #{title.singularize}"
+  button_text ||= t('fae.common.add', title: title.singularize)
+  export_text ||= t('fae.common.csv_export')
   csv         ||= false
   breadcrumb    = !local_assigns[:breadcrumbs].eql?(false)
 
@@ -15,7 +16,7 @@ header.content-header.js-content-header
 
   .content-header-buttons
     - if csv && @items.present?
-      a.button href="#{@index_path}.csv" Export to CSV
+      a.button href="#{@index_path}.csv" = export_text
 
     - if new_button
       - if nested

data/app/views/fae/shared/_nested_table.html.slim

@@ -10,7 +10,7 @@ ruby:
   # optional locals
   assoc_name          ||= assoc.to_s                      # 'restaurant_bars'
   title               ||= assoc_name.titleize             # 'Restaurant Bars'
-  add_button_text     ||= "Add #{title.singularize}"
+  add_button_text     ||= t('fae.common.add', title: title.singularize)
   ordered             ||= false
   has_thumb           ||= false
   edit_column         ||= false

data/app/views/fae/shared/_recent_changes.html.slim

@@ -1,14 +1,14 @@
 - unless params[:action] == 'new'
   .content#recent_changes
-    h2 Recent Changes
+    h2 = t('fae.changes.recent')
     section.addedit-form.js-addedit-form
       table
         thead
           tr
-            th User
-            th Type
-            th Attribute(s) Updated
-            th.-action-wide Modified
+            th = t('fae.changes.user')
+            th = t('fae.changes.type')
+            th = t('fae.changes.attrs')
+            th.-action-wide t('fea.changes.modified')
         tbody
           - if @item.try(:tracked_changes).present?
             - @item.tracked_changes.each do |change|
@@ -19,4 +19,4 @@
                 td = fae_datetime_format(change.updated_at)
           - else
             tr
-              td colspan="4" No changes recorded
+              td colspan="4" = t('fae.changes.no_changes')

data/app/views/fae/shared/_shared_nested_table.html.slim

@@ -33,7 +33,7 @@ table class=table_class
             = td_columns(options_for_td)
           - if edit_column
             td
-              a.js-edit-link.js-tooltip.table-action title="Edit" href=self.send(edit_path, item)
+              a.js-edit-link.js-tooltip.table-action title=t('fae.common.edit') href=self.send(edit_path, item)
                 i.icon-edit
           td = fae_delete_button item, "/#{fae_path}/#{assoc_name}/#{item.id.to_s}", class: 'js-tooltip table-action js-delete-link', remote: true