tenon 1.1.4 → 1.1.5

data/app/views/tenon/item_versions/_item_version.json.jbuilder

@@ -1,8 +1,8 @@
-json.title item_version.title.blank? ? "(No Title)" : item_version.title
+json.title item_version.title.blank? ? t('tenon.item_versions.no_title') : item_version.title
 json.created_at item_version.created_at.strftime('%m/%d/%Y at %l:%M%p')
 json.user_email item_version.user.try(:email)
 if item_version.item
-  json.load_link action_link('View Draft', polymorphic_path([:edit, item_version.item], version: item_version.id), 'reply')
+  json.load_link action_link(t('tenon.item_versions.view_draft'), polymorphic_path([:edit, item_version.item], version: item_version.id), 'reply')
 else
-  json.load_link action_link('View Draft', new_polymorphic_path(item_version.item_type.constantize, version: item_version.id), 'reply')
-end
+  json.load_link action_link(t('tenon.item_versions.view_draft'), new_polymorphic_path(item_version.item_type.constantize, version: item_version.id), 'reply')
+end

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

@@ -1,9 +1,6 @@
-.modal-body
-  Choose a draft to load from the list below.  Loading a draft will open it
-  but it will not overwrite the active version of your item until you
-  press Save.
+.modal-body= t('tenon.item_versions.choose_a_draft')
 
   .asset-list-scroller
     %ul.record-list#item_versions{data: {records: {url: item_versions_path(format: 'json', item_type: params[:item_type], item_id: params[:item_id]), template: 'tenon/templates/item_versions/item_version_row', name: 'item_version'}}}
 
-    = link_to "Load Older Drafts", '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#item_versions'
+    = link_to t('tenon.item_versions.load_other_drafts'), '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#item_versions'

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

@@ -9,4 +9,4 @@
       .spacer
 
   .modal-footer
-    %button.btn.btn-comp.submit Save Draft
+    %button.btn.btn-comp.submit= t('tenon.item_versions.save_draft')

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

@@ -1,13 +1,13 @@
 - content_for :sidebar do
   .sidebar
     .content
-      %h2 Pages
+      %h2= t('tenon.pages.pages')
 
-    %h4 Edit Options
+    %h4= t('tenon.common.edit_options')
     %nav
       %ul
-        %li.active= link_to 'Page Content', '#details', data: {toggle: 'tab'}
-        %li= link_to 'Search Optimization', '#seo', data: {toggle: 'tab'}
+        %li.active= link_to t('tenon.pages.page_content'), '#details', data: {toggle: 'tab'}
+        %li= link_to t('tenon.common.search_optimization'), '#seo', data: {toggle: 'tab'}
 
     = i18n_language_nav(:'tenon/pages')
 
@@ -16,35 +16,35 @@
   .fields.large.tabs
     .tab-pane.active#details
       .form-group
-        = f.text_field :title, explanation: 'This is the title that shows up at the top of your page.'
+        = f.text_field :title, explanation: t('tenon.pages.this_is_the_title')
 
       .form-group= f.tenon_content :content
 
     .tab-pane#seo= render 'tenon/shared/seo_fields', f: f
 
   .fields.small
-    %h4.box-label Details
+    %h4.box-label= t('tenon.common.details')
     .box
       .form-group.bordered
-        = f.super_label :parent_id, 'Parent Page'
-        = f.collection_select :parent_id, @potential_parents, :id, :option_title, {:include_blank => "(No Parent)"}
+        = f.super_label :parent_id, t('tenon.pages.parent_page')
+        = f.collection_select :parent_id, @potential_parents, :id, :option_title, { :include_blank => t('tenon.pages.no_parent') }
 
       .form-group.inline.bordered
         = f.check_box :show_in_menu, class: 'tn-checkbox-right'
-        = f.super_label :show_in_menu, "Show in Menu?"
+        = f.super_label :show_in_menu, t('tenon.pages.show_in_menu')
 
       .form-group.inline.bordered
         = f.check_box :show_contact_form, class: 'tn-checkbox-right'
-        = f.super_label :show_contact_form, "Show Contact Form?"
+        = f.super_label :show_contact_form, t('tenon.pages.show_contact_form')
 
