tenon 1.0.65 → 1.0.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e33a7bcbe83620049590477001174c6502470f68
-  data.tar.gz: 4ee85644ad478a15431d230e94ff69368ef03b1c
+  metadata.gz: 6c47ddfef8b5f95e621152747059627227194e6f
+  data.tar.gz: 630d65af384604dc27d82c2f3278a95c32718e98
 SHA512:
-  metadata.gz: 7717739a612188038fc4753b0d6781401680f34a0ddba34722b56c495d57ada33dc9c6a5cb6198b345578ba37438ece1474fdafdb1478d594542c6a392992d42
-  data.tar.gz: 7f57354946919dd4ba149ddf316026903cb029d3a3b807fff67994d75073c6d6d951abdba581e1db8bbdbcaeb4c5b4980f0b6fc4f12c7b7bd2e24cbf2da47427
+  metadata.gz: 3b948e2e9457a41add44da0dc23e41f8c177d176af11697de77de8718a4984eea17195a01f163b43718b721df5bf75c6218aa3effa0842d12aff2de41520e36a
+  data.tar.gz: 49ee9f9d28640cf25557e7f2abcde8e303fc983be161808f7d816aef67300640d58a58c9768a4d95a79a507e880590521cdda09dbc72901001b8f7080affd92a

data/README.rdoc

@@ -79,7 +79,11 @@ languages and provides an interface for managing content in multiple languages.
 
 To add internationalized fields, follow these steps:
 
-1. Tell Tenon which languages you want to support in config/initializers/tenon.rb (You don't need to add English, Tenon always assumes its in use.)
+1. Add our 'translates' gem to your Gemfile and then bundle install
+
+    gem 'translates', git: 'https://github.com/factore/translates.git'
+
+2. Tell Tenon which languages you want to support in config/initializers/tenon.rb (You don't need to add English, Tenon always assumes its in use.)
 
     config.languages = {
       "French" => :fr,
@@ -87,7 +91,9 @@ To add internationalized fields, follow these steps:
       # etc.
     }
 
-2. Create or update config/i18n_fields.yml to tell Tenon which fields you would like to have internationalized.
+3. Add a language yml file in config/locales/ for each language defined above, or rails will have a fit, eg 'config/locales/fr.yml'
+
+4. Create or update config/i18n_fields.yml to tell Tenon which fields you would like to have internationalized.
 
     tables:
       cars:
@@ -98,21 +104,8 @@ To add internationalized fields, follow these steps:
         - title
         - location
         - description
-
-3. Generate and run the internationalization migration.  The generator will only try to create columns that don't already exist, so you can use this generator multiple times throughout the development of your application.
-
-    rails generate tenon:i18n_migrations
-    rake db:migrate
-
-4. Ensure that you have passed the i18n: true flag anywhere you are using tenon_content on a model.
-
-    class MyModel < ActiveRecord::Base
-      tenon_content :description, i18n: true
-    end
-
-Once you've done this and restarted your app you will see a language selection nav in the sidebar of each form that has internationalized fields.
-
-If you want to add internationalization to the default Tenon models you should make your i18n_fields.yml look like this:
+        
+    If you want to add internationalization to the default Tenon models you should make your i18n_fields.yml look like this:
 
     tables:
       tenon/events:
@@ -130,4 +123,34 @@ If you want to add internationalization to the default Tenon models you should m
         - excerpt
         - seo_title
         - seo_keywords
-        - seo_description
+        - seo_description
+        
+5. Generate and run the internationalization migration.  The generator will only try to create columns that don't already exist, so you can use this generator multiple times throughout the development of your application.
+
+    rails generate tenon:i18n_migrations
+    rake db:migrate
+
+6. Update your models to make sure your attributes are translated
+
+    class MyModel < ActiveRecord::Base
+        include Translates
+        # plain old rails attributes
+        translates :title
+        # tenon_content
+        tenon_content :description, i18n: true
+    end
+    
+7. Update your tenon views to add the language navigation helper, where needed:
+    # app/views/tenon/cars/_form.html.haml
+    - content_for :sidebar do
+        .sidebar
+            .content
+                ...
+            = i18n_language_nav(:cars)
+    ...
+    
+8. While there, make sure you are using 'autosaving_form_for' instead of 'form_for' to create your forms.  By doing this, Tenon will automatically update the labels when the different languages are selected.
+
+9. Make sure your routes are configured according to your needs and the I18n.locale is being set somehow (see Rails documentation for more info: http://guides.rubyonrails.org/i18n.html)
+
+Once you've done this and restarted your app you will see a language selection nav in the sidebar of each Tenon form that has internationalized fields.  On the front end, attributes on your Tenon models will be translated correctly, based on I18n.locale.

data/app/helpers/tenon/item_version_helper.rb

@@ -12,7 +12,7 @@ module Tenon
     end
 
     def save_draft_button(obj)
-      path = new_item_version_path(item_type: obj.class.to_s, item_id: obj.id)
+      path = new_item_version_path(item_type: class_for(obj), item_id: obj.id)
       css_class = 'btn btn-primary btn-block draft'
       data = {
         'modal-remote' => true,
@@ -39,9 +39,17 @@ module Tenon
 
     private
 
+    def class_for(obj)
+      if obj.class < Draper::Decorator
+        obj.object.class.to_s
+      else
+        obj.class.to_s
+      end
+    end
+
     def build_data(obj, opts)
       data = {
-        'item-type' => obj.class.to_s,
+        'item-type' => class_for(obj),
         'item-id' => obj.id,
         'autosave' => !params[:version],
         'version-create-path' => item_versions_path

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.65'
+  VERSION = '1.0.66'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.65
+  version: 1.0.66
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors