awesome_translations 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2b2ed6fcd8e5b42d71a00434b0565986624523a
-  data.tar.gz: 85bc149c65a980f40ec128b98b611fe508d3076f
+  metadata.gz: 4fea063f52c4b5c59c136414a116a24b4735db9f
+  data.tar.gz: 7464db6a00df91622aec0160dc371e5bd1c99f6d
 SHA512:
-  metadata.gz: 18ffa5b938502e75a4782e700616520b5dcc91f6860c7faa2bf42c23e7a006f5b00fc0ee5f8ceb92eb563649bda52350dc3ab673d21fd097b57b1ee9fe33ebda
-  data.tar.gz: 7e8e8191fd6222c66ef7ec2d9afcd4d42ee35d122cf2e75ffc270ab3cdf3f6d94027416cc433ac6b3030d2bcddf116bab4374a805c4ba0f2d1935827c6baf6df
+  metadata.gz: a438f09fd630e7ca156f4a9311df7479f53f5d9d3af84b90cd4b95b8bd2b4df4c7556c8a366b8d83d803f1959a29831e64753264e7d1b29e805010e443e49112
+  data.tar.gz: 3d0d0a750867502382977adaf99950ee5d5524ab9f9037604dc617e33ddc477dbcf71bd0c16ee3605f5d36e54d71e0c7316a66105b97bf8cd4ac05e6701bb625

data/app/controllers/awesome_translations/groups_controller.rb

@@ -11,9 +11,15 @@ class AwesomeTranslations::GroupsController < AwesomeTranslations::ApplicationCo
 
   def update
     @group.translations.each do |translation|
-      next unless params[:t].key?(translation.key)
+      if translation.array_translation?
+        next unless params[:t].key?(translation.array_key)
+        values = params[:t][translation.array_key][translation.array_no.to_s]
+        next unless values
+      else
+        next unless params[:t].key?(translation.key)
+        values = params[:t][translation.key]
+      end
 
-      values = params[:t][translation.key]
       values.each do |locale, value|
         translated_value = translation.translated_value_for_locale(locale)
         translated_value.value = value
@@ -22,7 +28,6 @@ class AwesomeTranslations::GroupsController < AwesomeTranslations::ApplicationCo
     end
 
     I18n.backend.reload!
-
     redirect_to handler_group_path(@handler, @group)
   end
 

data/app/models/awesome_translations/translated_value.rb

@@ -11,6 +11,30 @@ class AwesomeTranslations::TranslatedValue
     "<AwesomeTranslations::TranslatedValue file=\"#{@file}\" locale=\"#{@locale}\" key=\"#{@key}\" value=\"#{@value}\">"
   end
 
+  def array_translation?
+    if @key.match(/\[(\d+)\]\Z/)
+      return true
+    else
+      return false
+    end
+  end
+
+  def array_key
+    if match = @key.match(/\A(.+)\[(\d+)\]\Z/)
+      return match[1]
+    end
+
+    return nil
+  end
+
+  def array_no
+    if match = @key.match(/\A(.+)\[(\d+)\]\Z/)
+      return match[2].to_i
+    end
+
+    return nil
+  end
+
   alias inspect to_s
 
   def save!
@@ -33,7 +57,14 @@ class AwesomeTranslations::TranslatedValue
         if @value.empty?
           current.delete(key_part)
         else
-          current[key_part] = value
+          if array_translation?
+            match = key_part.match(/\A(.+)\[(\d+)\]\Z/)
+            current_array = current[match[1]] || []
+            current_array[array_no] = value
+            current[match[1]] = current_array
+          else
+            current[key_part] = value
+          end
         end
       else
         current[key_part] ||= {}

data/app/models/awesome_translations/translation.rb

@@ -1,15 +1,45 @@
 class AwesomeTranslations::Translation
-  attr_reader :dir, :key, :file_path, :line_no
+  attr_reader :default, :dir, :key, :file_path, :line_no
 
   def initialize(data)
     @data = data
-    @dir, @key, @file_path, @full_path, @line_no = data[:dir], data[:key], data[:file_path], data[:full_path], data[:line_no]
+    @dir, @file_path, @full_path, @line_no = data[:dir], data[:file_path], data[:full_path], data[:line_no]
+    @key, @key_show = data[:key], data[:key_show]
+    @default = data[:default]
 
     raise "Dir wasn't valid: '#{@dir}'." unless @dir.present?
   end
 
   def last_key
-    key.to_s.split(".").last
+    key.to_s.split('.').last
+  end
+
+  def key_show_with_fallback
+    @key_show.presence || last_key
+  end
+
+  def array_translation?
+    if @key.match(/\[(\d+)\]\Z/)
+      return true
+    else
+      return false
+    end
+  end
+
+  def array_key
+    if match = @key.match(/\A(.+)\[(\d+)\]\Z/)
+      return match[1]
+    end
+
+    return nil
+  end
+
+  def array_no
+    if match = @key.match(/\A(.+)\[(\d+)\]\Z/)
+      return match[2].to_i
+    end
+
+    return nil
   end
 
   def id
@@ -64,14 +94,23 @@ class AwesomeTranslations::Translation
   end
 
   def value_for?(locale)
