tenon 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43b616872ac8b90802cf3c43e82b32ee468acd61
-  data.tar.gz: 3e05204e249940d672054c186039586376373476
+  metadata.gz: 967b1850854d4e7f6cb607d7f7b3763de4714b35
+  data.tar.gz: 72534e798939103469b7e284ef9d8ebfc6bcf809
 SHA512:
-  metadata.gz: e3a2bc0e821162306fb2133c12579c3f75eab043c61891a30c1c25cfc5f92c016f52564aa94d5e7e36225979740e3ef077a80adae5aeee1fc04adbbcace2f885
-  data.tar.gz: 837a421d8809593ec427b09c5e556acc458420c410299fa1f813d06431e7a71e20b3e92f19983d90b1cf79886ce86baca48c1b79e272e8152a24eb8c035b4c50
+  metadata.gz: 9e865dfd372376f5eb278b89d7da6d1a5612e43a43cfdbc2e6108d19da0368e901934f0b709f6bf7f5a8a129b21f3b74611cdb61d9a4b447a754580994d26fbc
+  data.tar.gz: b0f461df34c107b0e21dd168643d299cc4116e00b6c57594b85ffde0632f4114c3e02649e4aada3c1eda59c48a2a5ef7f41fa3cd41b3ea9f551f5b5d4c14a7ec

data/app/assets/javascripts/tenon/features/asset_detachment.js.coffee

@@ -8,4 +8,4 @@ class Tenon.features.AssetDetachment
     @$assetField = $(e.currentTarget).closest('.tn-tc-asset-field')
     @$assetField.find('.asset-id-field').removeAttr('value')
     @$assetField.find('.thumbnail img').attr('src', '/assets/tenon/thumb-doc.png')
-    @$assetField.find('.asset-info').html('No asset selected.')
+    @$assetField.find('.asset-info').html(I18n.tenon.assets.no_asset_selected)

data/app/assets/javascripts/tenon/features/asset_uploader.js.coffee

@@ -61,7 +61,7 @@ class Tenon.features.AssetUploader
     @titleCounter += 1
 
   _updateButtonText: ->
-    $('#choose-files').text('Choose Another File')
+    $('#choose-files').text(I18n.tenon.assets.choose_another_file)
 
   _resetCounter: =>
     $('#asset_title').val($('#aset_title').data('original-value'))

data/app/assets/javascripts/tenon/features/modal_windows.js.coffee

@@ -41,7 +41,6 @@ class Tenon.features.ModalWindows
     @_launchWithContent() if @opts.content?.length
 
   _launchWithUrl: (e) =>
-    console.debug("called _launchWithUrl")
     @remote = true
     Tenon.$genericLoader.show()
     $.ajax
@@ -51,7 +50,6 @@ class Tenon.features.ModalWindows
       beforeSend: null
 
   _launchWithTarget: (e) =>
-    console.debug("called _launchWithTarget")
     if @opts.closest?.length && @opts.$link
       $parentNode = @opts.$link.closest(@opts.closest)
       $el = $parentNode.find(@opts.target)

data/app/assets/javascripts/tenon/features/nested_fields.js

@@ -52,7 +52,7 @@ Tenon.features.nestedFields = {
     var self        = Tenon.features.nestedFields,
         hiddenField = $(this).prev('input[name*=_destroy]')[0];
 
-    if (confirm("Are you sure?")) {
+    if (confirm(I18n.tenon.common.are_you_sure)) {
       // Existing records get set as deleted, new records just get cleared out of the DOM
       if(hiddenField) {
         hiddenField.value = 'true';
@@ -92,4 +92,4 @@ Tenon.features.nestedFields = {
       }
     });
   }
-};
+};

data/app/assets/javascripts/tenon/features/new_item_version_handler.js.coffee

@@ -28,5 +28,5 @@ class Tenon.features.NewItemVersionHandler
     $.extend(itemFormData, versionFormData)
 
   _failure: =>
-    msg = "Failed to save draft."
-    @$versionForm.prepend(msg)
+    msg = I18n.tenon.item_versions.failed_to_save_draft
+    @$versionForm.prepend(msg)

data/app/assets/javascripts/tenon/features/protect_changes.js.coffee

