rails-i18nterface 0.1.5 → 0.1.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4247f071313c096f5b0101c05d322d81469698be
+  data.tar.gz: dac5a3a210a13e2d6a9c084fa943262d12f519a9
+SHA512:
+  metadata.gz: 89af3200a75dadecada9ff5d64c3aff54f542d27f7642eec4608775adfb2b534e422931ab051f9c3bd9bac769f05689ee301bde5f47f76c369826a767fd05a00
+  data.tar.gz: 0ed1c842b643b7adf9040c204f1db74f1259a787d6c88c09f98e22d393427944aa598868d5e0fe2f741c1bf2ee07bbb01cbf45b502c1398d775610efd99ae357

data/app/assets/javascripts/rails_i18nterface/application.js

@@ -4,5 +4,5 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
-//= require rails_i18nterface/ender
+//= require rails_i18nterface/ender.min
 //= require rails_i18nterface/base

data/app/assets/javascripts/rails_i18nterface/base.js

@@ -67,10 +67,14 @@ $.domReady(function() {
         url: 'delete/'+key,
         method: 'delete',
         success: function(resp) {
-          alert(resp);
+          if (resp == error) {
+            alert(resp.msg);
+          } else {
+            alert(resp);
+          }
         },
         error: function(resp,msg) {
-          alert("Error: "+resp.statusText);
+          alert("Error: " + msg);
         }
       })
     }

data/app/assets/stylesheets/rails_i18nterface/application.css

