translation_center 1.6.0 → 1.6.1

data/app/models/translation_center/translation_key.rb

@@ -143,6 +143,17 @@ module TranslationCenter
       stats
     end
 
+    def children_translations(locale)
+      TranslationKey.where('name LIKE ?', "#{self.name}%").inject({}) do |translations, child|
+        translations[child.name.to_sym] = child.accepted_translation_in(locale).try(:value)
+        translations
+      end
+    end
+
+    def has_children?
+      TranslationKey.where('name LIKE ?', "#{self.name}%").count > 1
+    end
+
     # adds a translation key with its translation to a translation yaml hash
     # send the hash and the language as parameters
     def add_to_hash(all_translations, lang)

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

@@ -23,7 +23,7 @@
     .votes_count.badge.badge-success.pull-right
       %span.count{ 'data-translation-id' => translation.id }
         = translation.votes.count
-      = t('.votes')
+      = t('.votings')
     %a.pull-right{href: '#'}
       - voted = current_user.voted_on?(translation)
       %span.badge.pull-left.translations_vote{ class: "#{voted ? 'badge-success' : ''}", 'data-translation-id' => translation.id,  voted: voted.to_s}

data/lib/translation_center/locale/en.yml

@@ -58,10 +58,10 @@ en:
             index: 
                 date: Date
                 sort_by: "Sort by"
-                votes: Votes
+                votings: Votes
             show: 
                 by: by
                 on_date: "on"
                 vote: Vote
-                votes: Votes
+                votings: Votes
                 you: You

data/lib/translation_center/translation_helpers.rb

@@ -69,7 +69,13 @@ module TranslationCenter
       val = translation_key.accepted_translation_in(locale).try(:value) || options[:default]
       # replace variables in a translation with passed values
       options.each_pair{ |key, value| val.gsub!("%{#{key.to_s}}", value.to_s) } if val.is_a?(String)
-      throw(:exception, I18n::MissingTranslation.new(locale, complete_key, options)) unless val
+
+      if val.blank? && !translation_key.has_children?
+        throw(:exception, I18n::MissingTranslation.new(locale, complete_key, options))
+      elsif translation_key.has_children?
+        # TODO should use ancestors for keys
+        return translation_key.children_translations(locale)
+      end
       wrap_span(val, translation_key)
     else
       # just return the normal I18n translation

data/lib/translation_center/version.rb

@@ -1,3 +1,3 @@
 module TranslationCenter
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

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

@@ -1,5 +1,7 @@
 %h1 Listing articles
 
+= number_to_currency(10)
+
 %table
   %tr
     %th= t('.title')

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

@@ -1,12 +1,10 @@
 --- 
 en: 
   activerecord: 
-    attributes: Attributes
     errors: 
       messages: 
         record_invalid: "Validation failed: %{errors}"
         taken: "has already been taken"
-    models: Models
   date: 
     abbr_day_names: 
       - Sun
@@ -180,6 +178,10 @@ en:
       too_short: "is too short (minimum is %{count} characters)"
       wrong_length: "is the wrong length (should be %{count} characters)"
   helpers: 
+    button: 
+      create: "Create %{model}"
+      submit: "Save %{model}"
+      update: "Update %{model}"
     select: 
       prompt: "Please select"
     submit: 
@@ -315,25 +317,10 @@ en:
       index: 
         date: Date
         sort_by: "Sort by"
-        votes: Votes
+        votings: Votes
       show: 
         by: by
         on_date: "on"
         vote: Vote
-        votes: Votes
+        votings: 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

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