tenon 1.1.4 → 1.1.5

data/app/mailers/tenon/contact_mailer.rb

@@ -7,7 +7,7 @@ module Tenon
       @contact = contact
       mail(
         to: Tenon::MySettings.contact_email,
-        subject: "#{Tenon::MySettings.site_name} - New Contact Request",
+        subject: "#{Tenon::MySettings.site_name} - #{I18n.t('tenon.contact_mailer.new_contact_request')}",
         from: @contact.email
       )
     end

data/app/models/tenon/asset.rb

@@ -50,7 +50,7 @@ module Tenon
 
     def check_attached_items
       unless item_assets.count == 0
-        errors.add(:base, "This asset has been attached to items in your site and can't be deleted.")
+        errors.add(:base, t('tenon.assets.in_use'))
         return false
       end
     end

data/app/models/tenon/page.rb

@@ -22,7 +22,7 @@ module Tenon
     before_validation :set_slug_and_path
     after_move :set_slug_and_path
     validates_presence_of :title
-    validates_presence_of :slug, message: 'must exist in order to have a properly generated URL.'
+    validates_presence_of :slug, message: I18n.t('tenon.pages.must_exist_in_order_to_have')
     validates_uniqueness_of :slug, scope: :parent_id
     validate :path_is_not_route
     validate :parent_is_not_in_tree
@@ -81,7 +81,7 @@ module Tenon
 
     def path_is_not_route
       match = Rails.application.routes.recognize_path(path, method: :get) rescue nil
-      errors.add(:base, "There's already something happening at #{MySettings.site_url}#{path}.  Try giving the page a different name.") if match && !match[:slugs]
+      errors.add(:base, I18n.t('tenon.pages.theres_already_something_happening', path: "#{MySettings.site_url}#{path}")) if match && !match[:slugs]
     end
 
     def set_slug_and_path
@@ -97,7 +97,7 @@ module Tenon
 
     def parent_is_not_in_tree
       if id && [id, descendants.map(&:id)].flatten.include?(parent_id)
-        msg = 'cannot be itself or one of its subpages.'
+        msg = I18n.t('tenon.pages.cannot_be_itself_or_one_of_its_subpages')
         errors.add(:parent_id, msg)
       end
     end

data/app/models/tenon/tenon_content/row_types.rb

@@ -2,23 +2,23 @@ module Tenon
   module TenonContent
     module RowTypes
       LIBRARY_ROW_TYPES = {
-        'One Column of Text'                => 'FullWidthText',
-        'One Column Image'                  => 'FullWidthImage',
-        'Two Columns of Text'               => 'TwoColumnText',
-        'Two Images'                        => 'TwoColumnImage',
-        'Three Columns of Text'             => 'ThreeColumnText',
-        'Three Images'                      => 'ThreeColumnImage',
-        'Four Columns of Text'              => 'FourColumnText',
-        'Four Images'                       => 'FourColumnImage',
-        'Wrapped Image with Text'           => 'LeftWrappedImageWithText',
-        'Six Images'                        => 'SixColumnImage',
-        'Embedded Content'                  => 'FullWidthEmbeddedContent',
-        'Image and Text (No Wrap)'          => 'LeftImageRightText',
-        'Two Column Image and Text'         => 'TwoColumnImageAndText',
-        'Three Column Image and Text'       => 'ThreeColumnImageAndText',
-        'Four Column Image and Text'        => 'FourColumnImageAndText',
-        'Six Column Image and Text'         => 'SixColumnImageAndText',
-        'Two Columns with Background Image' => 'TwoColumnWithBackgroundImage'
+        I18n.t('tenon.row_types.one_column_of_text') => 'FullWidthText',
+        I18n.t('tenon.row_types.one_column_image') => 'FullWidthImage',
+        I18n.t('tenon.row_types.two_columns_of_text') => 'TwoColumnText',
+        I18n.t('tenon.row_types.two_images') => 'TwoColumnImage',
+        I18n.t('tenon.row_types.three_columns_of_text') => 'ThreeColumnText',
+        I18n.t('tenon.row_types.three_images') => 'ThreeColumnImage',
+        I18n.t('tenon.row_types.four_columns_of_text') => 'FourColumnText',
+        I18n.t('tenon.row_types.four_images') => 'FourColumnImage',
+        I18n.t('tenon.row_types.wrapped_image_with_text') => 'LeftWrappedImageWithText',
+        I18n.t('tenon.row_types.six_images') => 'SixColumnImage',
+        I18n.t('tenon.row_types.embedded_content') => 'FullWidthEmbeddedContent',
+        I18n.t('tenon.row_types.image_and_text_no_wrap') => 'LeftImageRightText',
+        I18n.t('tenon.row_types.two_column_image_and_text') => 'TwoColumnImageAndText',
+        I18n.t('tenon.row_types.three_column_image_and_text') => 'ThreeColumnImageAndText',
+        I18n.t('tenon.row_types.four_column_image_and_text') => 'FourColumnImageAndText',
+        I18n.t('tenon.row_types.six_column_image_and_text') => 'SixColumnImageAndText',
+        I18n.t('tenon.row_types.two_columns_with_background_image') => 'TwoColumnWithBackgroundImage'
       }
     end
   end