@@ -22,4 +22,4 @@ class Tenon.features.ProtectChanges
 
   confirmNavigation: =>
     if @changesMade
-      'You have unsaved changes, are you sure you want to leave this page?'
+      I18n.tenon.common.you_have_unsaved_changes

data/app/assets/javascripts/tenon/features/record_approval.js.coffee

@@ -14,10 +14,10 @@ class Tenon.features.RecordApproval
   _finishToggle:  =>
     @$link.toggleClass('unapprove approve')
     if @$link.hasClass('approve')
-      @_setTooltip('Approve')
+      @_setTooltip(I18n.tenon.common.approve)
       @$link.find('i').toggleClass('fa-spin fa-gear fa-thumbs-up')
     else
-      @_setTooltip('Unapprove')
+      @_setTooltip(I18n.tenon.common.unapprove)
       @$link.find('i').toggleClass('fa-spin fa-gear fa-thumbs-down')
 
   _startIconLoad: =>
@@ -30,4 +30,4 @@ class Tenon.features.RecordApproval
       .tooltip('hide')
       .attr('data-original-title', tooltip)
       .tooltip('fixTitle')
-      .tooltip('show')
+      .tooltip('show')

data/app/assets/javascripts/tenon/features/record_boolean_toggle.js.coffee

@@ -10,7 +10,7 @@ class Tenon.features.RecordBooleanToggle
     @trueTooltip = @$link.data('truetooltip')
     @falseTooltip = @$link.data('falsetooltip')
     @_startIconLoad()
-    @_setTooltip('Loading...')
+    @_setTooltip(I18n.tenon.common.loading)
     $.getJSON(@$link.attr('href'))
       .done(@_finishToggle)
       .fail((data)-> console.log(data))

data/app/assets/javascripts/tenon/features/record_list.js.coffee

@@ -41,9 +41,9 @@ class Tenon.features.RecordList
 
   _dataLoaded: (data) =>
     if data.records.length == 0
-      @_showInfoLi('No entries found.')
+      @_showInfoLi(I18n.tenon.record_list.no_entries_found)
     else if @$list.data('records-nested')
-      @_showInfoLi('No entries found.') if data.records.length == 0
+      @_showInfoLi(I18n.tenon.record_list.no_entries_found) if data.records.length == 0
       new Tenon.features.NestedSetWriter(data.records, @$list, @_templatePath, @_recordName)
     else
       @_drawRecords(data.records)
@@ -52,7 +52,7 @@ class Tenon.features.RecordList
     @$list.trigger('tenon.records-refreshed')
 
   _failedLoad: =>
-    @_showInfoLi('There was an error contacting the server.')
+    @_showInfoLi(I18n.tenon.record_list.there_was_an_error_contacting_the_server)
 
   _drawRecords: (records) =>
     for record in records

data/app/assets/javascripts/tenon/features/record_list_updater.js.coffee

@@ -9,7 +9,7 @@ class Tenon.features.RecordListUpdater
     $el = $(e.currentTarget)
     @clearQuery = $el.attr('data-clear-record-list-params')
     if $el.prop("tagName").toLowerCase() == 'form'
-      @_updateWithQuery(@_processFormData($el), 'Search', $el)
+      @_updateWithQuery(@_processFormData($el), I18n.tenon.common.search, $el)
     else
       @_updateWithQuery(URI($el.attr('href')).query(true), $el.textContent)
 

data/app/assets/javascripts/tenon/features/tenon_content/asset_link.js.coffee

@@ -2,7 +2,7 @@ class Tenon.features.tenonContent.AssetLink extends Tenon.features.tenonContent.
   _setFields: ($li) =>
     $link = $('<a />').attr('href', $li.data('style-urls')['original'])
     selected = @$browseButton.getSelection().getSelectedText()
-    text = if selected.length then selected else 'Asset Link'
+    text = if selected.length then selected else I18n.tenon.assets.asset_link
     $link.html(text)
     @$browseButton.insertHtml($link[0].outerHTML)
 

data/app/assets/javascripts/tenon/templates/assets/asset_field.jst.eco

@@ -10,8 +10,8 @@
       </div>
     </div>
     <div class="record-actions">