-    %h4.box-label Publish Your Page
+    %h4.box-label= t('tenon.pages.publish_your_page')
     .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, @page)
-          %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(@page)
@@ -55,4 +55,4 @@
         = clear_draft_link if params[:version]
         = load_draft_link(@page)
         - if @page.persisted?
-          = link_to "Delete", @page, data: {method: :delete, confirm: 'Are you sure you want to delete this?'}, class: 'delete-link'
+          = link_to t('tenon.common.delete'), @page, data: { method: :delete, confirm: t('tenon.common.are_you_sure') }, class: 'delete-link'

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

@@ -1,5 +1,5 @@
 %header
-  %h1 Edit a Page
+  %h1= t('tenon.pages.edit_a_page')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"

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

@@ -1,11 +1,11 @@
 - content_for :sidebar do
   .sidebar
     .content
-      %h2 Pages
-      = link_to "New Page", new_page_path, class: 'btn btn-block btn-primary'
+      %h2= t('tenon.pages.pages')
+      = link_to t('tenon.pages.new_page'), new_page_path, class: 'btn btn-block btn-primary'
 
 %header
-  %h1 Pages
+  %h1= t('tenon.pages.pages')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"
@@ -18,6 +18,6 @@
   = render "tenon/shared/section_header/quick_search", record_list: '#pages'
 
 .main-content
-  %ul#pages.record-list.sortable.nested{data: {records: {url: pages_path(format: 'json'), template: 'tenon/templates/pages/page_row', name: 'page', nested: 'true'}, :'reorder-path' => reorder_pages_path}}
+  %ul#pages.record-list.sortable.nested{ data: { records: { url: pages_path(format: 'json'), template: 'tenon/templates/pages/page_row', name: 'page', nested: 'true' }, :'reorder-path' => reorder_pages_path } }
 
-  = link_to "Load More Pages", '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#pages'
+  = link_to t('tenon.pages.load_more'), '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#pages'

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

@@ -4,19 +4,19 @@ json.records do
   json.array!(pages) do |page|
     json.extract!(page, :title, :lft, :rgt, :to_param, :parent_id, :id, :list_order)
     json.updated_at page.updated_at.strftime('%B %e, %Y at %l:%m%p')
-    json.updater page.updater.present? ? page.updater.email : 'Unknown User'
+    json.updater page.updater.present? ? page.updater.email : t('tenon.pages.unknown_user')
     json.edit_path edit_page_path(page)
 
     if page.published?
-      json.view_link action_link("View on Site", page.path, "laptop")
+      json.view_link action_link(t('tenon.common.view_on_site'), page.path, "laptop")
     end
 
-    json.subpage_link action_link("Create a Sub-Page", new_page_path(:parent_id => page.id), "plus")
+    json.subpage_link action_link(t('tenon.pages.create_a_sub_page'), new_page_path(:parent_id => page.id), "plus")
     json.edit_link edit_link(page)
     if page.key.blank?
       json.delete_link delete_link(page)
     else
-      json.delete_link action_link("Required Page, Can't Delete", "#", "star")
+      json.delete_link action_link(t('tenon.pages.required_page'), "#", "star")
     end
   end
 end

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

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

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

@@ -8,4 +8,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/post_categories/_post_category.json.jbuilder

@@ -1,2 +1,2 @@
 json.extract!(post_category, :id, :title, :edit_path, :delete_link)
-json.edit_link edit_link(post_category, data: {'modal-remote' => true, 'modal-title' => 'Edit Post Category'})
+json.edit_link edit_link(post_category, data: { 'modal-remote' => true, 'modal-title' => t('tenon.post_categories.edit_post_category') })

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

@@ -4,14 +4,14 @@
 
   .sidebar
     .content
-      %h2 Post Categories
-      = link_to "New Post Category", '#', class: 'btn btn-block btn-primary', data: { 'modal-target' => '#new-post_category', 'modal-title' => 'New Post Category' }
+      %h2= t('tenon.post_categories.post_categories')
+      = link_to t('tenon.post_categories.new_post_category'), '#', class: 'btn btn-block btn-primary', data: { 'modal-target' => '#new-post_category', 'modal-title' => t('tenon.post_categories.new_post_category') }
 
     = render "tenon/shared/posts_nav"
 
 
 %header