data/app/views/layouts/tenon/application.html.haml

@@ -13,6 +13,10 @@
     = javascript_include_tag '/ckeditor/ckeditor'
     = javascript_include_tag 'tenon/tenon_manifest'
 
+    :javascript
+      window.I18n = #{current_translations.to_json.html_safe}
+
+
   %body{data: { controller: params[:controller], action: params[:action] }, class: ('menu-open' if content_for?(:sidebar))}
     = render 'tenon/shared/util_nav'
     = render 'tenon/shared/main_nav'

data/app/views/layouts/tenon/login.html.haml

@@ -12,5 +12,8 @@
     = stylesheet_link_tag 'tenon/tenon', '//fonts.googleapis.com/css?family=Open+Sans:400,700'
     = javascript_include_tag 'tenon/tenon_manifest'
 
+    :javascript
+        window.I18n = #{current_translations.to_json.html_safe}
+
   %body{data: { controller: params[:controller], action: params[:action] }, class: ('menu-open' if content_for?(:sidebar))}
     .tenon-login= yield

data/app/views/tenon/assets/_form.html.haml

@@ -4,12 +4,12 @@
     = error_messages_for :asset
     .fields.full
       .form-group.full
-        = f.text_field :title, placeholder: '--', explanation: "Enter a title for your asset.  You can leave this blank to just use the file name as the title. #{defined?(multiple) ? 'If you upload multiple assets a numerical series will be created.' : '' }"
+        = f.text_field :title, placeholder: '--', explanation: "#{t('tenon.assets.enter_a_title_for_your_asset')} #{defined?(multiple) ? t('tenon.assets.multiple_assets') : '' }"
 
       .form-group
         .browse-button-holder
           .fileupload.btn.btn-comp.browse
-            %span#choose-files= defined?(multiple) ? 'Choose Files' : 'Choose File'
+            %span#choose-files= defined?(multiple) ? t('tenon.assets.choose_file') : t('tenon.assets.choose_files')
             %input{ :type => 'file', :class => 'upload', multiple: defined?(multiple) && multiple, style: 'width: 100%;', name: 'asset[attachment]' }
 
     .spacer

data/app/views/tenon/assets/_sidebar_index.html.haml

@@ -2,17 +2,17 @@
   #new-asset{:style => "display: none;"}= render "form", multiple: true
   .sidebar
     .content
-      %h2 Asset Library
-      = link_to "Upload New", '#', class: 'btn btn-primary btn-block', data: {'modal-target' => '#new-asset', 'modal-title' => 'Upload Assets', 'keyboard' => 'false' }
+      %h2= t('tenon.assets.asset_library')
+      = link_to t('tenon.assets.upload_new'), '#', class: 'btn btn-primary btn-block', data: {'modal-target' => '#new-asset', 'modal-title' => t('tenon.assets.upload_assets'), 'keyboard' => 'false' }
 
-    %h4 File Types
+    %h4= t('tenon.assets.file_types')
     %nav.list-toggles
       %ul
         %li
-          = link_to 'All Assets', assets_path, :class => 'record-list-updater', 'data-clear-record-list-params' => true
+          = link_to t('tenon.assets.all_assets'), assets_path, :class => 'record-list-updater', 'data-clear-record-list-params' => true
 
         %li
-          = link_to 'Images', '?type=images', class: 'record-list-updater'
+          = link_to t('tenon.assets.images'), '?type=images', class: 'record-list-updater'
 
         %li