-    I18n.with_locale(locale) { return I18n.exists?(@key) }
+    if array_translation?
+      I18n.with_locale(locale) { return I18n.exists?(array_key) && I18n.t(array_key)[array_no].present? }
+    else
+      I18n.with_locale(locale) { return I18n.exists?(@key) }
+    end
   end
 
   def value(args = {})
     locale = (args[:locale] || I18n.locale || I18n.default_locale).to_sym
 
     return nil unless value_for?(locale)
-    I18n.with_locale(locale) { return I18n.t(@key) }
+
+    if array_translation?
+      I18n.with_locale(locale) { return I18n.t(array_key)[array_no] }
+    else
+      I18n.with_locale(locale) { return I18n.t(@key) }
+    end
   end
 
   def file_line_content?
@@ -96,7 +135,7 @@ class AwesomeTranslations::Translation
   end
 
   def to_s
-    "<AwesomeTranslations::Translation key=\"#{@key}\" dir=\"#{@dir}\">"
+    "<AwesomeTranslations::Translation key=\"#{@key}\" dir=\"#{@dir}\" array_translation?=\"#{array_translation?}\" array_key=\"#{array_key}\" array_no=\"#{array_no}\">"
   end
 
   def inspect

data/app/views/awesome_translations/groups/show.html.haml

@@ -10,16 +10,19 @@
       - @translations.each do |translation|
         %tr
           %td.translation-key
-            .translation-key-text= translation.last_key
+            .translation-key-text= translation.key_show_with_fallback
 
           - I18n.available_locales.each do |locale|
             %td.translation= text_field "t", "#{translation.key}[#{locale}]", class: "translation-input", lang: locale, value: translation.value(locale: locale)
 
-        - if translation.file_line_content?
+        - if translation.file_line_content? || translation.default.present?
           %tr.line-content-row
             %td.line-content{colspan: 1 + I18n.available_locales.length}
               .container
-                %pre= translation.file_line_content
+                - if translation.file_line_content?
+                  %pre= translation.file_line_content
+                - elsif translation.default.present?
+                  = "Default: #{translation.default}"
           %tr
             %td.line-spacer{colspan: 1 + I18n.available_locales.length}
       - if @translations.empty?

data/lib/awesome_translations/handlers/rails_handler.rb

