translation_center 1.2.1 → 1.3.0

data/README.md

@@ -68,6 +68,11 @@ And run the migrations
 rake db:migrate
 ```
 
+And then run this rake to get all current translations to the db
+```ruby
+rake translation_center:synch
+```
+
 In your User model or any other model that should acts as a translator add the following line:
 
 ```ruby

data/app/views/translation_center/center/_activity.html.haml

@@ -31,7 +31,7 @@
                 %li
                   = format_change(change, value)
           %td
-            = time_ago_in_words change.created_at
+            = distance_of_time_in_words_to_now change.created_at
             = t('.ago')
 
   = will_paginate translations_changes

data/app/views/translation_center/translation_keys/_show_keys.html.haml

@@ -8,7 +8,7 @@
 
   - if translation_admin?
     %div
-      = link_to '×', translation_key_path(translation_key), method: :delete, data: { confirm: t('actions.are_you_sure', :default => 'Are you sure?') }, class: 'close', remote: true
+      = link_to '×', translation_key_path(translation_key), method: :delete, data: { confirm: t('translation_center.actions.are_you_sure', :default => 'Are you sure?') }, class: 'close', remote: true
 
   %a{ href: "##{translation_key.id}", 'data-toggle' => "tab"}
     %p
@@ -17,7 +17,7 @@
           = t(translation_key.name)
       %span
         %em.created_time
-          = t('.created_at')
+          = t('.created_on')
           = format_date(translation_key.created_at)
     
     %small

data/app/views/translation_center/translation_keys/show.html.haml

@@ -3,6 +3,6 @@
 %h1
   = @translation_key.name
   - if translation_admin?
-    = link_to t('.destroy'), @translation_key, method: :delete, data: { confirm: t('actions.are_you_sure', :default => 'Are you sure?') }, class: 'btn btn-danger'
+    = link_to t('.destroy'), @translation_key, method: :delete, data: { confirm: t('translation_center.actions.are_you_sure', :default => 'Are you sure?') }, class: 'btn btn-danger'
 
 = render 'translation_center/translation_keys/show', translation_key: @translation_key, index: 0

data/app/views/translation_center/translations/_show.html.haml

@@ -5,7 +5,7 @@
       = translation.value
     
     - if translation_admin?
-      = link_to '×', translation_path(translation), method: :delete, data: { confirm: t('actions.are_you_sure', :default => 'Are you sure?') }, class: 'close', remote: true
+      = link_to '×', translation_path(translation), method: :delete, data: { confirm: t('translation_center.actions.are_you_sure', :default => 'Are you sure?') }, class: 'close', remote: true
     %br
     %small.pull-right
       %em

data/lib/tasks/translation_center.rake

@@ -10,4 +10,10 @@ namespace :translation_center do
     TranslationCenter.db2yaml(args[:locale])
   end
 
+  desc "Calls yaml2db then db2yaml"
+  task :synch, [:locale ] => :environment do |t, args|
+    TranslationCenter.yaml2db(args[:locale])
+    TranslationCenter.db2yaml(args[:locale])
+  end
+
 end

data/lib/translation_center/locale/en.yml

@@ -1,5 +1,7 @@
 en:
-    translation_center: 
+    translation_center:
+        actions:
+            are_you_sure: "Are you sure ?"
         back_to_app: "Back To App"
         categories: 
             category: 
@@ -14,7 +16,7 @@ en:
                 untranslated: Untranslated
         center: 
             activity: 
-                ago: Ago
+                ago: ago
                 changes: Changes
                 key: Key
                 locale: Locale
@@ -46,7 +48,7 @@ en:
                 back_to_category: "Back To Category"
                 destroy: Destroy
             show_keys: 
-                created_at: "created at"
+                created_on: "created on"
                 translated: Translated
             translation_keys: 
                 no_translation_keys: "No Translation Keys"
@@ -59,7 +61,7 @@ en:
                 votes: Votes
             show: 
                 by: by