-          = link_to 'Documents', '?type=documents', class: 'record-list-updater'
+          = link_to t('tenon.assets.documents'), '?type=documents', class: 'record-list-updater'

data/app/views/tenon/assets/crop.html.haml

@@ -3,8 +3,7 @@
   .preview
     .modal-header
       %button{ type: 'button', class: 'close', data: { dismiss: 'modal' }, :'aria-hidden' => 'true' } ×
-      %h4#myModalLabel{ class: 'modal-title'}
-        Crop
+      %h4#myModalLabel{ class: 'modal-title'}= t('tenon.assets.crop')
     .image-holder= image_tag(@asset.attachment.url, id: 'cropbox', data: { width: @asset.dimensions(:original)[0], height: @asset.dimensions(:original)[1] })
     .spinner= fa_icon('spinner spin')
 
@@ -13,5 +12,5 @@
         = f.hidden_field field
       .crop_buttons.right.full
         = f.check_box :duplicate, checked: true, class: 'tn-checkbox-right'
-        = f.label :duplicate, "Create New Asset From Crop?", class: 'left'
-        .right= f.submit "Save", class: 'save btn btn-comp', data: { disable_with: "Please wait..." }
+        = f.label :duplicate, t('tenon.assets.create_new_asset_from_crop'), class: 'left'
+        .right= f.submit t('tenon.common.save'), class: 'save btn btn-comp', data: { disable_with: t('tenon.common.please_wait') }

data/app/views/tenon/assets/edit.html.haml

@@ -9,4 +9,4 @@
       .spacer
 
   .modal-footer
-    = f.submit "Save", class: 'btn btn-comp', data: { disable_with: "Please wait..." }
+    = f.submit t('tenon.common.save'), class: 'btn btn-comp', data: { disable_with: t('tenon.common.please_wait') }

data/app/views/tenon/assets/index.html.haml

@@ -1,7 +1,7 @@
 = render "sidebar_index"
 
 %header
-  %h1 Asset Library
+  %h1= t('tenon.assets.asset_library')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"
@@ -16,4 +16,4 @@
 .main-content
   %ul#assets.record-grid{data: {role: 'records-list', records: {url: assets_path(format: 'json'), template: 'tenon/templates/assets/asset_row', name: 'asset'}}}
 
-  = link_to "Load More Assets", '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#assets'
+  = link_to t('tenon.assets.load_more'), '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#assets'

data/app/views/tenon/comment_mailer/comment_notification.html.haml

@@ -1,7 +1,7 @@
 %p
-  A new comment has been added to
+  = t('tenon.comment_mailer.a_new_comment_has_been_added')
   = link_to @post.title, post_url(@post, host: Tenon::MySettings.full_url)
 
 %p{:style => "text-align:center"} --
 
-%p= simple_format(@comment.content)
+%p= simple_format(@comment.content)

data/app/views/tenon/comments/_sidebar_index.html.haml

@@ -1,22 +1,22 @@
 - content_for :sidebar do
   .sidebar
     .content
-      %h2 Comments
+      %h2= t('tenon.comments.comments')
 
-    %h4 Filter
+    %h4= t('tenon.common.filter')
     %nav.list-toggles
       %ul
         %li
           = link_to(comments_path, :class => 'record-list-updater', 'data-clear-record-list-params' => true) do
-            All
+            = t('tenon.common.all')
             %span.count= @counts[:all]
 
         %li
           = link_to(url_for(type: 'unapproved'), class: 'record-list-updater') do
-            Unapproved
+            = t('tenon.common.unapproved')
             %span.count= @counts[:unapproved]
 
         %li
           = link_to(url_for(type: 'approved'), class: 'record-list-updater') do
-            Approved
-            %span.count= @counts[:approved]
+            = t('tenon.common.approved')
+            %span.count= @counts[:approved]

data/app/views/tenon/comments/index.html.haml

@@ -1,7 +1,7 @@
 = render "sidebar_index"
 
 %header
-  %h1 Comments
+  %h1= t('tenon.comments.comments')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"
@@ -16,4 +16,4 @@
 .main-content
   %ul#comments.record-list.with-thumbnail{data: {records: {url: comments_path(format: 'json'), template: 'tenon/templates/comments/comment_row', name: 'comment'}}}
 