-      <a data-tooltip="Edit" href="<%= @asset.edit_path %>" title="Edit"><i class="fa fa-pencil"></i></a>
-      <a data-confirm="Are you sure? There is no undo for this!" data-method="delete" data-tooltip="Delete" href="<%= @asset.path %>" rel="nofollow" title="Delete"><i class="fa fa-trash-o"></i></a>
+      <a data-tooltip="<%= I18n.tenon.common.edit %>" href="<%= @asset.edit_path %>" title="<%= I18n.tenon.common.edit %>"><i class="fa fa-pencil"></i></a>
+      <a data-confirm="<%= I18n.tenon.common.are_you_sure %>" data-method="delete" data-tooltip="<%= I18n.tenon.common.delete %>" href="<%= @asset.path %>" rel="nofollow" title="<%= I18n.tenon.common.delete %>"><i class="fa fa-trash-o"></i></a>
     </div>
   </div>
 </li>

data/app/assets/javascripts/tenon/templates/assets/asset_row.jst.eco

@@ -2,12 +2,12 @@
   <div class="thumbnail"><%- @asset.icon %></div>
   <div class="record-details">
     <div class="record-title">
-      <a href="<%= @asset.edit_path %>" data-modal-remote="true" data-modal-title="Edit Asset"><%= @asset.display_name %></a>
+      <a href="<%= @asset.edit_path %>" data-modal-remote="true" data-modal-title="<%= I18n.tenon.assets.edit_asset %>"><%= @asset.display_name %></a>
     </div>
 
     <div class="record-fields">
       <div class="record-field">
-        Size - <%= @asset.human_size %>
+        <%= I18n.tenon.assets.size %> - <%= @asset.human_size %>
       </div>
     </div>
 

data/app/assets/javascripts/tenon/templates/assets/asset_select.jst.eco

@@ -1 +1 @@
-<li>Asset</li>
+<li>Asset</li>

data/app/assets/javascripts/tenon/templates/contacts/contact_row.jst.eco

@@ -8,13 +8,13 @@
     </div>
 
     <div class="record-title">
-      From:
+      <%= I18n.tenon.contact_mailer.from %>:
       <strong>
         <a href="mailto:<%= @contact.email %>"><%= @contact.name %> (<%= @contact.email %>)</a>
       </strong>
       <br />
       <small>
-        Sent on:
+        <%= I18n.tenon.contact_mailer.sent_on %>:
         <strong>
           <%- @contact.sent_date %>
         </strong>
@@ -25,28 +25,28 @@
         <p><%= @contact.content %></p>
         <hr />
         <p>
-          <strong>Name: </strong>
+          <strong><%= I18n.tenon.contact_mailer.name %>: </strong>
           <%= @contact.name %>
         </p>
         <p>
-          <strong>Email: </strong>
+          <strong><%= I18n.tenon.contact_mailer.email %>: </strong>
           <a href="mailto: <%= @contact.email %>"><%= @contact.email %></a>
         </p>
         <p>
         <p>
-          <strong>Phone: </strong>
-          <%= @contact.ophone %>
+          <strong><%= I18n.tenon.contact_mailer.phone %>: </strong>
+          <%= @contact.phone %>
         </p>
         <p>
-          <strong>IP:</strong>
+          <strong><%= I18n.tenon.contact_mailer.ip %>:</strong>
           <%= @contact.user_ip %>
         </p>
         <p>
-          <strong>Agent:</strong>
+          <strong><%= I18n.tenon.contact_mailer.agent %>:</strong>
           <%= @contact.user_agent %>
         </p>
         <p>
-          <strong>Referrer:</strong>
+          <strong><%= I18n.tenon.contact_mailer.referrer %>:</strong>
           <%= @contact.referrer %>
         </p>
       </div>

data/app/assets/javascripts/tenon/templates/errors.jst.eco

@@ -1,5 +1,5 @@
 <div class="error-explanation">
-  <h4>The following errors occurred:</h2>
+  <h4><%= I18n.tenon.common.the_following_errors_occurred %>:</h2>
   <ul>
     <% for field, errors of @errors: %>
       <% for error in errors: %>
@@ -10,4 +10,4 @@
       <% end %>
     <% end %>
   </ul>
-</div>
+</div>

data/app/assets/javascripts/tenon/templates/events/event_row.jst.eco