-  %h1 Post Categories
+  %h1= t('tenon.post_categories.post_categories')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"
@@ -25,6 +25,6 @@
 
 .main-content
   = error_messages_for :post_category
-  %ul#post_categories.record-list{data: {records: {url: post_categories_path(format: 'json'), template: 'tenon/templates/post_categories/post_category_row', name: 'post_category'}}}
+  %ul#post_categories.record-list{ data: { records: { url: post_categories_path(format: 'json'), template: 'tenon/templates/post_categories/post_category_row', name: 'post_category' } } }
 
-  = link_to "Load More Post Categories", '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#post_categories'
+  = link_to t('tenon.post_categories.load_more'), '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#post_categories'

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

@@ -1,13 +1,13 @@
 - content_for :sidebar do
   .sidebar
     .content
-      %h2 Posts
+      %h2= t('tenon.posts.posts')
 
-    %h4 Edit Options
+    %h4= t('tenon.common.edit_options')
     %nav
       %ul
-        %li.active= link_to 'Post Content', '#details', data: {toggle: 'tab'}
-        %li= link_to "Search Optimization", '#seo', data: {toggle: 'tab'}
+        %li.active= link_to t('tenon.posts.post_content'), '#details', data: { toggle: 'tab' }
+        %li= link_to t('tenon.common.search_optimization'), '#seo', data: { toggle: 'tab' }
 
     = i18n_language_nav(:'tenon/posts')
 
@@ -18,7 +18,7 @@
   .fields.large.tabs
     .tab-pane.active#details
       .form-group
-        = f.text_field :title, :explanation => "Give your post a title."
+        = f.text_field :title, :explanation => t('tenon.posts.give_your_post_a_title')
 
       .form-group
         = f.rich_text :excerpt
@@ -30,28 +30,28 @@
 
   .fields.small
     - unless @categories.blank?
-      %h4.box-label Categories
+      %h4.box-label= t('tenon.posts.categories')
       .box
         .form-group.inline
-          = f.super_label :post_categories, 'Categories'
+          = f.super_label :post_categories, t('tenon.posts.categories')
           = f.select :post_category_ids, @categories.map { |c| [c.title, c.id] }, {}, { multiple: true }
 
-    %h4.box-label Publish Your Post
+    %h4.box-label= t('tenon.posts.publish_your_post')
     .box
       .form-group.bordered
-        = f.super_label :user_id, 'Author'
-        = f.collection_select :user_id, @users, :id, :email, {:include_blank => "(No Author)"}
+        = f.super_label :user_id, t('tenon.posts.author')
+        = f.collection_select :user_id, @users, :id, :email, { :include_blank => t('tenon.posts.no_author') }
 
       .form-group.inline.bordered
         = f.check_box :allow_comments, class: 'tn-checkbox-right'
-        = f.super_label :allow_comments, "Allow Comments?"
+        = f.super_label :allow_comments, t('tenon.posts.allow_comments')
 
       .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, @post)
-          %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(@post)
@@ -62,4 +62,4 @@
         = clear_draft_link if params[:version]
         = load_draft_link(@post)
         - if @post.persisted?
-          = link_to "Delete", @post, :data => {:method => :delete, :confirm => "Are you sure you want to delete this?"}, :class => 'delete-link'
+          = link_to t('tenon.common.delete'), @post, :data => { :method => :delete, :confirm => t('tenon.common.are_you_sure') }, :class => 'delete-link'

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

@@ -1,5 +1,5 @@
 %header
-  %h1 Edit a Post
+  %h1= t('tenon.posts.edit_a_post')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"

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

@@ -1,15 +1,15 @@
 - content_for :sidebar do
   .sidebar
     .content
-      %h2 Posts
-      = link_to "New Post", new_post_path, class: 'btn btn-block btn-primary'
-      #new-post-category{:style => "display: none;"}
+      %h2= t('tenon.posts.posts')
+      = link_to t('tenon.posts.new_post'), new_post_path, class: 'btn btn-block btn-primary'
+      #new-post-category{ :style => "display: none;" }
         =# render "form", category: PostCategory.new
 
     = render "tenon/shared/posts_nav"
 
 %header