@@ -0,0 +1,208 @@
+class AwesomeTranslations::Handlers::RailsHandler < AwesomeTranslations::Handlers::BaseHandler
+  def groups
+    ArrayEnumerator.new do |yielder|
+      groups = ['date_time', 'errors', 'helpers', 'numbers', 'support']
+
+      groups.each do |group|
+        yielder << AwesomeTranslations::Group.new(
+          id: group,
+          handler: self,
+          data: {
+            name: group.humanize
+          }
+        )
+      end
+    end
+  end
+
+  def translations_for_group(group)
+    ArrayEnumerator.new do |yielder|
+      dir = Rails.root.join('config', 'locales', 'awesome_translations', group.id).to_s
+      __send__("translations_for_#{group.id}", dir, group, yielder)
+    end
+  end
+
+private
+
+  def translations_for_errors(dir, group, yielder)
+    add_translations_for_hash(dir, group, yielder, translations: {
+      errors: {
+        format: '%{attribute} %{message}',
+        messages: {
+          accepted: 'must be accepted',
+          blank: "can't be blank",
+          confirmation: "doesn't match %{attribute}",
+          empty: "can't be empty",
+          equal_to: 'must be equal to %{count}',
+          even: 'must be even',
+          exclusion: 'is reserved',
+          greater_than: 'must be greater than %{count}',
+          greater_than_or_equal_to: 'must be greater than or equal to %{count}',
+          inclusion: 'is not included in the list',
+          invalid: 'is invalid',
+          less_than: 'must be less than %{count}',
+          less_than_or_equal_to: 'must be less than or equal to %{count}',
+          not_a_number: 'is not a number',
+          not_an_integer: 'must be an integer',
+          odd: 'must be odd',
+          record_invalid: 'Validation failed: %{errors}',
+          taken: 'has already been taken',
+          too_long: {
+            one: 'is too long (maximum is 1 character)',
+            other: 'is too long (maximum is %{count} characters)'
+          },
+          too_short: {
+            one: 'is too short (minimum is 1 character)',
+            other: 'is too short (minimum is %{count} characters)'
+          },
+          wrong_length: {
+            one: 'is the wrong length (should be 1 character)',
+            other: 'is the wrong length (should be %{count} characters)'
+          }
+        },
+        template: {
+          body: 'There were problems with the following fields:',
+          header: {
+            one: '1 error prohibited this %{model} from being saved',
+            other: "%{count} errors prohibited this %{model} from being saved"
+          }
+        }
+      }
+    })
+  end
+
+  def translations_for_date_time(dir, group, yielder)
+    add_translations_for_hash(dir, group, yielder, translations: {
+      date: {
+        formats: {
+          default: "%Y-%m-%d",
+          short: "%b %d",
+          long: "%B %d, %Y"
+        },
+        day_names: [0, 1, 2, 3, 4, 5, 6],
+        abbr_day_names: [0, 1, 2, 3, 4, 5, 6],
+        month_names: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
+        abbr_month_names: [0 , 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
+        order: [0, 1, 2]
+      },
+      time: {
+        formats: {
+          default: "%a, %d %b %Y %H:%M:%S %z",
+          short: "%d %b %H:%M",
+          long: "%B %d, %Y %H:%M"
+        },
+        am: "am",
+        pm: "pm"
+      }
+    })
+  end
+
+  def translations_for_helpers(dir, group, yielder)
+    add_translations_for_hash(dir, group, yielder, translations: {
+      helpers: {
+        select: {
+          prompt: 'Please select'
+        },
+        submit: {
+          create: 'Create %{model}',
+          submit: 'Save %{model}',
+          update: 'Update %{model}'
+        }
+      }
+    })
+  end
+
+  def translations_for_support(dir, group, yielder)
+    add_translations_for_hash(dir, group, yielder, translations: {
+      array: {
+        last_word_connector: ' and ',
+        two_words_connector: ' and ',
+        word_connector: ', '
+      }
+    })
+  end
+
+  def translations_for_numbers(dir, group, yielder)
+    add_translations_for_hash(dir, group, yielder, translations: {
+      number: {
+        currency: {
+          format: {
+            delimiter: ",",
+            format: "%n %u",
+            separator: ".",
+            unit: "$"
+          }
+        },
+        format: {
+          delimiter: ",",
+          separator: "."
+        },
+        human: {
+          decimal_units: {
+            format: "%n %u",
+            units: {
+              billion: "Billion",
+              million: "Million",
+              quadrillion: "Quadrillion",
+              thousand: "Thousand",
+              trillion: "Trillion",
+              unit: ""
+            }
+          },
+          format: {
+            delimiter: ""
+          },
+          storage_units: {
+            format: "%n %u",
+            units: {
+              byte: {
+                one: "Byte",
+                other: "Bytes"
+              },
+              gb: "GB",
+              kb: "KB",
+              mb: "MB",
+              tb: "TB"
+            }
+          }
+        },
+        percentage: {
+          format: {
+            delimiter: ""
+          }
+        }
+      }
+    })
+  end
+
+  def add_translations_for_hash(dir, group, yielder, hash)
+    translations_for_hash_recursive(dir, hash[:translations], yielder, [])
+  end
+
+  def translations_for_hash_recursive(dir, hash, yielder, current_keys)
+    hash.each do |key, value|
+      current_keys << key
+
+      if value.is_a?(Hash)
+        translations_for_hash_recursive(dir, value, yielder, current_keys)
+      elsif value.is_a?(Array)
+        value.each_index do |index|
+          yielder << AwesomeTranslations::Translation.new(
+            dir: dir,
+            key: "#{current_keys.join('.')}[#{index}]",
+            key_show: "#{current_keys.join('.')}[#{index}]"
+          )
+        end
+      else
+        yielder << AwesomeTranslations::Translation.new(
+          dir: dir,
+          key: current_keys.join('.'),
+          key_show: current_keys.join('.'),
+          default: value
+        )
+      end
+
+      current_keys.pop
+    end
+  end
+end

data/lib/awesome_translations/version.rb

@@ -1,3 +1,3 @@
 module AwesomeTranslations
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 end

data/spec/controllers/groups_controller_spec.rb

@@ -4,9 +4,14 @@ describe AwesomeTranslations::GroupsController do
   let(:model_locales_path) { "#{Rails.root}/config/locales/awesome_translations/models" }
   let(:user_yml_path) { "#{model_locales_path}/user/da.yml" }
   let(:role_yml_path) { "#{model_locales_path}/role/da.yml" }
+  let(:date_time_path) { Rails.root.join('config', 'locales', 'awesome_translations', 'date_time', 'da.yml') }
 
   before do
     FileUtils.rm_f(model_locales_path) if File.exist?(model_locales_path)
+    FileUtils.rm_f(date_time_path) if File.exists?(date_time_path)
+
+    I18n.load_path.delete(date_time_path.to_s)
+    I18n.load_path.delete(model_locales_path)
   end
 
   render_views
@@ -30,5 +35,23 @@ describe AwesomeTranslations::GroupsController do
 
       I18n.load_path.should include role_yml_path
     end
+
+    it 'handles array translations' do
+      put :update, handler_id: 'rails_handler', id: 'date_time', use_route: 'awesome_translations', t: {
+        'date.day_names' => {
+          '1' => {
+            'da' => 'Mandag'
+          },
+          '4' => {
+            'da' => 'Torsdag'
+          }
+        }
+      }
+
+      translations = YAML.load_file(date_time_path)
+
+      expect(translations['da']['date']['day_names'][1]).to eq 'Mandag'
+      expect(translations['da']['date']['day_names'][4]).to eq 'Torsdag'
+    end
   end
 end

data/spec/dummy/config/locales/awesome_translations/date_time/da.yml

@@ -0,0 +1,9 @@
+---
+da:
+  date:
+    day_names:
+    - 
+    - Mandag
+    - 
+    - 
+    - Torsdag