@@ -12,10 +12,10 @@
 
     <div class="record-fields">
       <div class="record-field">
-        When - <%= @event.display_date %>
+        <%= I18n.tenon.events.when %> - <%= @event.display_date %>
       </div>
       <div class="record-field">
-        Where - <%= @event.location %>
+        <%= I18n.tenon.events.where %> - <%= @event.location %>
       </div>
     </div>
   </div>

data/app/assets/javascripts/tenon/templates/item_versions/item_version_row.jst.eco

@@ -10,11 +10,11 @@
 
     <div class="record-fields">
       <div class="record-field">
-        Created - <%= @item_version.created_at %>
+        <%= I18n.tenon.item_versions.created %> - <%= @item_version.created_at %>
       </div>
 
       <div class="record-field">
-        Creator - <%= @item_version.user_email %>
+        <%= I18n.tenon.item_versions.creator %> - <%= @item_version.user_email %>
       </div>
     </div>
 

data/app/assets/javascripts/tenon/templates/pages/page_row.jst.eco

@@ -14,7 +14,7 @@
 
     <div class="record-fields">
       <div class="record-field">
-        Last Updated - <%= @page.updated_at %> by <%=@page.updater %>
+        <%= I18n.tenon.pages.last_updated %> - <%= @page.updated_at %> by <%=@page.updater %>
       </div>
     </div>
   </div>

data/app/assets/javascripts/tenon/templates/post_categories/post_category_row.jst.eco

@@ -6,7 +6,7 @@
     </div>
 
     <div class="record-title">
-      <a href="<%= @post_category.edit_path %>" data-modal-remote="true" data-modal-title="Edit Post Category"><%= @post_category.title %></a>
+      <a href="<%= @post_category.edit_path %>" data-modal-remote="true" data-modal-title="<%= I18n.tenon.post_categories.edit_post_category %>"><%= @post_category.title %></a>
     </div>
   </div>
 </li>

data/app/assets/javascripts/tenon/templates/posts/post_row.jst.eco

@@ -14,15 +14,15 @@
     <div class="record-fields">
       <% if @post.author: %>
         <div class="record-field">
-          Author - <%= @post.author %>
+          <%= I18n.tenon.posts.author %> - <%= @post.author %>
         </div>
       <% end %>
       <div class="record-field">
-        Published - <%= @post.publish_at %>
+        <%= I18n.tenon.posts.published %> - <%= @post.publish_at %>
       </div>
       <% if @post.categories: %>
         <div class="record-field">
-          Categories - <%= @post.categories %>
+          <%= I18n.tenon.posts.categories %> - <%= @post.categories %>
         </div>
       <% end %>
     </div>

data/app/assets/javascripts/tenon/templates/users/user_row.jst.eco

@@ -11,10 +11,10 @@
 
     <div class="record-fields">
       <div class="record-field">
-        Roles - <%= @user.roles %>
+        <%= I18n.tenon.users.roles %> - <%= @user.roles %>
       </div>
       <div class="record-field">
-        Last Login - <%= @user.last_login %>
+        <%= I18n.tenon.users.last_login %> - <%= @user.last_login %>
       </div>
     </div>
   </div>

data/app/controllers/tenon/assets_controller.rb

@@ -19,7 +19,7 @@ module Tenon
 
     def create
       asset = Tenon::Asset.new(resource_params)
-      flash[:notice] = 'Asset was successfully uploaded.' if asset.save && !request.xhr?
+      flash[:notice] = t('tenon.assets.successfully_uploaded') if asset.save && !request.xhr?
       @asset = asset.decorate
       respond_with(@asset, location: assets_path)
     end

data/app/controllers/tenon/base_controller.rb

@@ -6,7 +6,7 @@ module Tenon
     before_filter :require_admin, unless: :devise_controller?
 
     rescue_from CanCan::AccessDenied do |exception|
-      flash[:warning] = 'You are not authorized to access that page.'
+      flash[:warning] = t('tenon.common.you_are_not_authorized')
       redirect_to root_path
     end
 
@@ -23,9 +23,9 @@ module Tenon
     def set_title
       case params[:action]
       when 'new', 'create'
