lolita-i18n 0.1.4 → 0.1.18

data/.document

@@ -1,4 +1,4 @@
-lib/**/*.rb
-- 
-features/**/*.feature
-LICENSE.txt
+lib/**/*.rb
+- 
+features/**/*.feature
+LICENSE.txt

data/.rspec

@@ -1 +1 @@
---color
+--color

data/Gemfile

@@ -1,24 +1,24 @@
-source "http://rubygems.org"
-
-gem "lolita", '~>3.2.0.rc.3'
-gem "hiredis", "~> 0.3.1"
-gem "redis", "~> 2.2.2", :require => ["redis/connection/hiredis", "redis"]
-gem "yajl-ruby", "~> 1.0.0"
-gem "easy_translate", "~> 0.2.1"
-
-group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
-end
-
-group :test do
-  gem "rspec","~>2.6.0"
-  gem "rspec-rails", "~>2.6.0"
-  gem "webmock", "~> 1.7.6"
-  # gem "mongo", "~> 1.3.0"
-  # gem "mongoid", "~> 2.0.0"
-  # gem "bson_ext", "~> 1.4.0"
-  gem 'ruby-debug19', :require => 'ruby-debug'
-end
+source "http://rubygems.org"
+
+gem "lolita", '3.1.18'
+gem "hiredis", "~> 0.3.1"
+gem "redis", "~> 2.2.2", :require => ["redis/connection/hiredis", "redis"]
+gem "yajl-ruby", "~> 1.0.0"
+gem "easy_translate", "~> 0.2.1"
+
+group :development do
+  gem "shoulda", ">= 0"
+  gem "bundler", "~> 1.0.0"
+  gem "jeweler", "~> 1.5.2"
+  gem "rcov", ">= 0"
+end
+
+group :test do
+  gem "rspec","~>2.6.0"
+  gem "rspec-rails", "~>2.6.0"
+  gem "webmock", "~> 1.7.6"
+  # gem "mongo", "~> 1.3.0"
+  # gem "mongoid", "~> 2.0.0"
+  # gem "bson_ext", "~> 1.4.0"
+  gem 'ruby-debug19', :require => 'ruby-debug'
+end

data/History.rdoc

@@ -0,0 +1,7 @@
+=== Version 0.2.0
+* Enhancements
+  * Redis configuration and access to attributes goes through Lolita.i18n
+  * Redis initialization process works automaticly
+
+* Changes
+  * Google translation temporary removed from

data/LICENSE.txt