-  %h1 Posts
+  %h1= t('tenon.posts.posts')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"
@@ -22,6 +22,6 @@
   = render "tenon/shared/section_header/quick_search", record_list: '#posts'
 
 .main-content
-  %ul#posts.record-list{data: {records: {url: posts_path(format: 'json'), template: 'tenon/templates/posts/post_row', name: 'post'}}}
+  %ul#posts.record-list{ data: { records: { url: posts_path(format: 'json'), template: 'tenon/templates/posts/post_row', name: 'post' } } }
 
-  = link_to "Load More Posts", '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#posts'
+  = link_to t('tenon.posts.load_more'), '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#posts'

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

@@ -1,10 +1,10 @@
 json.records do
   json.array!(@posts) do |post|
     json.extract!(post, :title, :to_param, :id)
-    json.publish_at post.publish_at.present? ? post.publish_at.strftime('%B %e, %Y at %l:%m%p') : 'Date not set'
+    json.publish_at post.publish_at.present? ? post.publish_at.strftime('%B %e, %Y at %l:%m%p') : t('tenon.posts.date_not_set')
     json.edit_path edit_post_path(post)
     if post.published? && main_app.respond_to?(:post_path)
-      json.view_link action_link('View on Site', main_app.post_path(post), 'laptop')
+      json.view_link action_link(t('tenon.common.view_on_site'), main_app.post_path(post), 'laptop')
     end
     json.categories post.post_categories.map{ |c| c.title }.join(', ')
     json.edit_link edit_link(post)

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

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

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

@@ -1,34 +1,34 @@
 - content_for :sidebar do
   .sidebar
     .content
-      %h2 Redirects
-      = link_to "New Redirect", new_redirect_path, class: 'btn btn-block btn-primary'
+      %h2= t('tenon.redirects.redirects')
+      = link_to t('tenon.redirects.new_redirect'), new_redirect_path, class: 'btn btn-block btn-primary'
 
 = autosaving_form_for @redirect do |f|
-  .flash.flash-alert{style: 'padding-right: 40px;'}
+  .flash.flash-alert{ style: 'padding-right: 40px;' }
     %i.fa.fa-exclamation-triangle
-    Redirects will be run when a page cannot be found. It will not redirect an existing page.
+    = t('tenon.redirects.redirects_will_be_run')
 
   = error_messages_for :redirect
   .fields.large.tabs
     .tab-pane.active#details
       .form-group
-        = f.text_field :in, label: 'Route to match', explanation: 'String, can be written as a regular expression (without opening and closing /)', placeholder: '\/old-path\/(\d+)-(\.*)'
+        = f.text_field :in, label: t('tenon.redirects.route_to_match'), explanation: t('tenon.redirects.string_can_be_written'), placeholder: '\/old-path\/(\d+)-(\.*)'
       .form-group
-        = f.text_field :out, label: 'Destination', explanation: 'Zero-indexed captures can be returned in {x}', placeholder: '/new-path/{0}-{1}'
+        = f.text_field :out, label: t('tenon.redirects.destination'), explanation: t('tenon.redirects.zero_indexed_captures'), placeholder: '/new-path/{0}-{1}'
 
   .fields.small
-    %h4.box-label Details
+    %h4.box-label= t('tenon.common.details')
     .box
       .form-group.bordered.inline
         = f.check_box :active, class: 'tn-checkbox-right'
         = f.super_label :active
 
-    %h4.box-label Actions
+    %h4.box-label= t('tenon.common.actions')
     .box
       .content
         - if can?(:publish, @redirect)
-          %button.btn.btn-block.btn-comp{ data: { disable_with: "Please wait..." } } Save
+          %button.btn.btn-block.btn-comp{ data: { disable_with: t('tenon.common.please_wait') } }= t('tenon.common.save')
         - if can?(:create, Tenon::ItemVersion)
           = save_draft_button(@redirect)
           .last-autosave
@@ -38,5 +38,5 @@
         = clear_draft_link if params[:version]
         = load_draft_link(@redirect)
         - if @redirect.persisted?
-          = link_to "Delete", @redirect, data: {method: :delete, confirm: 'Are you sure you want to delete this?'}, :class => 'delete-link'
+          = link_to t('tenon.common.delete'), @redirect, data: { method: :delete, confirm: t('tenon.common.are_you_sure') }, :class => 'delete-link'
     .spacer

