couch_i18n 0.0.7 → 0.0.8

data/README.rdoc

@@ -126,7 +126,7 @@ The following helpers are assumed:
       t('Create')
     end
     def boolean_text(truefalse)
-      truefalse ? t('boolean true') : t('boolean false')
+      truefalse ? t('general.boolean true') : t('general.boolean false')
     end
     def are_you_sure(obj = nil)
       t('Are you sure')
@@ -159,4 +159,7 @@ the planning of being made.
 * Add grouped search/replaces to move one group of translations to another section. Same comment as above
 * Search through values. If anyone has a better idea than searching by ruby through all the translations or adding lucene please feel free.
 * A lot of testing
+* Add referencing to other translations (big miss in I18n)
 * Add error_messages partial to manual
+* Only show translations of exact given offset (no children)
+* Show translation matching exact the given offset (beware of caching or automatically adding structures)

data/app/controllers/couch_i18n/translations_controller.rb

@@ -34,7 +34,7 @@ module CouchI18n
         @translation.value = JSON.parse(@translation.value)
       end
       if @translation.save
-        redirect_to({:action => :index, :offset => @translation.key.to_s.sub(/\.[\w\s-]+$/, '')}, :notice => I18n.t('action.create.successful', :model => CouchI18n::Translation.model_name.human))
+        redirect_to({:action => :index, :offset => @translation.key.to_s.sub(/\.[\w\s-]+$/, '')}, :notice => I18n.t('couch_i18n.action.create.successful', :model => CouchI18n::Translation.model_name.human))
       else
         render :action => :new
       end
@@ -53,7 +53,7 @@ module CouchI18n
         params[:translation]["value"] = JSON.parse(params[:translation]["value"])
       end
       if @translation.update_attributes(params[:translation])
-        redirect_to({:action => :index, :offset => @translation.key.to_s.sub(/\.[\w\s-]+$/, '')}, :notice => I18n.t('action.update.successful', :model => CouchI18n::Translation.model_name.human))
+        redirect_to({:action => :index, :offset => @translation.key.to_s.sub(/\.[\w\s-]+$/, '')}, :notice => I18n.t('couch_i18n.action.update.successful', :model => CouchI18n::Translation.model_name.human))
       else
         render :action => :edit
       end
@@ -62,7 +62,7 @@ module CouchI18n
     def destroy
       @translation = CouchI18n::Translation.find(params[:id])
       if @translation.destroy
-        flash[:notice] = I18n.t('action.destroy.successful', :model => CouchI18n::Translation.model_name.human)
+        flash[:notice] = I18n.t('couch_i18n.action.destroy.successful', :model => CouchI18n::Translation.model_name.human)
       end
       redirect_to({:action => :index, :offset => @translation.key.to_s.sub(/\.\w+$/, '')})
     end

data/app/helpers/couch_i18n/application_helper.rb

@@ -7,31 +7,31 @@ module CouchI18n
     end
 
     def link_to_new_content(obj)
-      t('New')
+      t('couch_i18n.action.new.label')
     end
     def link_to_edit_content(obj = nil)
-      t('Edit')
+      t('couch_i18n.action.edit.label')
     end
     def link_to_show_content(obj = nil)
-      t('Show')
+      t('couch_i18n.action.show.label')
     end
     def link_to_index_content(singular_name)
-      t('Back')
+      t('couch_i18n.action.index.label')
     end
     def link_to_destroy_content(obj = nil)
-      t('Delete')
+      t('couch_i18n.action.destroy.label')
     end
     def update_button_text(obj = nil)
-      t('Save')
+      t('couch_i18n.action.update.button_text')
     end
     def create_button_text(obj = nil)
-      t('Create')
+      t('couch_i18n.action.create.button_text')
     end
     def boolean_show(truefalse)
-      truefalse ? t('boolean true') : t('boolean false')
+      truefalse ? t('couch_i18n.general.boolean_true') : t('couch_i18n.general.boolean_false')
     end
     def are_you_sure(obj = nil)
-      t('Are you sure')
+      t('couch_i18n.general.are_you_sure')
     end
   end
 end

data/app/views/couch_i18n/application/_error_messages.html.haml

@@ -1,6 +1,6 @@
 -if target.errors.any?
   #errorExplanation
-    %h2= t('Errors title', :count => target.errors.count)
+    %h2= t('couch_i18n.errors.title', :count => target.errors.count)
     %ul
       - target.errors.full_messages.each do |msg|
         %li= msg

data/app/views/couch_i18n/translations/edit.html.haml

@@ -1,4 +1,4 @@
-- title t("couch_i18n.translation.edit title")
+- title t("couch_i18n.action..edit.title")
 = render 'form'
 - content_for :page_links do
   = link_to link_to_index_content(:translations), couch_i18n.translations_path(:offset => params[:offset] || @translation.key.to_s.sub(/\.[\w\s-]+$/, ''))