-  = link_to "Load More Comments", '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#comments'
+  = link_to t('tenon.comments.load_more'), '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#comments'

data/app/views/tenon/comments/index.json.jbuilder

@@ -9,7 +9,7 @@ json.records do
       json.commentable_link comment.commentable.title
     end
 
-    json.read_link action_link("Read", '#', 'eye', 'data-modal-target' => "#comment-#{comment.id}", 'data-modal-title' => 'Read Comment')
+    json.read_link action_link(t('tenon.comments.read'), '#', 'eye', 'data-modal-target' => "#comment-#{comment.id}", 'data-modal-title' => t('tenon.comments.read_comment'))
     json.approval_link toggle_link(comment, 'approved', toggle_approved_comment_path(comment), ['thumbs-up', 'Approved'], ['thumbs-down', 'Not Approved'])
     json.delete_link delete_link(comment)
   end

data/app/views/tenon/contact_mailer/contact_notification.html.haml

@@ -1,15 +1,15 @@
 %p
-  A new contact request has been recieved.
-  Reply to this email to get in touch with the person who sent it.
+  = t('tenon.contact_mailer.new_contact_request_received')
+  = t('tenon.contact_mailer.reply_to_this_email')
 
 %p{:style => "text-align:center"} --
 
 %p
-  %strong From:
+  %strong #{t('tenon.contact_mailer.from')}:
   = @contact.name
 
 %p
-  %strong Email:
+  %strong #{t('tenon.contact_mailer.email')}:
   = @contact.email
 
 = simple_format(@contact.content)

data/app/views/tenon/contacts/_sidebar_index.html.haml

@@ -1,32 +1,32 @@
 - content_for :sidebar do
   .sidebar
     .content
-      %h2 Contacts
+      %h2= t('tenon.contacts.contacts')
 
-    %h4 Filter
+    %h4= t('tenon.common.filter')
     %nav.list-toggles
       %ul
         %li
           = link_to(contacts_path, :class => 'record-list-updater', 'data-clear-record-list-params' => true) do
-            All
+            = t('tenon.common.all')
             %span.count= @counts[:all]
 
         %li
           = link_to(url_for(type: 'unread'), class: 'record-list-updater') do
-            Unread
+            = t('tenon.contacts.unread')
             %span.count= @counts[:unread]
 
         %li
           = link_to(url_for(type: 'read'), class: 'record-list-updater') do
-            Read
+            = t('tenon.contacts.read')
             %span.count= @counts[:read]
 
         %li
           = link_to(url_for(type: 'unreplied'), class: 'record-list-updater') do
-            Awaiting reply
+            = t('tenon.contacts.awaiting_reply')
             %span.count= @counts[:unreplied]
 
         %li
           = link_to(url_for(type: 'replied'), class: 'record-list-updater') do
-            Replied
-            %span.count= @counts[:replied]
+            = t('tenon.contacts.replied')
+            %span.count= @counts[:replied]

data/app/views/tenon/contacts/index.html.haml

@@ -1,7 +1,7 @@
 = render "sidebar_index"
 
 %header
-  %h1 Contacts
+  %h1= t('tenon.contacts.contacts')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"
@@ -16,4 +16,4 @@
 .main-content
   %ul#contacts.record-list{data: {records: {url: contacts_path(format: 'json'), template: 'tenon/templates/contacts/contact_row', name: 'contact'}}}
 
-  = link_to "Load More Contacts", '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#contacts'
+  = link_to t('tenon.contacts.load_more'), '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#contacts'

data/app/views/tenon/contacts/index.json.jbuilder

@@ -1,9 +1,9 @@
 json.records do
   json.array!(@contacts) do |contact|
     json.extract!(contact, :id, :name, :email, :phone, :content, :sent_date, :user_ip, :user_agent, :referrer)