@@ -117,7 +117,7 @@ a{
   position: fixed;
   top: 65px;
   width: 200px;
-  height: 100%;
+  height: calc(100% - 65px);
   overflow-y: scroll;
   background-color: #ddd;
   padding-top: 10px;

data/app/controllers/rails_i18nterface/translate_controller.rb

@@ -20,8 +20,8 @@ module RailsI18nterface
     end
 
     def destroy
-      term = Translation.find_by_key(params[:key])
-      if term.destroy!
+      term = RailsI18nterface::Translation.find_by_key(params[:key])
+      if term and term.destroy
         render json: 'ok'
       else
         render json: 'error'
@@ -31,46 +31,35 @@ module RailsI18nterface
     def load_db_translations
       @versions = {}
       @dbvalues = {@to_locale => {}}
-      (Translation.where(:locale => @to_locale) || []).each { |translation|
+      (RailsI18nterface::Translation.where(:locale => @to_locale) || []).each do |translation|
         @versions[translation.key] = translation.updated_at.to_i
         yaml_value = I18n.backend.send(:lookup, @to_locale, translation.key)
-        if (yaml_value and translation.value != yaml_value)
+        if yaml_value && translation.value != yaml_value
           translation.value = yaml_value
-          Translation.where(key: translation.key).first.update_attribute(:value, yaml_value)
+          RailsI18nterface::Translation.where(key: translation.key).first.update_attribute(:value, yaml_value)
         end
         @dbvalues[@to_locale][translation.key] = translation.value
         @keys << translation.key
-      }
+      end
       @keys.uniq!
     end
 
     def export
       locale = params[:locale].to_sym
       keys = {locale => I18n.backend.send(:translations)[locale] || {}}
-      Translation.where(:locale => @to_locale).each { |translation|
+      RailsI18nterface::Translation.where(:locale => @to_locale).each do |translation|
         next if !translation.value or translation.value == ''
-        set_nested(keys[locale], translation.key.split("."), translation.value)
-      }
+        set_nested(keys[locale], translation.key.split('.'), translation.value)
+      end
       remove_blanks keys
-      yaml = RailsI18nterface::Yamlfile.new.keys_to_yaml(keys)
+      puts keys
+      yaml = RailsI18nterface::Yamlfile.new(nil).keys_to_yaml(keys)
       response.headers['Content-Disposition'] = "attachment; filename=#{locale}.yml"
       render :text => yaml
     end
 
     def update
-      params[:key].each { |k, v|
-        t = Translation.where(:key => k, :locale => @to_locale).first
-        unless t
-          t = Translation.new
-          t.key = k
-          t.locale = @to_locale
-        end
-        next if t.value == v
-        if params[:version][k].to_i == t.updated_at.to_i
-          t.value = v
-        end
-        t.save
-      }
+      RailsI18nterface::Translation.update(@to_locale, params[:key])
       if I18n.backend.respond_to? :store_translations
         I18n.backend.store_translations(@to_locale, RailsI18nterface::Keys.to_deep_hash(params[:key]))
       end
@@ -83,7 +72,7 @@ module RailsI18nterface
 
     def reload
       RailsI18nterface::Keys.files = nil
-      redirect_to :action => 'index'
+      redirect_to root_path(params.slice(:filter, :sort_by, :key_type, :key_pattern, :text_type, :text_pattern))
     end
 
     private
@@ -93,9 +82,12 @@ module RailsI18nterface
       keys = (@files.keys.map(&:to_s) + RailsI18nterface::Keys.new.i18n_keys(@from_locale)).uniq
       keys.reject! do |key|
         from_text = lookup(@from_locale, key)
-        # When translating from one language to another, make sure there is a text to translate from.
-        # Always exclude non string translation objects as we don't support editing them in the UI.
-        (@from_locale != @to_locale && !from_text.present?) || (from_text.present? && !from_text.is_a?(String))
+        # When translating from one language to another,
+        # make sure there is a text to translate from.
+        # Always exclude non string translation objects
+        # as we don't support editing them in the UI.
+        (@from_locale != @to_locale && !from_text.present?) ||
+          (from_text.present? && !from_text.is_a?(String))
       end
     end
 
@@ -142,11 +134,12 @@ module RailsI18nterface
     def filter_by_text_pattern
       return if params[:text_pattern].blank?
       @keys.reject! do |key|
+        lookup_key = lookup(@from_locale, key)
         case params[:text_type]
         when 'contains'
-          !lookup(@from_locale, key).present? || !lookup(@from_locale, key).to_s.downcase.index(params[:text_pattern].downcase)
+          !lookup_key.present? || !lookup_key.to_s.downcase.index(params[:text_pattern].downcase)
         when 'equals'
-          !lookup(@from_locale, key).present? || lookup(@from_locale, key).to_s.downcase != params[:text_pattern].downcase
+          !lookup_key.present? || lookup_key.to_s.downcase != params[:text_pattern].downcase
         else
           raise "Unknown text_type '#{params[:text_type]}'"
         end
@@ -211,7 +204,7 @@ module RailsI18nterface
     def old_from_text(key)
       return @old_from_text[key] if @old_from_text && @old_from_text[key]
       @old_from_text = {}
-      text = key.split(".").inject(log_hash) do |hash, k|
+      text = key.split(".").reduce(log_hash) do |hash, k|
         hash ? hash[k] : nil
       end
       @old_from_text[key] = text

data/app/helpers/rails_i18nterface/translate_helper.rb

@@ -14,20 +14,18 @@ module RailsI18nterface
           filter << "<i>#{label}</i>"
         else
           link_params = params.merge({param_name.to_s => type})
-          link_params.merge!({"page" => nil}) if param_name.to_s != "page"
+          link_params.merge!({'page' => nil}) if param_name.to_s != 'page'
           filter << link_to(label, link_params)
         end
       end
-      filter.join(" | ")
+      filter.join(' | ')
     end
 
     def n_lines(text, line_size)
       n_lines = 1
       if text.present?
         n_lines = text.split("\n").size
-        if n_lines == 1 && text.length > line_size
-          n_lines = text.length / line_size + 1
-        end
+        n_lines = text.length / line_size + 1 if n_lines == 1 && text.length > line_size
       end
       n_lines
     end
@@ -36,14 +34,14 @@ module RailsI18nterface
       out = '<ul>'
       dirs = {}
       root = []
-      h.each do |k,v|
+      h.each do |k, v|
         if v.is_a? Hash
           dirs[k] = v
         else
           root << k
         end
       end
-      out << "<li class=\"dir\"><span class=\"display\" data-id=\".\"></span>ROOT"
+      out << '<li class="dir"><span class="display" data-id="."></span>ROOT'
       out << " <span class=\"num\">(#{root.length})</span>"
       out << '<ul>'
       root.each do |key|
@@ -51,19 +49,20 @@ module RailsI18nterface
       end
       out << '</ul>'
       out << '</ul>'
-      out << list_namespace('',dirs)
+      out << list_namespace('', dirs)
     end
 
-    def list_namespace(k,h)
+    def list_namespace(k, h)
       out = '<ul>'
       k != '' && k += '.'
-      h.each do |key,val|
+      h.each do |key, val|
         if val.is_a? Hash
-          out << "<li class=\"dir\"><span class=\"display\" data-id=\"#{k+key.to_s}\"></span>#{key}"
+          out << "<li class=\"dir\"><span class=\"display\" data-id=\"#{k + key.to_s}\"></span>"
+          out << key.to_s
           out << " <span class=\"num\">(#{val.length})</span>"
-          out << list_namespace(k+key.to_s,val)
+          out << list_namespace(k + key.to_s, val)
         else
-          out << "<li class=\"item\" data-id=\"#{k+key.to_s}\">#{key}"
+          out << "<li class=\"item\" data-id=\"#{k + key.to_s}\">#{key}"
         end
         out << '</li>'
       end

data/app/models/rails_i18nterface/translation.rb

@@ -0,0 +1,23 @@
+class RailsI18nterface::Translation < ActiveRecord::Base
+
+  def self.update(locale, keys)
+    keys.each do |k, v|
+      t = RailsI18nterface::Translation.where(key: k, locale: locale).first
+      if t
+        if !v || v == ''
+          t.destroy!
+          next
+        elsif t.value != v
+          t.value = v
+          t.save!
+        end
+      elsif v != ''
+        t = RailsI18nterface::Translation.new
+        t.key = k
+        t.locale = locale
+        t.save!
+      end
+    end
+  end
+
+end

data/app/views/rails_i18nterface/translate/index.html.erb

@@ -19,7 +19,7 @@
       <div class="center">
        <label>Show:</label> <%=  simple_filter(show_filters).html_safe %>
         Found <strong><%= @total_entries %></strong> messages
-        <%= link_to "Reload messages", translate_reload_path %>
+        <%= link_to "Reload messages", translate_reload_path(params) %>
       </div>
 
     </h1>

data/config/routes.rb

@@ -1,8 +1,8 @@
 RailsI18nterface::Engine.routes.draw do
-  root :to => 'translate#index'
+  root to: 'translate#index'
 
   put '/translate' => 'translate#update'
-  get '/reload' => 'translate#reload', :as => 'translate_reload'
-  get '/export' => 'translate#export', :as => 'translate_export'
+  get '/reload' => 'translate#reload', as: 'translate_reload'
+  get '/export' => 'translate#export', as: 'translate_export'
   delete '/delete/*key' => 'translate#destroy', format: false
 end

data/db/migrate/20130422115639_rename_translation_to_namespace.rb

@@ -0,0 +1,8 @@
+class RenameTranslationToNamespace < ActiveRecord::Migration
+  def self.up
+    rename_table :translations, :rails_i18nterface_translations
+  end
+  def self.down
+    rename_table :rails_i18nterface_translations, :translations
+  end
+end

data/lib/rails-i18nterface/keys.rb

@@ -5,15 +5,15 @@ module RailsI18nterface
 
     # Allows keys extracted from lookups in files to be cached
     def self.files
-      @@files ||= new.files
+      @files ||= new.files
     end
 
     def self.names
-      @@names || new.names
+      @names || new.names
     end
     # Allows flushing of the files cache
     def self.files=(files)
-      @@files = files
+      @files = files
     end
 
     def files
@@ -37,7 +37,7 @@ module RailsI18nterface
     end
 
     def untranslated_keys
-      self.class.translated_locales.inject({}) do |missing, locale|
+      self.class.translated_locales.reduce({}) do |missing, locale|
         missing[locale] = i18n_keys(I18n.default_locale).map do |key|
           I18n.backend.send(:lookup, locale, key).nil? ? key : nil
         end.compact
@@ -48,14 +48,16 @@ module RailsI18nterface
     def missing_keys
       locale = I18n.default_locale
       yaml_keys = {}
-      yaml_keys = Storage.file_paths(locale).inject({}) do |keys, path|
+      yaml_keys = Storage.file_paths(locale).reduce({}) do |keys, path|
         keys = keys.deep_merge(Yamlfile.new(path).read[locale.to_s])
       end
       files.reject { |key, file| self.class.contains_key?(yaml_keys, key) }
     end
 
     def self.translated_locales
-      I18n.available_locales.reject { |locale| [:root, I18n.default_locale.to_sym].include?(locale) }
+      I18n.available_locales.reject do |locale|
+        [:root, I18n.default_locale.to_sym].include?(locale)
+      end
     end
 
     # Checks if a nested hash contains the keys in dot separated I18n key.
@@ -76,10 +78,10 @@ module RailsI18nterface
     # contains_key?("foo.bar.baz.bla", key) # => false
     #
     def self.contains_key?(hash, key)
-      keys = key.to_s.split(".")
+      keys = key.to_s.split('.')
       return false if keys.empty?
-      !keys.inject(HashWithIndifferentAccess.new(hash)) do |memo, key|
-        memo.is_a?(Hash) ? memo.try(:[], key) : nil
+      !keys.reduce(HashWithIndifferentAccess.new(hash)) do |memo, k|
+        memo.is_a?(Hash) ? memo.try(:[], k) : nil
       end.nil?
     end
 
@@ -98,10 +100,10 @@ module RailsI18nterface
     #  {'pressrelease.label.one' => "Pressmeddelande"}
     #
     def self.to_shallow_hash(hash)
-      hash.inject({}) do |shallow_hash, (key, value)|
+      hash.reduce({}) do |shallow_hash, (key, value)|
         if value.is_a?(Hash)
           to_shallow_hash(value).each do |sub_key, sub_value|
-            shallow_hash[[key, sub_key].join(".")] = sub_value
+            shallow_hash[[key, sub_key].join('.')] = sub_value
           end
         else
           shallow_hash[key.to_s] = value
@@ -124,10 +126,10 @@ module RailsI18nterface
     #   }
     # }
     def self.to_deep_hash(hash)
-      hash.inject({}) do |deep_hash, (key, value)|
+      hash.reduce({}) do |deep_hash, (key, value)|
         keys = key.to_s.split('.').reverse
         leaf_key = keys.shift
-        key_hash = keys.inject({leaf_key.to_sym => value}) { |hash, key| {key.to_sym => hash} }
+        key_hash = keys.reduce({leaf_key.to_sym => value}) { |h, k| { k.to_sym => h } }
         deep_merge!(deep_hash, key_hash)
         deep_hash
       end

data/lib/rails-i18nterface/log.rb

@@ -24,14 +24,14 @@ module RailsI18nterface
     end
 
     def from_texts
-      file.deep_stringify_keys(Keys.to_deep_hash(keys.inject({}) do |hash, key|
+      file.deep_stringify_keys(Keys.to_deep_hash(keys.reduce({ }) do |hash, key|
         hash[key] = I18n.backend.send(:lookup, from_locale, key)
         hash
       end))
     end
 
     def file_path
-      File.join(Rails.root, "config", "locales", "log", "from_#{from_locale}_to_#{to_locale}.yml")
+      File.join(Rails.root, 'config', 'locales', 'log', "from_#{from_locale}_to_#{to_locale}.yml")
     end
   end
 end

data/lib/rails-i18nterface/sourcefiles.rb

@@ -2,9 +2,14 @@ module RailsI18nterface
   module Sourcefiles
 
     def self.extract_files
-      i18n_lookup_pattern = /\b(?:I18n\.t|I18n\.translate|t)(?:\s|\():?(?:'|")(\.?[a-z0-9_\.]+)(?:'|")/
+      i18n_lookup_pattern = /\b
+        (?:I18n\.t|I18n\.translate|t)
+        (?:\s|\():?(?:'|")
+          (\.?[a-z0-9_\.]+)
+        (?:'|")
+        /x
       f = {}
-      self.files_to_scan.inject(HashWithIndifferentAccess.new) do |files, file|
+      self.files_to_scan.reduce(HashWithIndifferentAccess.new) do |files, file|
         f = files.merge! self.populate_keys(file, i18n_lookup_pattern)
       end
       f.merge self.extract_activerecords
@@ -30,8 +35,8 @@ module RailsI18nterface
     end
 
     def self.files_to_scan
-      Dir.glob(File.join(Storage.root_dir, "{app,config,lib}", "**","*.{rb,erb,haml,slim,rhtml}")) +
-        Dir.glob(File.join(Storage.root_dir, "{public,app/assets}", "javascripts", "**","*.{js,coffee}"))
+      Dir.glob(File.join(Storage.root_dir, '{app,config,lib}', '**', '*.{rb,erb,haml,slim,rhtml}')) +
+        Dir.glob(File.join(Storage.root_dir, '{public,app/assets}', 'javascripts', '**', '*.{js,coffee}'))
     end
 
     def self.extract_activerecords
@@ -43,14 +48,14 @@ module RailsI18nterface
         while matchdata != nil
           model = matchdata[1]
           files["activerecord.models.#{model}"] = ['db/schema.rb']
-          files.merge!(self.extract_attributes(model,matchdata[2]))
+          files.merge!(self.extract_attributes(model, matchdata[2]))
           matchdata = regex.match(matchdata.post_match)
         end
       end
       files
     end
 
-    def self.extract_attributes(model,txt)
+    def self.extract_attributes(model, txt)
       files = {}
       regex = Regexp.new('\s*t\.[-_0-9a-z]*\s*"([^"]*?)"')
       matchdata = regex.match(txt)

data/lib/rails-i18nterface/storage.rb

@@ -11,7 +11,7 @@ module RailsI18nterface
     end
 
     def self.file_paths(locale)
-      Dir.glob(File.join(root_dir, "config", "locales", "**","#{locale}.yml"))
+      Dir.glob(File.join(root_dir, 'config', 'locales', '**', "#{locale}.yml"))
     end
 
     def self.root_dir
@@ -21,11 +21,11 @@ module RailsI18nterface
     private
 
     def keys
-      {locale => I18n.backend.send(:translations)[locale]}
+      { locale => I18n.backend.send(:translations)[locale] }
     end
 
     def file_path
-      File.join(self.class.root_dir, "config", "locales", "#{locale}.yml")
+      File.join(self.class.root_dir, 'config', 'locales', "#{locale}.yml")
     end
   end
 end