data/app/views/tenon/redirects/_redirect.json.jbuilder

@@ -1,3 +1,3 @@
 json.extract!(redirect, :id, :in, :out, :active, :edit_path, :edit_link, :delete_link)
 
-json.active_link toggle_link(redirect, 'active', toggle_active_redirect_path(redirect), ['eye', 'Active'], ['eye-slash', 'Not Aactive'])
+json.active_link toggle_link(redirect, 'active', toggle_active_redirect_path(redirect), ['eye', t('tenon.redirects.active')], ['eye-slash', t('tenon.redirects.not_active')])

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

@@ -1,5 +1,5 @@
 %header
-  %h1 Edit Redirect
+  %h1= t('tenon.redirects.edit_redirect')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"

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

@@ -1,12 +1,12 @@
 - content_for :sidebar do
   .sidebar
     .content
-      %h2 Redirects
-      = link_to "New Redirect", new_redirect_path, class: 'btn btn-block btn-primary'
-      %p Drag and drop to set priority.
+      %h2= t('tenon.redirects.redirects')
+      = link_to t('tenon.redirects.new_redirect'), new_redirect_path, class: 'btn btn-block btn-primary'
+      %p= t('tenon.redirects.drag_and_drop_to_set_priority')
 
 %header
-  %h1 Redirects
+  %h1= t('tenon.redirects.redirects')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"
@@ -19,11 +19,11 @@
   = render "tenon/shared/section_header/quick_search", record_list: '#redirects'
 
 .main-content
-  .flash.flash-alert{style: 'padding-right: 40px;'}
+  .flash.flash-alert{ style: 'padding-right: 40px;' }
     %i.fa.fa-exclamation-triangle
-    Redirects will be run when a page cannot be found. It will not redirect an existing page.
+    = t('tenon.redirects.redirects_will_be_run')
 
   = error_messages_for :redirect
-  %ul#redirects.record-list.sortable{data: {records: {url: redirects_path(format: 'json'), template: 'tenon/templates/redirects/redirect_row', name: 'redirect'}, :'reorder-path' => reorder_redirects_path}}
+  %ul#redirects.record-list.sortable{ data: { records: { url: redirects_path(format: 'json'), template: 'tenon/templates/redirects/redirect_row', name: 'redirect' }, :'reorder-path' => reorder_redirects_path } }
 
-  = link_to "Load More Redirects", '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#redirects'
+  = link_to t('tenon.redirects.load_more'), '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#redirects'

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

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

data/app/views/tenon/settings/_contact.html.haml

@@ -1,19 +1,19 @@
-%h4.box-label Contact Details
+%h4.box-label= t('tenon.settings.contact_details')
 .box
   .form-group.bordered
-    %label Contact Email
-    .explanation Destination email address for alerts.  Separate multiple email addresses with commas.
+    %label= t('tenon.settings.contact_email')
+    .explanation= t('tenon.settings.destination_email_address_for_alerts')
     = text_field_tag "settings[contact_email]", Tenon::MySettings.contact_email, :placeholder => "--"
 
   .form-group.bordered
-    %label Sender Email
-    .explanation "From" email address for alerts.
+    %label= t('tenon.settings.sender_email')
+    .explanation= t('tenon.settings.from_email_address_for_alerts')
     = text_field_tag "settings[from_email]", Tenon::MySettings.from_email, :placeholder => "--"
 
-%h4.box-label Comment Notifications
+%h4.box-label= t('tenon.settings.comment_notifications')
 .box
   .form-group.inline.bordered
     = check_box_tag "settings[comment_email]", 1, Tenon::MySettings.comment_email, class: 'tn-checkbox-right'
-    %label{for: 'settings_comment_email'} Comment Email
-    .explanation Do you want to receive an email when someone posts a comment?
+    %label{ for: 'settings_comment_email' }= t('tenon.settings.comment_email')
+    .explanation= t('tenon.settings.do_you_want_to_receive')
 

data/app/views/tenon/settings/_general.html.haml

@@ -1,12 +1,12 @@
 .form-group
-  %label Site Name
+  %label= t('tenon.settings.site_name')
   = text_field_tag 'settings[site_title]', Tenon::MySettings.site_title
 
 .form-group