@@ -1,20 +1,20 @@
-Copyright (c) 2011 ITHouse (Latvia) and Arturs Meisters
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2011 ITHouse (Latvia) and Arturs Meisters
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,27 +1,27 @@
-# About
-
-Lolita I18n is Lolita[https://github.com/ithouse/lolita] plugin, that enables .yml file translation from WEB interface.
-
-## Usage
-
-* setup rails 3.1 project with ["Lolita"](https://github.com/ithouse/lolita)
-* setup [Redis DB](http://redis.io) on your server
-* add `gem 'lolita-i18n'` into Gemfile
-* add `I18n.backend = Lolita::I18n.load Redis.new(:db => REDIS_DB)` into your `config/initializers/lolita.rb`
-* add `REDIS_DB = 10` in your production/staging environment file. 
-* open `/lolita/i18n` and start translating
-
-## Contributing to lolita-i18n
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2011 ITHouse (Latvia). See LICENSE.txt for
+# About
+
+Lolita I18n is Lolita[https://github.com/ithouse/lolita] plugin, that enables .yml file translation from WEB interface.
+
+## Usage
+
+* setup rails 3.1 project with ["Lolita"](https://github.com/ithouse/lolita)
+* setup [Redis DB](http://redis.io) on your server
+* add `gem 'lolita-i18n'` into Gemfile
+* in your lolita setup block add  `config.i18n.store = {:db => REDIS_DB}` or `config.i18n.store = Redis.new`
+* add `REDIS_DB = your db number` in your environment files. 
+* open `/lolita/i18n` and start translating
+
+## Contributing to lolita-i18n
+ 
+* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
+* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
+* Fork the project
+* Start a feature/bugfix branch
+* Commit and push until you are happy with your contribution
+* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
+* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
+
+== Copyright
+
+Copyright (c) 2011 ITHouse (Latvia). See LICENSE.txt for
 further details.

data/Rakefile

@@ -1,46 +1,46 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "lolita-i18n"
-  gem.homepage = "http://github.com/ithouse/lolita-i18n"
-  gem.license = "MIT"
-  gem.summary = %Q{Lolita plugin, that enables .yml management}
-  gem.description = %Q{Lolita plugin, that enables .yml files management from administrative interface. Also faster access to translations, that DB store}
-  gem.email = "support@ithouse.lv"
-  gem.authors = ["ITHouse (Latvia)","Arturs Meisters", "Gatis Tomsons"]
-  # Include your dependencies below. Runtime dependencies are required when using your gem,
-  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
-  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
-  #  gem.add_development_dependency 'rspec', '> 1.2.3'
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-task :default => :test
-
-require 'rdoc/task'
-RDoc::Task.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "lolita-i18n #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "lolita-i18n"
+  gem.homepage = "http://github.com/ithouse/lolita-i18n"
+  gem.license = "MIT"
+  gem.summary = %Q{Lolita plugin, that enables .yml management}
+  gem.description = %Q{Lolita plugin, that enables .yml files management from administrative interface. Also faster access to translations, that DB store}
+  gem.email = "support@ithouse.lv"
+  gem.authors = ["ITHouse (Latvia)","Arturs Meisters", "Gatis Tomsons"]
+  # Include your dependencies below. Runtime dependencies are required when using your gem,
+  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
+  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
+  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+task :default => :test
+
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "lolita-i18n #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.18

data/app/controllers/lolita/i18n_controller.rb

@@ -1,39 +1,43 @@
-class Lolita::I18nController < ApplicationController
-  include Lolita::Controllers::UserHelpers
-  before_filter :authenticate_lolita_user!, :set_current_locale
-
-  layout "lolita/application"
-
-  def index
-    @translation_keys=Lolita::I18n.flatten_keys
-  end
-
-  def update
-    respond_to do |format|
-      format.json do
-        render :nothing => true, :json => {error: !Lolita::I18n::Backend.set(params[:id],params[:translation])}
-      end
-    end
-  end
-
-  def translate_untranslated
-    respond_to do |format|
-      format.json do
-        google_translate = Lolita::I18n::GoogleTranslate.new @active_locale
-        google_translate.run
-        render :nothing => true, :status => 200, :json => {errors: google_translate.errors, :translated => google_translate.untranslated}
-      end
-    end    
-  end
-
-  private
-
-  def next_locale
-    ::I18n::available_locales.collect{|locale| locale if locale != ::I18n.default_locale}.compact.first
-  end
-
-  def set_current_locale
-    @active_locale = (params[:active_locale] || next_locale).to_sym
-  end
-
+class Lolita::I18nController < ApplicationController
+  include Lolita::ControllerAdditions
+  before_filter :authenticate_lolita_user!, :set_current_locale
+
+  layout "lolita/application"
+
+  def index
+    @translation_keys=Lolita.i18n.flatten_keys
+  end
+
+  def update
+    respond_to do |format|
+      format.json do
+        render :nothing => true, :json => {error: !Lolita::I18n::Backend.set(params[:id],params[:translation])}
+      end
+    end
+  end
+
+  def translate_untranslated
+    respond_to do |format|
+      format.json do
+        google_translate = Lolita::I18n::GoogleTranslate.new @active_locale
+        google_translate.run
+        render :nothing => true, :status => 200, :json => {errors: google_translate.errors, :translated => google_translate.untranslated}
+      end
+    end    
+  end
+
+  private
+  
+  def is_lolita_resource?
+    true
+  end
+
+  def next_locale
+    ::I18n::available_locales.collect{|locale| locale if locale != ::I18n.default_locale}.compact.first
+  end
+
+  def set_current_locale
+    @active_locale = (params[:active_locale] || next_locale).to_sym
+  end
+
 end

data/app/helpers/lolita/i18n_helper.rb

@@ -1,25 +1,25 @@
-module Lolita
-  module I18nHelper
-    def locale_options
-      ::I18n::available_locales.collect{|locale| 
-        [::I18n.t(locale, :default => locale), locale] unless [::I18n.default_locale,@active_locale].include?(locale)
-      }.compact.insert(0,[::I18n.t("lolita-i18n.choose-other-language", :default => "Choose other language"),""])
-    end
-
-    def show_translation key
-      value = ::I18n.t(key, :locale => @active_locale, :default => '')
-      unless value.blank?
-        value
-      else
-        value = Lolita::I18n::GoogleTranslate.get_translation(@active_locale,key)
-        unless value.blank?
-          content_tag(:span, value, :class => "unapproved")
-        end
-      end
-    end
-
-    def is_untranslated key
-      Lolita::I18n::GoogleTranslate.get_translation(@active_locale,key)
-    end
-  end
+module Lolita
+  module I18nHelper
+    def locale_options
+      (::I18n::available_locales).collect{|locale| 
+        [::I18n.t(locale, :default => locale), locale] unless [::I18n.default_locale,@active_locale].include?(locale)
+      }.compact.insert(0,[::I18n.t("lolita-i18n.choose-other-language", :default => "Choose other language"),""])
+    end
+
+    def show_translation key
+      value = ::I18n.t(key, :locale => @active_locale, :default => '')
+      unless value.blank?
+        value
+      else
+        value = Lolita::I18n::GoogleTranslate.get_translation(@active_locale,key)
+        unless value.blank?
+          content_tag(:span, value, :class => "unapproved")
+        end
+      end
+    end
+
+    def is_untranslated key
+      Lolita::I18n::GoogleTranslate.get_translation(@active_locale,key)
+    end
+  end
 end

data/app/views/lolita/i18n/index.html.haml

@@ -1,34 +1,36 @@
-- content_for :style do
-  = stylesheet_link_tag "lolita/i18n/application", :media => "screen,projection"
-- content_for :script do
-  = javascript_include_tag "lolita/i18n/application"
-.box.i18n-bo
-  .boxtitle
-    %h1.black= ::I18n.t('lolita-i18n.title', :default => "Static content translation")
-    .arrow
-  .list
-    %div.actions
-      .filters
-        = check_box_tag "show_untranslated", nil, params[:show_untranslated]
-        = label_tag "show_untranslated", "Show translations that need approval"
-
-      %button.translate{:'data-url' => translate_untranslated_lolita_i18n_index_path, :'data-locale' => @active_locale} Translate empty translations with Google
-      .clear
-    %table
-      %thead
-        %tr
-          %th{:style => "width:450px"}
-            = label_tag :active_locale, I18n.t(@active_locale, :default => @active_locale)
-            - if locale_options.size > 1
-              = select_tag :active_locale, options_for_select(locale_options), :id => "active_locale"
-          %th{:style => "width:90%"}= ::I18n.t(::I18n.default_locale)
-      %tbody
-        - @translation_keys.each do |key|
-          - if !params[:show_untranslated] or is_untranslated(key)
-            %tr
-              %td{:style => "width:450px", :'data-key' => key, :'data-locale' => @active_locale}
-                %p= show_translation key
-              %td{:style => "width:90%", :'data-key' => key, :'data-locale' => ::I18n.default_locale}
-                %p= ::I18n.t(key, :locale => ::I18n.default_locale, :default => "")
-                %span.hint
+- content_for :style do
+  = stylesheet_link_tag "lolita/i18n/application", :media => "screen,projection"
+- content_for :script do
+  =# javascript_include_tag "lolita/i18n/application"
+  = javascript_include_tag "lolita/i18n/i18n.js"
+  = javascript_include_tag "lolita/i18n/spin.min.js"
+.box.i18n-bo
+  .boxtitle
+    %h1.black= ::I18n.t('lolita-i18n.title', :default => "Static content translation")
+    .arrow
+  .list
+    / %div.actions
+    /   .filters
+    /     = check_box_tag "show_untranslated", nil, params[:show_untranslated]
+    /     = label_tag "show_untranslated", "Show translations that need approval"
+
+    /   %button.translate{:'data-url' => translate_untranslated_lolita_i18n_index_path, :'data-locale' => @active_locale} Translate empty translations with Google
+    /   .clear
+    %table
+      %thead
+        %tr
+          %th{:style => "width:450px"}
+            = label_tag :active_locale, I18n.t(@active_locale, :default => @active_locale)
+            - if locale_options.size > 1
+              = select_tag :active_locale, options_for_select(locale_options), :id => "active_locale"
+          %th{:style => "width:90%"}= ::I18n.t(::I18n.default_locale)
+      %tbody
+        - @translation_keys.each do |key|
+          - if !params[:show_untranslated] or is_untranslated(key)
+            %tr
+              %td{:style => "width:450px", :'data-key' => key, :'data-locale' => @active_locale}
+                %p= show_translation key
+              %td{:style => "width:90%", :'data-key' => key, :'data-locale' => ::I18n.default_locale}
+                %p= ::I18n.t(key, :locale => ::I18n.default_locale, :default => "")
+                %span.hint
                   = key