-    json.display_link action_link("View Contact Details", '#', 'eye', 'data-modal-target' => "#contact-#{contact.id}", 'data-modal-title' => 'Contact Details')
-    json.read_link toggle_link(contact, 'read', toggle_read_contact_path(contact), ['folder-open-o', 'Mark as Unread'], ['folder-o', 'Mark as Read'])
-    json.reply_link toggle_link(contact, 'replied', toggle_replied_contact_path(contact), ['check', 'Mark as Pending'], ['reply', 'Mark as Replied'])
+    json.display_link action_link(t('tenon.contacts.view_contact_details'), '#', 'eye', 'data-modal-target' => "#contact-#{contact.id}", 'data-modal-title' => t('tenon.contacts.contact_details'))
+    json.read_link toggle_link(contact, 'read', toggle_read_contact_path(contact), ['folder-open-o', t('tenon.contacts.mark_as_unread')], ['folder-o', t('tenon.contacts.mark_as_read')])
+    json.reply_link toggle_link(contact, 'replied', toggle_replied_contact_path(contact), ['check', t('tenon.contacts.mark_as_pending')], ['reply', t('tenon.contacts.mark_as_replied')])
     json.delete_link delete_link(contact)
   end
 end
@@ -12,4 +12,4 @@ json.pagination do
   json.currentPage @contacts.current_page
   json.totalPages @contacts.total_pages
   json.totalEntries @contacts.total_entries
-end
+end

data/app/views/tenon/events/_form.html.haml

@@ -1,8 +1,8 @@
 - content_for :sidebar do
   .sidebar
     .content
-      %h2 Events
-      = link_to "New Event", new_event_path, class: 'btn btn-block btn-primary'
+      %h2= t('tenon.events.events')
+      = link_to t('tenon.events.new_event'), new_event_path, class: 'btn btn-block btn-primary'
 
     = i18n_language_nav(:'tenon/events')
 
@@ -15,7 +15,7 @@
       = f.tenon_content :description
 
   .fields.small
-    %h4.box-label Event Details
+    %h4.box-label= t('tenon.events.event_details')
     .box
       .form-group.bordered= f.text_field :location, :placeholder => '--'
       .form-group.bordered
@@ -23,14 +23,14 @@
       .form-group.bordered
         = f.text_field :ends_at, data: {behaviour: 'datetime-picker'}, placeholder: '--'
 
-    %h4.box-label Publish Your Event
+    %h4.box-label= t('tenon.events.publish_your_event')
     .box
       .form-group
-        = f.text_field :publish_at, label: "Publish Date", data: {behaviour: 'datetime-picker'}, placeholder: '--'
+        = f.text_field :publish_at, label: t('tenon.common.publish_date'), data: {behaviour: 'datetime-picker'}, placeholder: '--'
 
       .row.content
         - if can?(:publish, @event)
-          %button.btn.btn-comp.btn-block.submit{ data: { disable_with: "Please wait..." } } Save
+          %button.btn.btn-comp.btn-block.submit{ data: { disable_with: t('tenon.common.please_wait') } }= t('tenon.common.save')
         - if can?(:create, Tenon::ItemVersion)
           = save_draft_button(@event)
           .last-autosave
@@ -40,5 +40,5 @@
         = clear_draft_link if params[:version]
         = load_draft_link(@event)
         - if @event.persisted?
-          = link_to "Delete", @event, :data => {:method => :delete, :confirm => "Are you sure you want to delete this?"}, :class => 'delete-link'
+          = link_to t('tenon.common.delete'), @event, :data => { :method => :delete, :confirm => t('tenon.common.are_you_sure') }, :class => 'delete-link'
 

data/app/views/tenon/events/edit.html.haml

@@ -1,5 +1,5 @@
 %header
-  %h1 Editing Event
+  %h1= t('tenon.events.editing_event')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"

data/app/views/tenon/events/index.html.haml

@@ -1,11 +1,11 @@
 - content_for :sidebar do
   .sidebar
     .content
-      %h2 Events
-      = link_to "New Event", new_event_path, class: 'btn btn-block btn-primary'
+      %h2= t('tenon.events.events')
+      = link_to t('tenon.events.new_event'), new_event_path, class: 'btn btn-block btn-primary'
 
 %header
-  %h1 Events
+  %h1= t('tenon.events.events')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"
@@ -20,4 +20,4 @@
 .main-content
   %ul#events.record-list{data: {role: 'records-list', records: {url: events_path(format: 'json'), template: 'tenon/templates/events/event_row', name: 'event'}}}
 
-  = link_to "Load More Events", '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#events'
+  = link_to t('tenon.events.load_more'), '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#events'

data/app/views/tenon/events/index.json.jbuilder