data/app/views/couch_i18n/translations/index.html.haml

@@ -1,20 +1,20 @@
 - if params[:offset].present?
   - title params[:offset]
 - else
-  - title t("couch_i18n.translation.index title")
+  - title t("couch_i18n.action.index.title")
 .destroy-link
-  = link_to t('couch_i18n.translation.destroy offset link'), couch_i18n.destroy_offset_translations_path(:offset => params[:offset]), :method => :delete, :confirm => (defined?(:are_you_sure) ? are_you_sure : t('couch_i18n.translation.are you sure'))
+  = link_to t('couch_i18n.action.destroy.offset_link'), couch_i18n.destroy_offset_translations_path(:offset => params[:offset]), :method => :delete, :confirm => (defined?(:are_you_sure) ? are_you_sure : t('couch_i18n.general.are_you_sure'))
 .import-form
   = form_tag({:action => :import}, :multipart => true) do
     = file_field_tag :importfile
-    = submit_tag I18n.t('couch_i18n.translation.import')
+    = submit_tag I18n.t('couch_i18n.import.button')
 .export-form
   = form_tag :action => :export do
     = hidden_field_tag :offset, params[:offset]
     = select_tag :exportformat, options_for_select(%w[yml csv json], params[:exportformat])
     = check_box_tag :untranslated
-    = label_tag :untranslated, t('couch_i18n.translation.export.untranslated')
-    = submit_tag I18n.t('couch_i18n.translation.export.execute')
+    = label_tag :untranslated, t('couch_i18n.export.untranslated')
+    = submit_tag I18n.t('couch_i18n.export.execute')
 .offset-navigation-block.block
   .offset-navigation-higher
     - for offset in @available_higher_offsets
@@ -22,10 +22,10 @@
   .offset-navigation-form
     = form_tag({}, :method => :get )do
       - if params[:offset].present?
-        = link_to I18n.t('couch_i18n.translation.go to zero offset'), :offset => nil
+        = link_to I18n.t('couch_i18n.general.go_to_zero_offset'), :offset => nil
       = text_field_tag :offset, params[:offset], :size => 60
       = "(#{@translations.total_entries})"
-      = submit_tag I18n.t('couch_i18n.translation.go to offset')
+      = submit_tag I18n.t('couch_i18n.general.go_to_offset')
   .offset-navigation-deeper
     - for offset in @available_deeper_offsets
       = link_to offset[:name], :offset => offset[:offset]
@@ -48,7 +48,7 @@
           %td.action.edit= link_to link_to_edit_content(translation), couch_i18n.edit_translation_path(translation)
           %td.action.destroy= link_to link_to_destroy_content(translation),couch_i18n.translation_path(translation), :confirm => are_you_sure, :method => :delete
 - else
-  %h3= t("translation.none found")
+  %h3= t("couch_i18n.general.none_found")
 
 - content_for :page_links do
   = link_to link_to_new_content(:translation), couch_i18n.new_translation_path(:offset => params[:offset])

data/app/views/couch_i18n/translations/new.html.haml

@@ -1,4 +1,4 @@
-- title t("couch_i18n.translation.new title")
+- title t("couch_i18n.action.new.title")
 = render 'form'
 - content_for :page_links do
   = link_to link_to_index_content(:couch_i18n_translations), couch_i18n.translations_path(:offset => params[:offset])

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

@@ -1,7 +1,7 @@
 !!!
 %html
   %head
-    %title= defined?(site_title) ? site_title : I18n.t('couch_i18n.translation.site_title')
+    %title= defined?(site_title) ? site_title : I18n.t('couch_i18n.general.site_title')
     = csrf_meta_tag
     = stylesheet_link_tag 'couch_i18n/application'
     = javascript_include_tag 'couch_i18n/application'

data/lib/couch_i18n/active_model_errors.rb

@@ -0,0 +1,44 @@
+# This file overwrites the default activemode error message lookup behaviour.
+
+module ActiveModel
+  class Errors
+
+    # The code for this method is base on rails revision: f3531a8fc9f661f96759f0a851540745876e5d6c
+    # The error lookup now consists of:
+    # namespace.errors.messages
+    def generate_message(attribute, type = :invalid, options = {})
+      type = options.delete(:message) if options[:message].is_a?(Symbol)
+
+      value = (attribute != :base ? @base.send(:read_attribute_for_validation, attribute) : nil)
+
+      # Create key. Remove class in model name and add errors.messages
+      key = (@base.class.model_name.underscore.sub(/\w+$/, '').scan(/\w+/) + ['errors.messages', type]).join('.')
+
+      options = {
+        :model => @base.class.model_name.human,
+        :attribute => @base.class.human_attribute_name(attribute),
+        :value => value
+      }.merge(options)
+
+      I18n.translate(key, options)
+    end
+
+    def full_messages
+      map { |attribute, message| full_message(attribute, message) }
+    end
+
+    def full_message(attribute, message)
+      return message if attribute == :base
+      attr_name = attribute.to_s.gsub('.', '_').humanize
+      attr_name = @base.class.human_attribute_name(attribute, :default => attr_name)
+
+      # Create key. Remove class in model name and add errors.messages
+      key = (@base.class.model_name.underscore.sub(/\w+$/, '').scan(/\w+/) + ['errors.conjunction.attribute_message']).join('.')
+      I18n.t(key, {
+        :default   => "%{attribute} %{message}",
+        :attribute => attr_name,
+        :message   => message
+      })
+    end
+  end
+end