-  %label Site Domain
+  %label= t('tenon.settings.site_domain')
   = text_field_tag 'settings[site_url]', Tenon::MySettings.site_url
 
 .form-group
-  %label Google Analytics Code
-  .explanation= link_to 'Create a New Profile Here', 'https://www.google.com/analytics/settings/add_profile?scid=16153080', target: '_'
+  %label= t('tenon.settings.google_analytics_code')
+  .explanation= link_to t('tenon.settings.create_a_new_profile_here'), 'https://www.google.com/analytics/settings/add_profile?scid=16153080', target: '_'
   = text_area_tag 'settings[google_analytics]', Tenon::MySettings.google_analytics, style: 'height: 180px;'

data/app/views/tenon/settings/_seo.html.haml

@@ -1,10 +1,10 @@
 .form-group
-  %label META Keywords
-  .explanation These META keywords will be used by some search engines when crawling your site.  Separate keywords with a comma.  Note: Google does not factor in keywords when calculating your rank.  Other search engines may or may not.
+  %label= t('tenon.settings.meta_keywords')
+  .explanation= t('tenon.settings.these_meta_keywords_will')
   = text_area_tag "settings[seo_keywords]", Tenon::MySettings.seo_keywords
 
 .form-group
-  %label META Description
-  .explanation This description will show up on search engines and in some cases will affect your rank.  It should be no longer than 150-160 characters (about the length of a tweet.)
+  %label= t('tenon.settings.meta_description')
+  .explanation= t('tenon.settings.this_description_will_show_up')
   = text_area_tag "settings[seo_description]", Tenon::MySettings.seo_description
 

data/app/views/tenon/settings/show.html.haml

@@ -1,31 +1,31 @@
 - content_for :sidebar do
   .sidebar
     .content
-      %h2 Settings
+      %h2= t('tenon.settings.settings')
 
-    %h4 Sections
+    %h4= t('tenon.settings.sections')
     %nav
       %ul
-        %li.active= link_to "General Settings", '#general', data: {toggle: 'tab'}
-        %li= link_to 'Contact Management', '#contact', data: {toggle: 'tab'}
-        %li= link_to 'Search Optimization', '#seo', data: {toggle: 'tab'}
+        %li.active= link_to t('tenon.settings.general_settings'), '#general', data: {toggle: 'tab'}
+        %li= link_to t('tenon.settings.contact_management'), '#contact', data: {toggle: 'tab'}
+        %li= link_to t('tenon.common.search_optimization'), '#seo', data: {toggle: 'tab'}
 
 %header
-  %h1 Site Settings
+  %h1= t('tenon.settings.site_settings')
 
   .tools
     = render "tenon/shared/section_header/sidebar_toggle"
 
 .main-content
-  = form_tag({:action => :update}, :method => "PUT") do
+  = form_tag({ :action => :update }, :method => "PUT") do
     .fields.large.tabs
       #general.tab-pane.active= render :partial => 'general'
       #contact.tab-pane= render :partial => 'contact'
       #seo.tab-pane= render :partial => 'seo'
 
     .fields.small
-      %h4.box-label Actions
+      %h4.box-label= t('tenon.common.actions')
       .box
         .content
-          %button.btn.btn-primary.btn-block.submit{ data: { disable_with: "Please wait..." } } Save
+          %button.btn.btn-primary.btn-block.submit{ data: { disable_with: t('tenon.common.please_wait') } }= t('tenon.common.save')
 

data/app/views/tenon/shared/_i18n_language_nav.html.haml

@@ -1,6 +1,6 @@
-%h4 Languages
+%h4= t('tenon.common.languages')
 %nav.i18n-nav
   %ul
-    %li.active= link_to 'English', '#', data: { 'i18n-lang' => 'en' }
+    %li.active= link_to t('tenon.common.english'), '#', data: { 'i18n-lang' => 'en' }
     - Tenon.config.languages.each do |title, lang|
-      %li= link_to title, '#', data: { 'i18n-lang' => lang }
+      %li= link_to title, '#', data: { 'i18n-lang' => lang }

data/app/views/tenon/shared/_main_nav.html.haml

@@ -1,14 +1,14 @@
 .nav-holder
   %nav.main-nav
     %ul