@@ -3,7 +3,7 @@ json.records do
     json.extract!(event, :id, :title, :display_date, :location, :edit_path, :edit_link, :delete_link)
 
     if event.published? && main_app.respond_to?(:event_path)
-      json.view_link action_link("View on Site", main_app.event_path(event), "laptop")
+      json.view_link action_link(t('tenon.common.view_on_site'), main_app.event_path(event), "laptop")
     end
 
   end

data/app/views/tenon/events/new.html.haml

@@ -1,5 +1,5 @@
 %header
-  %h1 Create a New Event
+  %h1= t('tenon.events.create_a_new_event')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"

data/app/views/tenon/fields/_asset.html.haml

@@ -21,12 +21,12 @@
 
     .browse-button-holder{ class: ('with-remove' if opts[:remove_association]) }
       .browse-button
-        = link_to 'Browse', new_item_asset_path, class: 'btn btn-comp browse', data: { modal_remote: true, modal_title: "Select #{field.to_s.titleize}", modal_handler: 'Tenon.features.AssetAttachment' }
+        = link_to t('tenon.common.browse'), new_item_asset_path, class: 'btn btn-comp browse', data: { modal_remote: true, modal_title: "#{t('tenon.fields.select')} #{field.to_s.titleize}", modal_handler: 'Tenon.features.AssetAttachment' }
         - if opts[:remove_association]
           %small
             or
-            = link_to_remove_association "remove", f
+            = link_to_remove_association t('tenon.fields.remove'), f
         - else
           %small
             or
-            = link_to "remove", '#', class: 'remove-asset', data: { confirm: 'Are you sure?' }
+            = link_to t('tenon.fields.remove'), '#', class: 'remove-asset', data: { confirm: t('tenon.common.are_you_sure') }

data/app/views/tenon/galleries/_form.html.haml

@@ -1,8 +1,8 @@
 - content_for :sidebar do
   .sidebar
     .content
-      %h2 Galleries
-      = link_to "New Gallery", new_gallery_path, class: 'btn btn-block btn-primary'
+      %h2= t('tenon.galleries.galleries')
+      = link_to t('tenon.galleries.new_gallery'), new_gallery_path, class: 'btn btn-block btn-primary'
 
 = error_messages_for :gallery
 
@@ -13,18 +13,18 @@
 
     .form-group
       %p
-        = link_to_add_association "Add another photo", f, :photos, 'data-association-insertion-node' => '#photo-list', 'data-association-insertion-method' => 'append'
-        = link_to 'Add several', new_item_asset_path(multiple: true), class: 'btn btn-comp browse', data: {'modal-remote' => true, 'modal-title' => "Select file", 'modal-handler' => 'Tenon.features.MultipleAssetAttachment', target: '.tn-tc-asset-fields' }
+        = link_to_add_association t('tenon.galleries.add_another_photo'), f, :photos, 'data-association-insertion-node' => '#photo-list', 'data-association-insertion-method' => 'append'
+        = link_to t('tenon.galleries.add_several'), new_item_asset_path(multiple: true), class: 'btn btn-comp browse', data: {'modal-remote' => true, 'modal-title' => "Select file", 'modal-handler' => 'Tenon.features.MultipleAssetAttachment', target: '.tn-tc-asset-fields' }
 
       %ul.nested-field-list.sortable#photo-list
         = f.nested_fields :photo
 
   .fields.small
-    %h4.box-label Publish
+    %h4.box-label= t('tenon.common.publish')
     .box
       .content
         - if can?(:publish, @gallery)
-          = f.submit 'Save', class: 'btn btn-block btn-comp', data: { disable_with: "Please wait..." }
+          = f.submit t('tenon.common.save'), class: 'btn btn-block btn-comp', data: { disable_with: t('tenon.common.please_wait') }
 
         - if can?(:create, Tenon::ItemVersion)
           = save_draft_button(@gallery)
@@ -35,4 +35,4 @@
         = clear_draft_link if params[:version]
         = load_draft_link(@gallery)
         - if @gallery.persisted?
-          = link_to "Delete", @gallery, :data => {:method => :delete, :confirm => "Are you sure you want to delete this?"}, :class => 'delete-link'
+          = link_to t('tenon.common.delete'), @gallery, :data => { :method => :delete, :confirm => t('tenon.common.are_you_sure') }, :class => 'delete-link'

data/app/views/tenon/galleries/edit.html.haml