-        @page_title = "New #{params[:controller].gsub('tenon/', '').singularize.humanize}".titleize
+        @page_title = "#{t('tenon.common.new')} #{params[:controller].gsub('tenon/', '').singularize.humanize}".titleize
       when 'edit', 'update'
-        @page_title = "Edit #{params[:controller].gsub('tenon/', '').singularize.humanize}".titleize
+        @page_title = "#{t('tenon.common.edit')} #{params[:controller].gsub('tenon/', '').singularize.humanize}".titleize
       else
         @page_title = params[:controller].gsub('tenon/', '').humanize.titleize
       end
@@ -34,7 +34,7 @@ module Tenon
 
     def require_admin
       unless current_user && current_user.staff?
-        flash[:warning] = "You're not authorized for that." if current_user
+        flash[:warning] = t('tenon.common.youre_not_authorized_for_that') if current_user
         redirect_to new_user_session_path
       end
     end

data/app/controllers/tenon/comments_controller.rb

@@ -27,10 +27,10 @@ module Tenon
       respond_to do |format|
         if @comment.toggle_approved!
           format.json { render json: @comment.to_json }
-          format.html { flash[:notice] = 'Comment approved.' and redirect_to comments_path }
+          format.html { flash[:notice] = t('tenon.comments.comment_approved') and redirect_to comments_path }
         else
           format.json { render status: 500, nothing: true }
-          format.html { flash[:warning] = 'Error approving comment.' and redirect_to comments_path }
+          format.html { flash[:warning] = t('tenon.comments.error_approving_comment') and redirect_to comments_path }
         end
       end
     end

data/app/controllers/tenon/contacts_controller.rb

@@ -29,10 +29,10 @@ module Tenon
       respond_to do |format|
         if @contact.toggle_read!
           format.json { render json: @contact.to_json }
-          format.html { flash[:notice] = 'Comment flagged as read.' and redirect_to contacts_path }
+          format.html { flash[:notice] = t('tenon.contacts.contact_flagged_as_read') and redirect_to contacts_path }
         else
           format.json { render status: 500, nothing: true }
-          format.html { flash[:warning] = 'Error flagging contact as read.' and redirect_to contacts_path }
+          format.html { flash[:warning] = t('tenon.contacts.error_flagging_contact_as_read') and redirect_to contacts_path }
         end
       end
     end
@@ -41,10 +41,10 @@ module Tenon
       respond_to do |format|
         if @contact.toggle_replied!
           format.json { render json: @contact.to_json }
-          format.html { flash[:notice] = 'Comment flagged as replied.' and redirect_to contacts_path }
+          format.html { flash[:notice] = t('tenon.contacts.contact_flagged_as_replied') and redirect_to contacts_path }
         else
           format.json { render status: 500, nothing: true }
-          format.html { flash[:warning] = 'Error flagging contact as replied.' and redirect_to contacts_path }
+          format.html { flash[:warning] = t('tenon.contacts.error_flagging_contact_as_replied.') and redirect_to contacts_path }
         end
       end
     end

data/app/controllers/tenon/resources_controller.rb

@@ -41,7 +41,7 @@ module Tenon
       authorize!(:publish, resource)
       if resource.update_attributes(resource_params)
         save_item_version if resource.respond_to?(:versions)
-        flash[:notice] = "#{human_name} saved successfully." unless request.xhr?
+        flash[:notice] = "#{human_name} #{t('tenon.common.saved_successfully')}." unless request.xhr?
       end
 
       self.resource = resource.decorate
@@ -52,7 +52,7 @@ module Tenon
       self.resource = klass.new(resource_params).decorate
       authorize!(:publish, resource)
       if resource.save && !request.xhr?
-        flash[:notice] = "#{human_name} saved successfully."
+        flash[:notice] = "#{human_name} #{t('tenon.common.saved_successfully')}."
         save_item_version if resource.respond_to?(:versions)
       end
       respond_with(resource.decorate, location: after_create_path, status: (201 if resource.valid?))
@@ -83,7 +83,7 @@ module Tenon
       item_version.user = current_user
       item_version.created_at = resource.updated_at
       item_version.save_type = 'post-save'
-      item_version.title = 'Post-Save'
+      item_version.title = t('tenon.item_versions.post_save')
       item_version.save
     end
 

data/app/decorators/tenon/asset_decorator.rb

