lolita-i18n 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/app/assets/javascripts/lolita/i18n/i18n.js.coffee

@@ -34,7 +34,7 @@ class LolitaI18nCell
       dataType: 'json'
       success: (data) ->
         if data.error
-          alert "Error saving translation " + that.key
+          alert "Error saving translation:\n\n" + data.error
         that.remove_spinner()
 
   add_spinner: ->

data/app/controllers/lolita/i18n_controller.rb

@@ -11,7 +11,13 @@ class Lolita::I18nController < ApplicationController
   def update
     respond_to do |format|
       format.json do
-        render :nothing => true, :json => {error: !Lolita::I18n::Backend.set(params[:id],params[:translation])}
+        error = false
+        begin
+          Lolita::I18n::Backend.set(params[:id],params[:translation])
+        rescue Lolita::I18n::Exceptions::MissingInterpolationArgument => e
+          error = e.to_s
+        end
+        render :nothing => true, :json => {error: error}
       end
     end
   end

data/lib/lolita-i18n.rb

@@ -18,7 +18,8 @@ module Lolita
   #   config.i18n.store = Redis.new()
   module I18n
     autoload :Backend, 'lolita-i18n/backend'
-
+    autoload :Exceptions, 'lolita-i18n/exceptions'
+    
     class Configuration
 
       attr_accessor :yaml_backend

data/lib/lolita-i18n/backend.rb

@@ -1,5 +1,5 @@
 module Lolita
-  module I18n
+  module I18n   
     # Allow to operate with I18n keys and values.
     class Backend
 
@@ -24,6 +24,7 @@ module Lolita
         # * <tt>key</tt> - translation key
         # * <tt>translation</tt> - String with translation
         def set(key,translation)
+          validate_translation(key,translation)
           locale=translate_to(key)
           translation_key=translation_key(key)
           value=Yajl::Parser.parse(translation.to_json)
@@ -51,6 +52,16 @@ module Lolita
         end
         
         private
+        
+        def validate_translation key,translation
+          validate_interpolation_arguments key,translation
+        end
+
+        def validate_interpolation_arguments key,translation
+          in_translation = translation.scan(/(%{\w+})/).map{|m| m.first}.sort
+          in_original = ::I18n.t(translation_key(key), :locale => ::I18n.default_locale).scan(/(%{\w+})/).map{|m| m.first}.sort
+          raise Exceptions::MissingInterpolationArgument.new(in_original) unless in_translation == in_original
+        end
 
         def keys
           @keys||=Lolita.i18n.flattened_translations.keys.sort

data/lib/lolita-i18n/exceptions.rb

@@ -0,0 +1,11 @@
+module Lolita
+  module I18n
+    module Exceptions     
+      class MissingInterpolationArgument < StandardError
+        def initialize missing_arguments
+          super "Translation should contain all these variables #{missing_arguments.join(', ')}"
+        end
+      end
+    end
+  end
+end

data/lolita-i18n.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "lolita-i18n"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ITHouse (Latvia)", "Arturs Meisters", "Gatis Tomsons"]
-  s.date = "2012-02-22"
+  s.date = "2012-02-27"
   s.description = "Lolita plugin, that enables .yml files management from administrative interface. Also faster access to translations, that DB store"
   s.email = "support@ithouse.lv"
   s.extra_rdoc_files = [
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
     "config/routes.rb",
     "lib/lolita-i18n.rb",
     "lib/lolita-i18n/backend.rb",
+    "lib/lolita-i18n/exceptions.rb",
     "lib/lolita-i18n/module.rb",
     "lib/lolita-i18n/rails.rb",
     "lolita-i18n.gemspec",

data/spec/lolita-i18n/backend_spec.rb

@@ -25,4 +25,9 @@ describe Lolita::I18n::Backend do
     Lolita::I18n::Backend.set("en.test-key","Hello")
     Lolita::I18n::Backend.get("en.test-key")[:value].should == "Hello"
   end
+
+  it "should raise Lolita::I18n::Exceptions::MissingInterpolationArgument" do
+    lambda {Lolita::I18n::Backend.set("lv.copyright","Autortiesibas 2010-2012")}.should raise_error(Lolita::I18n::Exceptions::MissingInterpolationArgument)
+    lambda {Lolita::I18n::Backend.set("lv.copyright","Autortiesibas %{year_from}-%{year_till}")}.should_not raise_error(Lolita::I18n::Exceptions::MissingInterpolationArgument)
+  end
 end

data/spec/rails_app/config/locales/en.yml

@@ -6,4 +6,5 @@ en:
   comments:
     "Title": Comments
     "Description": "Comment description"
-  "Footer": "Footer text"
+  Footer: "Footer text"
+  copyright: "Copyright %{year_from}-%{year_till}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lolita-i18n
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000 Z
+date: 2012-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lolita
-  requirement: &77328960 !ruby/object:Gem::Requirement
+  requirement: &73099830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.2.0.rc.6
   type: :runtime
   prerelease: false
-  version_requirements: *77328960
+  version_requirements: *73099830
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &77338860 !ruby/object:Gem::Requirement
+  requirement: &73099120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -34,10 +34,10 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *77338860
+  version_requirements: *73099120
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &77338530 !ruby/object:Gem::Requirement
+  requirement: &73098170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -45,10 +45,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *77338530
+  version_requirements: *73098170
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &77338040 !ruby/object:Gem::Requirement
+  requirement: &73113540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *77338040
+  version_requirements: *73113540
 - !ruby/object:Gem::Dependency
   name: easy_translate
-  requirement: &77337330 !ruby/object:Gem::Requirement
+  requirement: &73110350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *77337330
+  version_requirements: *73110350
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &77336670 !ruby/object:Gem::Requirement
+  requirement: &73122860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77336670
+  version_requirements: *73122860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &77335820 !ruby/object:Gem::Requirement
+  requirement: &73118280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *77335820
+  version_requirements: *73118280
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &77335230 !ruby/object:Gem::Requirement
+  requirement: &73133740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -100,10 +100,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *77335230
+  version_requirements: *73133740
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &77351840 !ruby/object:Gem::Requirement
+  requirement: &73142040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,7 +111,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *77351840
+  version_requirements: *73142040
 description: Lolita plugin, that enables .yml files management from administrative
   interface. Also faster access to translations, that DB store
 email: support@ithouse.lv
@@ -142,6 +142,7 @@ files:
 - config/routes.rb
 - lib/lolita-i18n.rb
 - lib/lolita-i18n/backend.rb
+- lib/lolita-i18n/exceptions.rb
 - lib/lolita-i18n/module.rb
 - lib/lolita-i18n/rails.rb
 - lolita-i18n.gemspec
@@ -170,7 +171,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -798289933
+      hash: 560858397
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: