air18n 0.1.14 → 0.1.15

data/lib/air18n/phrase_translation.rb

@@ -132,7 +132,7 @@ module Air18n
     def self.translator_activity_data_new user_id=0, opts={}
       user_criterion = user_id > 0 ? "AND pt.user_id=#{user_id}" : "AND NOT pt.user_id=0"
       since_criterion = "AND pt.created_at >= '#{opts[:since].to_formatted_s(:db)}}'" if opts[:since]
-      sql = "SELECT year(pt.created_at) year, month(pt.created_at) month, pt.user_id user_id, pt.locale locale, day(pt.created_at) day, p.id phrase_id, pt.source_word_count source_word_count, pt.source_hash source_hash, pt.is_verification FROM phrase_translations pt, phrases p WHERE pt.phrase_id=p.id #{user_criterion} #{since_criterion} GROUP BY year(pt.created_at), month(pt.created_at), pt.user_id, pt.locale, pt.phrase_id, pt.source_hash, pt.is_verification"
+      sql = "SELECT year(pt.created_at) year, month(pt.created_at) month, pt.user_id user_id, pt.locale locale, day(pt.created_at) day, p.id phrase_id, pt.source_word_count source_word_count, pt.key, pt.source_hash source_hash, pt.is_verification FROM phrase_translations pt, phrases p WHERE pt.phrase_id=p.id #{user_criterion} #{since_criterion} GROUP BY year(pt.created_at), month(pt.created_at), pt.user_id, pt.locale, pt.phrase_id, pt.source_hash, pt.is_verification"
       res = self.connection.select_rows(sql)
       phrases_per_user_locale_month_year =
         Hash.new {|h, year| h[year] =
@@ -145,9 +145,9 @@ module Air18n
       } } } } } }
 
       res.each do |row|
-        year, month, user_id, locale, day, phrase_id, source_word_count, source_hash, is_verification = row
+        year, month, user_id, locale, day, phrase_id, source_word_count, key, source_hash, is_verification = row
         is_verification = (is_verification == 1)
-        phrases_per_user_locale_month_year[year][month][user_id][locale][day][is_verification].merge!({source_hash => source_word_count})
+        phrases_per_user_locale_month_year[year][month][user_id][locale][day][is_verification].merge!({[key, source_hash] => source_word_count})
       end
 
       activities = []
@@ -224,9 +224,11 @@ module Air18n
       {}.tap do |activity|
         activity[:num_translations] = phrase_ids_word_counts_by_type[false].size
         activity[:word_count_translations] = phrase_ids_word_counts_by_type[false].values.sum
+        activity[:translated_keys] = phrase_ids_word_counts_by_type[false].keys
 
         activity[:num_verifications] = phrase_ids_word_counts_by_type[true].size
         activity[:word_count_verifications] = phrase_ids_word_counts_by_type[true].values.sum
+        activity[:verified_keys] = phrase_ids_word_counts_by_type[true].keys
       end
     end
 

data/lib/air18n/version.rb

@@ -1,3 +1,3 @@
 module Air18n
-  VERSION = "0.1.14"
+  VERSION = "0.1.15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: air18n
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-24 00:00:00.000000000 Z
+date: 2012-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n