@@ -19,7 +19,7 @@ module Tenon
 
     def crop_link
       h.action_link(
-        'Crop',
+        I18n.t('tenon.assets.crop'),
         [:crop, object],
         'crop',
         class: 'asset-crop',
@@ -33,13 +33,13 @@ module Tenon
     def edit_link(opts = {})
       defaults = {
         'data-modal-remote' => true,
-        'data-modal-title' => 'Edit Asset'
+        'data-modal-title' => I18n.t('tenon.assets.edit_asset')
       }
       super(opts.merge(defaults))
     end
 
     def download_link
-      h.action_link('Download', object.attachment.url, 'download', target: '_')
+      h.action_link(I18n.t('tenon.assets.download'), object.attachment.url, 'download', target: '_')
     end
 
     def style_urls

data/app/decorators/tenon/comment_decorator.rb

@@ -16,7 +16,7 @@ module Tenon
     def error_message
       errors = []
       @object.errors.full_messages.each { |error| errors << "<li>#{error}</li>" }
-      "<div class='error-explanation' id='error-explanation'>There were problems with the following fields:<ul>#{errors.join('')}<ul></div>"
+      "<div class='error-explanation' id='error-explanation'>#{I18n.t('tenon.common.there_were_problems_with_the_following_fields')}:<ul>#{errors.join('')}<ul></div>"
     end
   end
 end

data/app/decorators/tenon/contact_decorator.rb

@@ -1,13 +1,13 @@
 module Tenon
   class ContactDecorator < ApplicationDecorator
     def sent_date
-      @object.created_at.strftime('%B %e, %Y at %l:%M %p')
+      "#{@object.created_at.strftime('%B %e, %Y')} #{I18n.t('tenon.common.at')} #{@object.created_at.strftime('%l:%M %p')}"
     end
 
     def error_message
       errors = []
       @object.errors.full_messages.each { |error| errors << "<li>#{error}</li>" }
-      "<div class='error-explanation' id='error-explanation'>There were problems with the following fields:<ul>#{errors.join('')}<ul></div>"
+      "<div class='error-explanation' id='error-explanation'>#{I18n.t('tenon.common.there_were_problems_with_the_following_fields')}:<ul>#{errors.join('')}<ul></div>"
     end
   end
 end

data/app/decorators/tenon/event_decorator.rb

@@ -2,9 +2,9 @@ module Tenon
   class EventDecorator < ApplicationDecorator
     def display_date
       if @object.starts_at.to_date == @object.ends_at.to_date
-        "#{@object.starts_at.strftime('%B %d, %Y')} from #{@object.starts_at.strftime('%I:%M%p')} until #{@object.ends_at.strftime('%I:%M%p')}"
+        "#{@object.starts_at.strftime('%B %d, %Y')} #{I18n.t('tenon.events.from')} #{@object.starts_at.strftime('%I:%M%p')} #{I18n.t('tenon.events.until')} #{@object.ends_at.strftime('%I:%M%p')}"
       else
-        "#{@object.starts_at.strftime("%B %d, %Y at %I:%M%p")} until #{@object.ends_at.strftime("%B %d, %Y at %I:%M%p")}"
+        "#{@object.starts_at.strftime("%B %d, %Y at %I:%M%p")} #{I18n.t('tenon.events.until')} #{@object.ends_at.strftime("%B %d, %Y at %I:%M%p")}"
       end
     end
   end

data/app/helpers/tenon/application_helper.rb

@@ -79,6 +79,12 @@ module Tenon
       false
     end
 
+    def current_translations
+      I18n.backend.send(:init_translations) unless I18n.backend.initialized?
+      @translations ||= I18n.backend.send(:translations)
+      @translations[I18n.locale].with_indifferent_access
+    end
+
     private
 
     def h5bp_opening_tag(ie_versions = 6..8)

data/app/helpers/tenon/asset_helper.rb

@@ -56,7 +56,7 @@ module Tenon
       def default_options
         {
           'data-modal-remote' => true,
-          'data-modal-title' => 'Edit Asset'
+          'data-modal-title' => t('tenon.assets.edit_asset')
         }
       end
     end

data/app/helpers/tenon/item_version_helper.rb

@@ -17,24 +17,24 @@ module Tenon
       data = {
         'modal-remote' => true,
         'modal-handler' => 'Tenon.features.NewItemVersionHandler',
-        'modal-title' => 'Save Draft'
+        'modal-title' => t('tenon.item_versions.save_draft')
       }
-      link_to 'Save Draft', path, class: css_class, data: data
+      link_to t('tenon.item_versions.save_draft'), path, class: css_class, data: data
     end
 
     def clear_draft_link
       path = url_for(version: nil)
-      link_to 'Load Active Version', path, class: 'delete-link'
+      link_to t('tenon.item_versions.load_active_version'), path, class: 'delete-link'
     end
 
     def load_draft_link(obj)
       path = item_versions_path(item_type: obj.class.to_s, item_id: obj.id)
       data = {
         'modal-remote' => true,
-        'modal-title' => 'Load Draft',
+        'modal-title' => t('tenon.item_versions.load_draft'),
         'modal-handler' => 'Tenon.features.ItemVersionIndexHandler'
       }
-      link_to 'Load Draft', path, class: 'delete-link', data: data
+      link_to t('tenon.item_versions.load_draft'), path, class: 'delete-link', data: data
     end
 
     private

data/app/helpers/tenon/tenon_content_helper.rb

@@ -32,7 +32,7 @@ module Tenon
         links << link_to(name.to_s.titleize, '#', class: 'btn btn-white', data: { size: size_for_breakpoint(widths[:default]) })
       end
       last = Tenon.config.breakpoints.front_end.values.last
-      links << link_to('Mobile', '#', class: 'btn btn-white', data: { size: 320, mobile: true })
+      links << link_to(t('tenon.common.mobile'), '#', class: 'btn btn-white', data: { size: 320, mobile: true })
       links.join('').html_safe
     end
 

data/app/helpers/tenon/tenon_helper.rb

@@ -36,7 +36,7 @@ module Tenon
     def edit_link(obj, options = {})
       if can?(:edit, obj)
         url = polymorphic_url([:edit] + Array(obj))
-        action_link('Edit', url, 'pencil', options)
+        action_link(t('tenon.common.edit'), url, 'pencil', options)
       end
     end
 
@@ -44,21 +44,21 @@ module Tenon
     def delete_link(obj, options = {})
       if can?(:destroy, obj)
         default_options = { data: {
-          confirm: 'Are you sure? There is no undo for this!',
-          tooltip: 'Delete',
+          confirm: t('tenon.common.are_you_sure'),
+          tooltip: t('tenon.common.delete'),
           method: 'Delete',
           remote: 'true'
         } }
         url = polymorphic_url(obj)
-        action_link('Delete', url, 'trash-o', default_options.deep_merge(options))
+        action_link(t('tenon.common.delete'), url, 'trash-o', default_options.deep_merge(options))
       end
     end
 
     # browser detection and warning message
     def browser_detection(http)
-      if http.match(/MSIE 6|MSIE 7|MSIE 8.0/)
-        content_tag(:div, "For an optimal Tenon experience, please upgrade Internet Explorer to the #{link_to 'latest version', 'http://browsehappy.com/', target: '_blank'} or switch to another #{link_to 'modern browser', 'http://browsehappy.com/', target: '_blank'}.".html_safe, id: 'flash-warning', class: 'flash-msg')
-      end
+      # if http.match(/MSIE 6|MSIE 7|MSIE 8.0/)
+        content_tag(:div, t('tenon.common.for_an_optimal_tenon_experience', latest_version: link_to('latest version', 'http://browsehappy.com/', target: '_blank'), modern_browser: link_to('modern browser', 'http://browsehappy.com/', target: '_blank')).html_safe, id: 'flash-warning', class: 'flash-msg')
+      # end
     end
 
     def i18n_language_nav(table)

data/app/mailers/tenon/comment_mailer.rb

@@ -8,7 +8,7 @@ module Tenon
       @comment = comment
       mail(
         to: email,
-        subject: "#{Tenon::MySettings.site_name} - New Comment: #{@post.title}",
+        subject: "#{Tenon::MySettings.site_name} - #{I18n.t('tenon.comment_mailer.new_comment')}: #{@post.title}",
         from: Tenon::MySettings.from_email
       )
     end