-      = nav_item 'Home', root_path, 'dashboard'
-      = nav_item 'Asset Library', assets_path, 'picture-o'
-      = nav_item 'Comments', comments_path, 'comment'
-      = nav_item 'Pages', pages_path, 'file'
-      = nav_item 'Posts', posts_path, 'file-text', active: ['post_categories'].include?(controller_name)
-      = nav_item 'Users', users_path, 'user'
-      = nav_item 'Events', events_path, 'calendar'
-      = nav_item 'Galleries', galleries_path, 'th'
-      = nav_item 'Contacts', contacts_path, 'envelope'
-      = nav_item 'Redirects', redirects_path, 'exchange'
-      = nav_item 'Settings', settings_path, 'gear'
+      = nav_item t('tenon.common.home'), root_path, 'dashboard'
+      = nav_item t('tenon.asset_library.asset_library'), assets_path, 'picture-o'
+      = nav_item t('tenon.comments.comments'), comments_path, 'comment'
+      = nav_item t('tenon.pages.pages'), pages_path, 'file'
+      = nav_item t('tenon.posts.posts'), posts_path, 'file-text', active: ['post_categories'].include?(controller_name)
+      = nav_item t('tenon.users.users'), users_path, 'user'
+      = nav_item t('tenon.events.events'), events_path, 'calendar'
+      = nav_item t('tenon.galleries.galleries'), galleries_path, 'th'
+      = nav_item t('tenon.contacts.contacts'), contacts_path, 'envelope'
+      = nav_item t('tenon.redirects.redirects'), redirects_path, 'exchange'
+      = nav_item t('tenon.settings.settings'), settings_path, 'gear'

data/app/views/tenon/shared/_posts_nav.html.haml

@@ -1,8 +1,8 @@
-%h4 Posts
+%h4= t('tenon.posts.posts')
 %nav
   %ul
     - if can?(:manage, Tenon::Post)
-      %li{class: ('active' if controller_name == 'posts')}= link_to "Posts", posts_path
+      %li{ class: ('active' if controller_name == 'posts') }= link_to t('tenon.posts.posts'), posts_path
 
     - if can?(:manage, Tenon::PostCategory)
-      %li{class: ('active' if controller_name == 'post_categories')}= link_to "Post Categories", post_categories_path
+      %li{ class: ('active' if controller_name == 'post_categories') }= link_to t('tenon.post_categories.post_categories'), post_categories_path

data/app/views/tenon/shared/_seo_fields.html.haml

@@ -1,6 +1,6 @@
 .form-group
-  = f.text_field :seo_title, :class => "title", :style => "width: 100%;", :label => "Title Tag", :'data-popover' => true, :explanation => "This is the title that will show on search engine results and in the title bar of a visitor's browser.  By default, this will use the item's title.", :'data-placement' => 'bottom'
+  = f.text_field :seo_title, :class => "title", :style => "width: 100%;", :label => t('tenon.settings.title_tag'), :'data-popover' => true, :explanation => t('tenon.settings.this_is_the_title_that_will_show'), :'data-placement' => 'bottom'
 .form-group
-  = f.text_area :seo_keywords, :style => "width: 100%;", :rows => 5, :label => "META Keywords", :'data-popover' => true, :explanation => "These META keywords will be used by some search engines when crawling your site.  Separate keywords with a comma.  Note: Google does not factor in keywords when calculating your rank.  Other search engines may or may not.", :'data-placement' => 'bottom'
+  = f.text_area :seo_keywords, :style => "width: 100%;", :rows => 5, :label => t('tenon.settings.meta_keywords'), :'data-popover' => true, :explanation => t('tenon.settings.these_meta_keywords_will'), :'data-placement' => 'bottom'
 .form-group
-  = f.text_area :seo_description, :style => "width: 100%;", :rows => 5, :label => "META Description", :'data-popover' => true, :explanation => "This description will show up on search engines and in some cases will affect your rank.  It should be no longer than 150-160 characters (about the length of a tweet.)", :'data-placement' => 'bottom'
+  = f.text_area :seo_description, :style => "width: 100%;", :rows => 5, :label => t('tenon.settings.meta_description'), :'data-popover' => true, :explanation => t('tenon.settings.this_description_will_show_up'), :'data-placement' => 'bottom'