-                on_date: "on date"
+                on_date: "on"
                 vote: Vote
                 votes: Votes
                 you: You

data/lib/translation_center/translation_helpers.rb

@@ -39,23 +39,43 @@ module TranslationCenter
     end
   end
 
+  # make sure the complete key is build using the options such as scope and count
+  def prepare_key(key, options)
+    complete_key  = key
+
+    # if a scope is passed in options then build the full key
+    complete_key = options[:scope].present? ? "#{options[:scope].to_s}.#{complete_key}" : complete_key
+
+    # add the correct count suffix
+    if options[:count].present? && options[:count] == 1
+      complete_key = "#{complete_key}.one"
+    elsif options[:count].present? && options[:count] != 1
+      complete_key = "#{complete_key}.other"
+    end
+    complete_key
+  end
+
   def translate_with_adding(locale, key, options = {})
     # handle calling translation with a blank key
     # or translation center tables don't exist
     return translate_without_adding(locale, key, options) if key.blank? || !ActiveRecord::Base.connection.table_exists?('translation_center_translation_keys')
 
+    complete_key = prepare_key(key, options) # prepare complete key
+
     # add the new key or update it
-    translation_key = TranslationCenter::TranslationKey.find_or_create_by_name(key)
+    translation_key = TranslationCenter::TranslationKey.find_or_create_by_name(complete_key)
     #  UNCOMMENT THIS LATER TO SET LAST ACCESSED AT
     # translation_key.update_attribute(:last_accessed, Time.now)
 
-    # save the default value (Which is the titleized key name as the translation)
-    translation_key.create_default_translation if translation_key.translations.in(:en).empty? && TranslationCenter::CONFIG['save_default_translation']
+    # save the default value (Which is the titleized key name as the translation) if the option is enabled and no translation exists for that key in the db
+    translation_key.create_default_translation if TranslationCenter::CONFIG['save_default_translation'] && translation_key.translations.in(:en).empty?
 
     # if i18n_source is set to db and not overriden by options then fetch from db
     if TranslationCenter::CONFIG['i18n_source']  == 'db' && options.delete(:yaml).blank?
       val = translation_key.accepted_translation_in(locale).try(:value) || options[:default]
-      throw(:exception, I18n::MissingTranslation.new(locale, key, options)) unless val
+      # replace variables in a translation with passed values
+      options.each_pair{ |key, value| val.gsub!("%{#{key.to_s}}", value.to_s) }
+      throw(:exception, I18n::MissingTranslation.new(locale, complete_key, options)) unless val
       wrap_span(val, translation_key)
     else
       # just return the normal I18n translation

data/lib/translation_center/translations_transfer.rb

@@ -1,33 +1,31 @@
 module TranslationCenter
 
-  
-
-  def self.yaml2db(locale)
-
-    def self.collect_keys(scope, translations)
-    full_keys = []
-    translations.to_a.each do |key, translations|
-      new_scope = scope.dup << key
-      if translations.is_a?(Hash)
-        full_keys += collect_keys(new_scope, translations)
-      else
-        full_keys << new_scope.join('.')
-      end
-    end
-    return full_keys
+  # needed for interpolated translations in I18n
+  def self.get_translation_from_hash(key, hash)
+    path = key.split('.')
+    last_step = hash
+    path.each do |step|
+      break if last_step.blank? || !last_step.is_a?(Hash)
+      last_step = last_step[step.to_s.to_sym]
     end
+    last_step
+  end
 
-    # needed for interpolated translations in I18n
-    def self.get_translation_from_hash(key, hash)
-      path = key.split('.')
-      last_step = hash
-      path.each do |step|
-        break if last_step.blank? || !last_step.is_a?(Hash)
-        last_step = last_step[step.to_s.to_sym]
+  def self.collect_keys(scope, translations)
+      full_keys = []
+      translations.to_a.each do |key, translations|
+        new_scope = scope.dup << key
+        if translations.is_a?(Hash)
+          full_keys += collect_keys(new_scope, translations)
+        else
+          full_keys << new_scope.join('.')
+        end
       end