@@ -1,5 +1,5 @@
 %header
-  %h1 New Gallery
+  %h1= t('tenon.galleries.new_gallery')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"

data/app/views/tenon/galleries/index.html.haml

@@ -1,10 +1,10 @@
 - content_for :sidebar do
   .sidebar
     .content
-      %h2 Galleries
-      = link_to "New Gallery", new_gallery_path, class: 'btn btn-block btn-primary'
+      %h2= t('tenon.galleries.galleries')
+      = link_to t('tenon.galleries.new_gallery'), new_gallery_path, class: 'btn btn-block btn-primary'
 %header
-  %h1 Galleries
+  %h1= t('tenon.galleries.galleries')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"
@@ -17,6 +17,6 @@
   = render "tenon/shared/section_header/quick_search", record_list: '#galleries'
 
 .main-content
-  %ul#galleries.record-list{data: {records: {url: galleries_path(format: 'json'), template: 'tenon/templates/galleries/gallery_row', name: 'gallery'}}}
+  %ul#galleries.record-list{ data: { records: { url: galleries_path(format: 'json'), template: 'tenon/templates/galleries/gallery_row', name: 'gallery' } } }
 
-  = link_to "Load More Galleries", '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#galleries'
+  = link_to t('tenon.galleries.load_more'), '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#galleries'

data/app/views/tenon/galleries/new.html.haml

@@ -1,5 +1,5 @@
 %header
-  %h1 New Gallery
+  %h1= t('tenon.galleries.new_gallery')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"

data/app/views/tenon/index/index.html.haml

@@ -1,22 +1,22 @@
 - content_for :sidebar do
   .sidebar
     .content
-      %h2 Notifications
+      %h2= t('tenon.index.notifications')
       - unless @warnings.empty?
-        %h3 Some items need your attention!
+        %h3= t('tenon.index.some_items_need_your_attention')
 
         - @warnings.each do |warning|
           .notification= warning
 
 %header
-  %h1 Welcome to Tenon
+  %h1= t('tenon.index.welcome_to_tenon')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"
 
 .main-content
   #dashboard-callouts.container
-    // change the count to test various quantities of callouts - eimaj
+    - # change the count to test various quantities of callouts - eimaj
     - @tenon_callouts.each do |callout|
       .callout
         %h4.title

data/app/views/tenon/item_assets/new.html.haml

@@ -1,7 +1,7 @@
 .modal-tab-pane.tab-content
   - unless params[:hide_upload]
     #upload-asset
-      %h5 From Your Computer
+      %h5= t('tenon.assets.from_your_computer')
       #progress
       = form_for Tenon::Asset.new, format: 'json', builder: Tenon::FormBuilder do |f|
         = error_messages_for :asset
@@ -9,16 +9,16 @@
           .form-group
             .browse-button-holder.solo
               .fileupload.btn.btn-comp.browse
-                %span#choose-files Browse
+                %span#choose-files= t('tenon.common.browse')
                 %input{ :type => 'file', :class => 'upload', multiple: defined?(multiple) && multiple, style: 'width: 100%;', name: 'asset[attachment]' }
         .spacer
 
   #pick-asset
-    %h5 From the Asset Library
+    %h5= t('tenon.assets.from_the_asset_library')
 
-    .filter= text_field_tag :q, '', id: 'quick-search', class: 'filter search', placeholder: 'Filter Assets', data: { 'record-list' => '.asset-list' }
+    .filter= text_field_tag :q, '', id: 'quick-search', class: 'filter search', placeholder: t('tenon.assets.filter_assets'), data: { 'record-list' => '.asset-list' }
 
     .asset-list-scroller
-      %ul#modal-asset-list.asset-list.record-grid.infinite-scroll{data: {records: {url: assets_path(format: 'json'), template: 'tenon/templates/assets/asset_row', name: 'asset'}}}
+      %ul#modal-asset-list.asset-list.record-grid.infinite-scroll{ data: { records: { url: assets_path(format: 'json'), template: 'tenon/templates/assets/asset_row', name: 'asset' } } }
 
-      = link_to "Load More Assets", '#', :class => 'infinite-loader', 'data-record-list' => '#modal-asset-list'
+      = link_to t('tenon.assets.load_more'), '#', :class => 'infinite-loader', 'data-record-list' => '#modal-asset-list'