data/lib/couch_i18n/store.rb

@@ -15,14 +15,14 @@ module CouchI18n
     end
 
     # alias for read
-    def [](key, options=nil)
+    def [](key, options = {})
       key = key.to_s.gsub('/', '.')
       Rails.cache.fetch(key) do
         old_database_name = get_couchrest_name
         begin
           set_couchrest_name CouchPotato::Config.database_name # Set database to original configured name
           translation = CouchI18n::Translation.find_by_key(key.to_s)
-          translation ||= CouchI18n::Translation.create(:key => key, :value => key.to_s.split('.').last, :translated => false)
+          translation ||= CouchI18n::Translation.create(:key => key, :value => options[:default].presence || key.to_s.split('.').last, :translated => false)
         ensure
           set_couchrest_name old_database_name
         end

data/lib/couch_i18n.rb

@@ -1,6 +1,7 @@
 require "couch_i18n/engine"
 require 'couch_i18n/store'
 require 'couch_i18n/backend'
+require 'couch_i18n/active_model_errors'
 module CouchI18n
   # This method imports yaml translations to the couchdb version. When run again new ones will
   # be added. Translations already stored in the couchdb database are not overwritten

metadata

@@ -1,82 +1,96 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: couch_i18n
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.8
   prerelease: 
-  version: 0.0.7
 platform: ruby
-authors: 
+authors:
 - Benjamin ter Kuile
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-20 00:00:00 +02:00
-default_executable: 
-dependencies: []
-
-description: couch_i18n is an in database storage for I18n translations, tested for rails, with online management views
+date: 2011-12-14 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: &70285132887140 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70285132887140
+- !ruby/object:Gem::Dependency
+  name: simply_stored
+  requirement: &70285132886720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70285132886720
+description: couch_i18n is an in database storage for I18n translations, tested for
+  rails, with online management views
 email: bterkuile@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- lib/couch_i18n/engine.rb
+files:
+- lib/couch_i18n/active_model_errors.rb
 - lib/couch_i18n/backend.rb
+- lib/couch_i18n/engine.rb
 - lib/couch_i18n/store.rb
 - lib/couch_i18n.rb
 - lib/tasks/couch_i18n_tasks.rake
-- app/models/couch_i18n/translation.rb
-- app/controllers/couch_i18n/application_controller.rb
-- app/controllers/couch_i18n/translations_controller.rb
-- app/assets/javascripts/couch_i18n/structure.js
-- app/assets/javascripts/couch_i18n/application.js
 - app/assets/images/couch_i18n/alert.png
 - app/assets/images/couch_i18n/notice.png
+- app/assets/javascripts/couch_i18n/application.js
+- app/assets/javascripts/couch_i18n/structure.js
 - app/assets/stylesheets/couch_i18n/alerts.css.scss
-- app/assets/stylesheets/couch_i18n/structure.css.scss
 - app/assets/stylesheets/couch_i18n/application.css
+- app/assets/stylesheets/couch_i18n/structure.css.scss
+- app/controllers/couch_i18n/application_controller.rb
+- app/controllers/couch_i18n/translations_controller.rb
 - app/helpers/couch_i18n/application_helper.rb
+- app/models/couch_i18n/translation.rb
 - app/views/couch_i18n/application/_alerts.html.haml
 - app/views/couch_i18n/application/_error_messages.html.haml
 - app/views/couch_i18n/translations/_form.html.haml
-- app/views/couch_i18n/translations/index.html.haml
 - app/views/couch_i18n/translations/edit.html.haml
+- app/views/couch_i18n/translations/index.html.haml
 - app/views/couch_i18n/translations/new.html.haml
 - app/views/layouts/couch_i18n/application.html.haml
 - config/routes.rb
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
-has_rdoc: true
 homepage: http://github.com/bterkuile/couch_i18n
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: couch_i18n
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: couch_i18n is an in database storage for I18n translations, tested for rails, with online management views
+summary: couch_i18n is an in database storage for I18n translations, tested for rails,
+  with online management views
 test_files: []
-