-      last_step
+      return full_keys
     end
 
+  def self.yaml2db(locale)
+
     # prepare translator by creating the translator if he doesn't exist
     translator = TranslationCenter.prepare_translator
 

data/lib/translation_center/version.rb

@@ -1,3 +1,3 @@
 module TranslationCenter
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/test/dummy/app/views/articles/index.html.haml

@@ -2,8 +2,8 @@
 
 %table
   %tr
-    %th Title
-    %th Content
+    %th= t('.title')
+    %th= t('.content')
     %th
     %th
     %th

data/test/dummy/app/views/articles/show.html.haml

@@ -7,6 +7,8 @@
   %b Content:
   = @article.content
 
+  = time_ago_in_words @article.created_at
+
 = link_to 'Edit', edit_article_path(@article)
 \|
 = link_to 'Back', articles_path

data/test/dummy/config/locales/de.yml

@@ -0,0 +1,2 @@
+--- 
+de: {}

data/test/dummy/config/locales/en.yml

@@ -1 +1,339 @@
+--- 
 en: 
+  activerecord: 
+    attributes: Attributes
+    errors: 
+      messages: 
+        record_invalid: "Validation failed: %{errors}"
+        taken: "has already been taken"
+    models: Models
+  date: 
+    abbr_day_names: 
+      - Sun
+      - Mon
+      - Tue
+      - Wed
+      - Thu
+      - Fri
+      - Sat
+    abbr_month_names: 
+      - ~
+      - Jan
+      - Feb
+      - Mar
+      - Apr
+      - May
+      - Jun
+      - Jul
+      - Aug
+      - Sep
+      - Oct
+      - Nov
+      - Dec
+    day_names: 
+      - Sunday
+      - Monday
+      - Tuesday
+      - Wednesday
+      - Thursday
+      - Friday
+      - Saturday
+    formats: 
+      default: "%Y-%m-%d"
+      long: "%B %d, %Y"
+      short: "%b %d"
+    month_names: 
+      - ~
+      - January
+      - February
+      - March
+      - April
+      - May
+      - June
+      - July
+      - August
+      - September
+      - October
+      - November
+      - December
+    order: 
+      - !ruby/symbol year
+      - !ruby/symbol month
+      - !ruby/symbol day
+  datetime: 
+    distance_in_words: 
+      about_x_hours: 
+        one: "about 1 hour"
+        other: "about %{count} hours"
+      about_x_months: 
+        one: "about 1 month"
+        other: "about %{count} months"
+      about_x_years: 
+        one: "about 1 year"
+        other: "about %{count} years"
+      almost_x_years: 
+        one: "almost 1 year"
+        other: "almost %{count} years"
+      half_a_minute: "half a minute"
+      less_than_x_minutes: 
+        one: "less than a minute"
+        other: "less than %{count} minutes"
+      less_than_x_seconds: 
+        one: "less than 1 second"
+        other: "less than %{count} seconds"
+      over_x_years: 
+        one: "over 1 year"
+        other: "over %{count} years"
+      x_days: 
+        one: "1 day"
+        other: "%{count} days"
+      x_minutes: 
+        one: "1 minute"
+        other: "%{count} minutes"
+      x_months: 
+        one: "1 month"
+        other: "%{count} months"
+      x_seconds: 
+        one: "1 second"
+        other: "%{count} seconds"
+    prompts: 
+      day: Day
+      hour: Hour
+      minute: Minute
+      month: Month
+      second: Seconds
+      year: Year
+  devise: 
+    confirmations: 
+      confirmed: "Your account was successfully confirmed. You are now signed in."
+      send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions about how to confirm your account in a few minutes."
+    failure: 
+      already_authenticated: "You are already signed in."
+      inactive: "Your account was not activated yet."
+      invalid: "Invalid email or password."
+      invalid_token: "Invalid authentication token."
+      locked: "Your account is locked."
+      not_found_in_database: "Invalid email or password."
+      timeout: "Your session expired, please sign in again to continue."
+      unauthenticated: "You need to sign in or sign up before continuing."
+      unconfirmed: "You have to confirm your account before continuing."
+    mailer: 
+      confirmation_instructions: 
+        subject: "Confirmation instructions"
+      reset_password_instructions: 
+        subject: "Reset password instructions"
+      unlock_instructions: 
+        subject: "Unlock Instructions"
+    omniauth_callbacks: 
+      failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
+      success: "Successfully authenticated from %{kind} account."
+    passwords: 
+      no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+      send_instructions: "You will receive an email with instructions about how to reset your password in a few minutes."
+      send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes."
+      updated: "Your password was changed successfully. You are now signed in."
+      updated_not_active: "Your password was changed successfully."
+    registrations: 
+      destroyed: "Bye! Your account was successfully cancelled. We hope to see you again soon."
+      signed_up: "Welcome! You have signed up successfully."
+      signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated."
+      signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
+      signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."
+      update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and click on the confirm link to finalize confirming your new email address."
+      updated: "You updated your account successfully."
+    sessions: 
+      signed_in: "Signed in successfully."
+      signed_out: "Signed out successfully."
+    unlocks: 
+      send_instructions: "You will receive an email with instructions about how to unlock your account in a few minutes."
+      send_paranoid_instructions: "If your account exists, you will receive an email with instructions about how to unlock it in a few minutes."
+      unlocked: "Your account has been unlocked successfully. Please sign in to continue."
+  errors: 
+    format: "%{attribute} %{message}"
+    messages: 
+      accepted: "must be accepted"
+      already_confirmed: "was already confirmed, please try signing in"
+      blank: "can't be blank"
+      confirmation: "doesn't match confirmation"
+      confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one"
+      empty: "can't be empty"
+      equal_to: "must be equal to %{count}"
+      even: "must be even"
+      exclusion: "is reserved"
+      expired: "has expired, please request a new one"
+      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"
+      not_found: "not found"
+      not_locked: "was not locked"
+      not_saved: 
+        one: "1 error prohibited this %{resource} from being saved:"
+        other: "%{count} errors prohibited this %{resource} from being saved:"
+      odd: "must be odd"
+      too_long: "is too long (maximum is %{count} characters)"
+      too_short: "is too short (minimum is %{count} characters)"
+      wrong_length: "is the wrong length (should be %{count} characters)"
+  helpers: 
+    select: 
+      prompt: "Please select"
+    submit: 
+      create: "Create %{model}"
+      submit: "Save %{model}"
+      update: "Update %{model}"
+  meta_search: 
+    or: or
+    predicates: 
+      contains: "%{attribute} contains"
+      does_not_contain: "%{attribute} doesn't contain"
+      does_not_end_with: "%{attribute} doesn't end with"
+      does_not_equal: "%{attribute} doesn't equal"
+      does_not_start_with: "%{attribute} doesn't start with"
+      ends_with: "%{attribute} ends with"
+      equals: "%{attribute} equals"
+      greater_than: "%{attribute} greater than"
+      greater_than_or_equal_to: "%{attribute} greater than or equal to"
+      in: "%{attribute} is one of"
+      is_blank: "%{attribute} is blank"
+      is_false: "%{attribute} is false"
+      is_not_null: "%{attribute} isn't null"
+      is_null: "%{attribute} is null"
+      is_present: "%{attribute} is present"
+      is_true: "%{attribute} is true"
+      less_than: "%{attribute} less than"
+      less_than_or_equal_to: "%{attribute} less than or equal to"
+      not_in: "%{attribute} isn't one of"
+      starts_with: "%{attribute} starts with"
+  number: 
+    currency: 
+      format: 
+        delimiter: ","
+        format: "%u%n"
+        precision: 2
+        separator: "."
+        unit: $
+    format: 
+      delimiter: ","
+      precision: 3
+      separator: "."
+    human: 
+      decimal_units: 
+        format: "%n %u"
+        units: 
+          billion: Billion
+          million: Million
+          quadrillion: Quadrillion
+          thousand: Thousand
+          trillion: Trillion
+      format: 
+        precision: 3
+        significant: true
+        strip_insignificant_zeros: true
+      storage_units: 
+        format: "%n %u"
+        units: 
+          byte: 
+            one: Byte
+            other: Bytes
+          gb: GB
+          kb: KB
+          mb: MB
+          tb: TB
+  support: 
+    array: 
+      last_word_connector: ", and "
+      two_words_connector: " and "
+      words_connector: ", "
+  time: 
+    am: am
+    formats: 
+      default: "%a, %d %b %Y %H:%M:%S %z"
+      long: "%B %d, %Y %H:%M"
+      short: "%d %b %H:%M"
+    pm: pm
+  translation_center: 
+    actions: 
+      are_you_sure: "Are you sure ?"
+    back_to_app: "Back To App"
+    categories: 
+      category: 
+        complete: Complete
+        keys: Keys
+      index: 
+        categories: Categories
+      show: 
+        all: All
+        pending: Pending
+        translated: Translated
+        untranslated: Untranslated
+    center: 
+      activity: 
+        ago: ago
+        changes: Changes
+        key: Key
+        locale: Locale
+        time: Time
+        user: User
+      dashboard: 
+        activity: Activity
+        all: All
+        controls: Controls
+        dashboard: Dashboard
+        language: Language
+        pending: Pending
+        progress: Progress
+        reset: Reset
+        search: Search
+        select_locale: "Select Locale"
+        these_actions_will_affect_existing_data: "These actions will affect existing data"
+        translated: Translated
+        untranslated: Untranslated
+    dashboard: Dashboard
+    search_keys: "Search Keys"
+    translate_to: "Translate To"
+    translation_center: "Translation Center"
+    translation_keys: 
+      destroyed_successfully: "Destroyed Successfully"
+      show: 
+        add_edit_translation: "Add/Edit Translation"
+        back_to_category: "Back To Category"
+        destroy: Destroy
+        translations: Translations
+      show_keys: 
+        created_on: "created on"
+        translated: Translated
+      translation_keys: 
+        no_translation_keys: "No Translation Keys"
+    translations: 
+      accept_translation: 
+        unaccept: Unaccept
+      index: 
+        date: Date
+        sort_by: "Sort by"
+        votes: Votes
+      show: 
+        by: by
+        on_date: "on"
+        vote: Vote
+        votes: Votes
+        you: You
+  will_paginate: 
+    next_label: "Next →"
+    page_entries_info: 
+      multi_page: "Displaying %{model} %{from} - %{to} of %{count} in total"
+      multi_page_html: "Displaying %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> of <b>%{count}</b> in total"
+      single_page: 
+        one: "Displaying 1 %{model}"
+        other: "Displaying all %{count} %{model}"
+        zero: "No %{model} found"
+      single_page_html: 
+        one: "Displaying <b>1</b> %{model}"
+        other: "Displaying <b>all&nbsp;%{count}</b> %{model}"
+        zero: "No %{model} found"
+    page_gap: "&hellip;"
+    previous_label: "&#8592; Previous"

data/test/dummy/config/translation_center.yml

@@ -22,7 +22,7 @@ development:
   # "missing" to inspect only untranslated keys
   # "all" to enable inspector for translated and untranslated keys
   # "off" to turn off keys inspector
-  inspector: 'missing' # default missing
+  inspector: 'all' # default missing
 
   # I18n.translate source
   i18n_source: 'db' # can be db or yaml; default is yaml