muck-activities 0.1.19 → 0.1.20

data/README.rdoc

@@ -67,6 +67,11 @@ If you would like to add live updates to the user's activity feed you can do so
   enable_live_activity_updates: true
   live_activity_update_interval: 5
 
+You can also use the 'contribute' helper method to render a richer status update if you have uploader installed and configured:
+  enable_activity_file_uploads: true # Turn on file uploads in the activity feed.  Requires that uploader be installed.
+  enable_activity_image_uploads: true # Turn on image uploads in the activity feed.  Requires that uploader and muck_albums be installed.
+  enable_activity_video_sharing: true # Turn on video sharing in the activity feed.
+  
 Note that this will poll the server every 5 seconds and so will increase server load and bandwidth usage.
 
 == Development

data/VERSION

@@ -1 +1 @@
-0.1.19
+0.1.20

data/app/controllers/muck/activities_controller.rb

@@ -128,9 +128,9 @@ class Muck::ActivitiesController < ApplicationController
 
   protected
   
-  def get_activities_html(activities)
+  def get_activities_html(activities, limited = false)
     render_as_html do
-      render_to_string(:partial => "activities/cached_activities", :locals => {:activities => @activities})
+      render_to_string(:partial => "activities/cached_activities", :locals => {:activities => @activities, :limited => limited})
     end
   end
   

data/app/helpers/muck_activity_helper.rb

@@ -10,6 +10,20 @@ module MuckActivityHelper
     end
   end
   
+  def activity_scripts
+    render( :partial => "activities/activity_scripts")
+    time_scripts(I18n.locale)
+  end
+  
+  # Renders an activity feed using the cache where possible
+  # activities: the activities for the feed
+  # limited: a value passed to each activity template which can result in a smaller amount of data 
+  #          being rendered
+  def cached_activities(activities, limited = false)
+    return '' if activities.blank?
+    render( :partial => "activities/cached_activities", :locals => {:activities => activities, :limited => limited})
+  end
+
   def has_comments_css(activity)
     if activity.has_comments?
       'activity-has-comments'
@@ -19,15 +33,21 @@ module MuckActivityHelper
   end
   
   # Renders an activity with only activities created by activities_object
-  def limited_activity_feed_for(activities_object)
-    activities = activities_object.activities.created_by(activities_object).only_public.find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
-    render :partial => 'activities/activity_feed', :locals => { :activities_object => activities_object, :activities => activities }
+  # activities_object: object to get activities for
+  # limited: a value passed to each activity template which can result in a smaller amount of data 
+  #          being rendered
+  def limited_activity_feed_for(activities_object, limited = false)
+    activities = activities_object.activities.latest.created_by(activities_object).only_public.find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
+    render :partial => 'activities/activity_feed', :locals => { :activities_object => activities_object, :activities => activities, :limited => limited }
   end
   
   # Renders a full activity feed for activities_object
-  def activity_feed_for(activities_object)
+  # activities_object: object to get activities for
+  # limited: a value passed to each activity template which can result in a smaller amount of data 
+  #          being rendered
+  def activity_feed_for(activities_object, limited = false)
     activities = get_activities(activities_object)
-    render :partial => 'activities/activity_feed', :locals => { :activities_object => activities_object, :activities => activities }
+    render :partial => 'activities/activity_feed', :locals => { :activities_object => activities_object, :activities => activities, :limited => limited }
   end
 
   # Renders a status update form for activities_object
@@ -35,6 +55,11 @@ module MuckActivityHelper
     render :partial => 'activities/status_update', :locals => { :activities_object => activities_object }
   end
 
+  # Renders a status update form for activities_object that has photo and file upload as well as video sharing.
+  def contribute(activities_object)
+    render :partial => 'activities/contribute', :locals => { :activities_object => activities_object }
+  end
+  
   # Renders the last status update made by activities_object
   def current_status(activities_object)
     render :partial => 'activities/current_status_wrapper', :locals => { :activities_object => activities_object }
@@ -43,10 +68,10 @@ module MuckActivityHelper
   # Renders a delete button for an activity
   def delete_activity(activity, button_type = :button, button_text = t("muck.activities.clear"))
     render :partial => 'shared/delete', :locals => { :delete_object => activity, 
-                                                         :button_type => button_type,
-                                                         :button_text => button_text,
-                                                         :form_class => 'activity-delete',
-                                                         :delete_path => activity_path(activity, :format => 'js') }
+                                                     :button_type => button_type,
+                                                     :button_text => button_text,
+                                                     :form_class => 'activity-delete',
+                                                     :delete_path => activity_path(activity, :format => 'js') }
   end
 
   # Renders a delete button for a comment inside an activity feed
@@ -85,17 +110,17 @@ module MuckActivityHelper
   
   def get_profile_activities(activities_object)
     if !params[:latest_activity_id].blank?
-      activities_object.activities.filter_by_template(params[:activity_filter]).after(params[:latest_activity_id]).only_public.created_by(activities_object).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
+      activities_object.activities.latest.filter_by_template(params[:activity_filter]).after(params[:latest_activity_id]).only_public.created_by(activities_object).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
     else
-      activities_object.activities.filter_by_template(params[:activity_filter]).only_public.created_by(activities_object).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
+      activities_object.activities.latest.filter_by_template(params[:activity_filter]).only_public.created_by(activities_object).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
     end
   end
   
   def get_activities(activities_object)
     if !params[:latest_activity_id].blank?
-      activities_object.activities.filter_by_template(params[:activity_filter]).after(params[:latest_activity_id]).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
+      activities_object.activities.latest.filter_by_template(params[:activity_filter]).after(params[:latest_activity_id]).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
     else
-      activities_object.activities.filter_by_template(params[:activity_filter]).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
+      activities_object.activities.latest.filter_by_template(params[:activity_filter]).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
     end
   end
 

data/app/views/activities/_activity_feed.html.erb

@@ -1,13 +1,9 @@
 <div id="activity-feed">
   <div id="activity-feed-content">
-    <%= render( :partial => "activities/cached_activities", :locals => {:activities => activities}) %>
+    <%= cached_activities(activities, limited) %>
   </div>
 </div>
 <%= will_paginate activities, :previous_label => t('muck.activities.paging_newer'), :next_label => t('muck.activities.paging_older') -%>
-<% content_for :head do -%>
-  <%= javascript_tag %[var COMMENT_PROMPT = '#{t('muck.activities.write_prompt')}';] %>
-  <%= javascript_tag %[var ADD_COMMENT_MESSAGE = '#{t('muck.activities.adding_comment_message')}';] %>
-<% end -%>
 <% content_for :javascript do -%>
   jQuery(document).ready(function(){
     setup_submit_delete();
@@ -16,4 +12,4 @@
     <% end -%>
   });
 <% end -%>
-<%= javascript_include_tag 'muck_activities' %>
+<%= activity_scripts %>

data/app/views/activities/_activity_scripts.html.erb

@@ -0,0 +1,5 @@
+<% content_for :head do -%>
+  <%= javascript_include_tag 'muck_activities' %>
+  <%= javascript_tag %[var COMMENT_PROMPT = '#{t('muck.activities.write_prompt')}';] %>
+  <%= javascript_tag %[var ADD_COMMENT_MESSAGE = '#{t('muck.activities.adding_comment_message')}';] %>
+<% end -%>

data/app/views/activities/_cached_activities.html.erb

@@ -1,8 +1,7 @@
 <% if !activities.blank? -%>
   <% activities.each do |activity| -%>
-    <% cache ("activities/#{I18n.locale}/#{activity.id}") do -%>
-      <%= render( :partial => "activity_templates/#{activity.partial}", :locals => {:activity => activity}) %>
-      <hr class="space">
+    <% cache ("activities/#{I18n.locale}/#{limited}/#{activity.cache_key}") do -%>
+      <%= render( :partial => "activity_templates/#{activity.partial}", :locals => {:activity => activity, :limited => limited}) %>
     <% end -%>
   <% end -%>
 <% end -%>

data/app/views/activities/_contribute.html.erb

@@ -0,0 +1,22 @@
+<div id="activity-status-control">
+  <div id="status-container" class="status-activity"><%= status_update(@user) %></div>
+  <% if GlobalConfig.enable_activity_image_uploads -%>
+    <div id="photos-container" class="status-activity" style="display:none;">
+      <%= upload_form(@user, true, 'photos', :file_types_description => 'Photos', :file_types => '*.jpg;*.gif;*.png;*.tif;*.jpeg', :transparent => true, :transparent_html => '<a href="#" class="upload-button">' + t('muck.activities.add_photos') + '</a>') %>
+    </div>
+  <% end -%>
+  <% if GlobalConfig.enable_activity_video_sharing -%>
+    <div id="videos-container" class="status-activity" style="display:none;"></div>
+  <% end -%>
+  <% if GlobalConfig.enable_activity_file_uploads -%>
+    <div id="files-container" class="status-activity" style="display:none;">
+      <%= upload_form(@user, false, 'files', :button_image_url => '/images/') %>
+    </div>
+  <% end -%>
+  <ul id="status-menu">
+    <li><a id="status-action" class="status-action" href="#"><%= t('muck.activities.write') %></a></li>
+    <% if GlobalConfig.enable_activity_image_uploads -%><li><a id="photos-action" class="status-action" href="#"><%= t('muck.activities.add_photos') %></a></li><% end -%>
+    <% if GlobalConfig.enable_activity_video_sharing -%><li><a id="videos-action" class="status-action" href="#"><%= t('muck.activities.add_videos') %></a></li><% end -%>
+    <% if GlobalConfig.enable_activity_file_uploads -%><li><a id="files-action" class="status-action" href="#"><%= t('muck.activities.upload_files') %></a></li><% end -%>
+  </ul>
+</div>

data/app/views/activity_templates/_generic.html.erb

@@ -5,7 +5,7 @@
       <%= body %>
     </p>
     <%= delete_activity(activity, :image) %>
-    <span class="activity-time"><%= t("muck.general.time_ago", :time_in_words => time_ago_in_words(activity.created_at)) %></span>
+    <span class="activity-time readable-time"><%= I18n.l(activity.created_at) %></span>
     <% if !activity.has_comments? -%>
       <span><a id="make_comment_<%=activity.dom_id%>" class="make-comment" href="#"><%=t('muck.activities.make_comment')%></a></span>
     <% end -%>

data/db/migrate/20090818204527_add_activity_indexes.rb

@@ -0,0 +1,9 @@
+class AddActivityIndexes < ActiveRecord::Migration
+  def self.up
+    add_index :activities, ["source_id", "source_type"]
+  end
+
+  def self.down
+    remove_index :activities, ["source_id", "source_type"]
+  end
+end

data/db/migrate/20090819030523_add_attachable_to_activities.rb

@@ -0,0 +1,13 @@
+class AddAttachableToActivities < ActiveRecord::Migration
+  def self.up
+    add_column :activities, :attachable_id, :integer
+    add_column :activities, :attachable_type, :string
+    add_index :activities, ["attachable_id", "attachable_type"]
+  end
+
+  def self.down
+    remove_column :activities, :attachable_id
+    remove_column :activities, :attachable_type
+    remove_index :activities, ["attachable_id", "attachable_type"]
+  end
+end

data/lib/active_record/acts/muck_activity.rb

@@ -11,6 +11,7 @@ module ActiveRecord
 
           belongs_to :item, :polymorphic => true
           belongs_to :source, :polymorphic => true
+          belongs_to :attachable, :polymorphic => true
           has_many :activity_feeds, :dependent => :destroy
           
           acts_as_commentable
@@ -20,11 +21,14 @@ module ActiveRecord
           named_scope :since, lambda { |time| {:conditions => ["activities.created_at > ?", time || DateTime.now] } }
           named_scope :before, lambda { |time| {:conditions => ["activities.created_at < ?", time || DateTime.now] } }
           named_scope :newest, :order => "activities.created_at DESC"
+          named_scope :oldest, :order => "activities.created_at ASC"
+          named_scope :latest, :order => "activities.updated_at DESC" # Using this we can bring activites back to the top of the feed
           named_scope :after, lambda { |id| {:conditions => ["activities.id > ?", id] } }
           named_scope :only_public, :conditions => ["activities.is_public = ?", true]
           named_scope :filter_by_template, lambda { |template| { :conditions => ["activities.template = ?", template] } unless template.blank? }
           named_scope :created_by, lambda { |activity_object| {:conditions => ["activities.source_id = ? AND activities.source_type = ?", activity_object.id, activity_object.class.to_s] } }
           named_scope :status_updates, :conditions => ["activities.is_status_update = ?", true]
+          named_scope :by_item, lambda { |item| { :conditions => ["activities.item_id = ? AND activities.item_type = ?", item.id, item.class.to_s] } unless item.blank? }
           class_eval <<-EOV
             attr_protected :created_at, :updated_at
           EOV

data/lib/muck_activities/muck_activity_sources.rb

@@ -58,13 +58,18 @@ module MuckActivitySources # :nodoc:
     # * +check_method+: method that will be called on each item in the feed_to array.  If the method evaluates
     #   to false the activity won't be added to the object's activity feed.  An example usage would be
     #   letting users configure which items they want to have in their activity feed.
-    def add_activity(feed_to, source, item, template, title = '', content = '', check_method = nil)
+    # * +attach_to: In addition, to item the activity can be attached to another object.  This can help
+    #   improve performance.  For example, each time an 'entry' recieves a new comment a new comment activity is
+    #   added to the muck activity feed.  The comments are also rendered alongside the entries. By attaching the
+    #   activity directly to the entry it is easy to pull up all related activities.
+    def add_activity(feed_to, source, item, template, title = '', content = '', check_method = nil, attach_to = nil)
       if feed_to.is_a?(Array)
+        feed_to.flatten!
         feed_to = feed_to & feed_to # eliminate duplicates from feed_to array
       else
         feed_to = [feed_to]
       end
-      activity = Activity.create(:item => item, :source => source, :template => template, :title => title, :content => content)
+      activity = Activity.create(:item => item, :source => source, :template => template, :title => title, :content => content, :attachable => attach_to)
       feed_to.each do |ft|
         if check_method
           ft.activities << activity if ft.send(check_method)

data/locales/ar.yml

@@ -2,29 +2,33 @@
 ar: 
   muck: 
     activities: 
-      activity_feed_title: "النشاط الأخير"
+      activity_feed_title: "النشاط في الآونة الأخيرة"
+      add_photos: "إضافة صور"
+      add_videos: "حصة كليب"
       adding_comment_message: "واضاف التعليق..."
       all_activities: "جميع الأنشطة"
       clear: واضح
-      create_error: "هناك مشكلة في طلب واضاف ان النشاط : {{error}}"
+      create_error: "كانت هناك مشكلة واضاف ان النشاط المطلوب : {{error}}"
       delete: حذف
-      invite_friends: "دعوة الأصدقاء"
+      invite_friends: "دعوة أصدقاء"
       item_could_not_be_removed: "البند لا يمكن شطبها من قائمة الأنشطة الأخيرة."
-      item_created: "واضاف النشاط"
-      item_removed: "البند بنجاح في الآونة الأخيرة من الأنشطة القائمة."
-      joined_status: "{{name}} joined {{application_name}}"
+      item_created: "وأضاف النشاط"
+      item_removed: "نجحت في إزالة البند الأخير من الأنشطة القائمة."
+      joined_status: "{{name}}انضم {{application_name}}"
       make_comment: التعليق
       paging_newer: «أحدث
       paging_older: "أقدم »"
-      permission_denied: "عذرا ، لا يمكنك فعل ذلك."
+      permission_denied: "آسف ، لا يمكنك فعل ذلك."
       post: مشاركة
-      problem_with_status: "هناك مشكلة في تغيير حالتك"
+      problem_with_status: "كانت هناك مشكلة تغيير حالتك"
       status_indicator: يكون
       status_update_prompt: "ماذا تفعل الآن؟"
-      template_or_item_required: "نشاط يتطلب القالب أو بندا لعرض بشكل صحيح"
+      template_or_item_required: "وهو نشاط يتطلب القالب أو عنصر لعرض بشكل صحيح"
       update_error: "عفوا... كانت هناك مشكلة. {{errors}}"
       update_status_message: "تحديث مركز!"
-      updating_status_message: "تحديث حالتك. الرجاء الانتظار."
+      updating_status_message: "تحديث حالتك. يرجى الانتظار."
+      upload_files: "تحميل ملفات"
+      write: يكتب
       write_prompt: "كتابة تعليق..."
     activity_templates: 
-      status_update: "مركز والمستجدات"
+      status_update: "مركز التحديثات"

data/locales/bg.yml

@@ -2,29 +2,33 @@
 bg: 
   muck: 
     activities: 
-      activity_feed_title: "Скорошна активност"
+      activity_feed_title: "Recent Activity"
+      add_photos: "Добавяне на снимки"
+      add_videos: "Сподели Видео"
       adding_comment_message: "Добавяне на коментар ..."
       all_activities: "Всички дейности"
       clear: Ясен
-      create_error: "Имаше проблем при добавянето на исканата дейност: {{error}}"
+      create_error: "Имаше проблем при добавянето на замолената дейност: {{error}}"
       delete: Изтривам
       invite_friends: "Поканете приятели"
-      item_could_not_be_removed: "Точка не могат да бъдат отстранени от последните дейности списък."
-      item_created: "Добавен дейност"
-      item_removed: "Позиция успешно отстранява от последните дейности списък."
-      joined_status: "{{name}} joined {{application_name}}"
+      item_could_not_be_removed: "Позиция не може да бъде заличено от списъка на последните дейности."
+      item_created: "Added дейност"
+      item_removed: "Позиция успешно премахнат от списъка на последните дейности."
+      joined_status: "{{name}} Присъединиха {{application_name}}"
       make_comment: Коментар
       paging_newer: «По-нови
       paging_older: "По-стари »"
-      permission_denied: "За съжаление, не можете да направите това."
+      permission_denied: "За съжаление, не можеш да направиш това."
       post: Дял
-      problem_with_status: "Имаше проблем с промяна на статута"
+      problem_with_status: "Имаше проблем при промяната на статута"
       status_indicator: е
-      status_update_prompt: "Какво правите в момента?"
-      template_or_item_required: "Една дейност изисква шаблон или елемент да показва правилно"
-      update_error: "Опа ... Имаше проблем. {{errors}}"
-      update_status_message: "обновите своя статус!"
-      updating_status_message: "Актуализиране на вашия статус. Моля, изчакайте."
+      status_update_prompt: "Какво правиш сега?"
+      template_or_item_required: "Дейността изисква шаблон или елемент да показва правилно"
+      update_error: "Ами ... Имаше проблем. {{errors}}"
+      update_status_message: "актуализиране състоянието си!"
+      updating_status_message: "Актуализиране на състоянието ви. Моля, изчакайте."
+      upload_files: "Upload Files"
+      write: Пиша
       write_prompt: "Напиши коментар ..."
     activity_templates: 
       status_update: "Статус актуализации"

data/locales/ca.yml

@@ -3,28 +3,32 @@ ca:
   muck: 
     activities: 
       activity_feed_title: "Activitat recent"
-      adding_comment_message: "Afegint comentari ..."
-      all_activities: "Totes les activitats"
-      clear: Clar
-      create_error: "Hi ha hagut un problema en afegir l'activitat sol licitada: {{error}}"
+      add_photos: "Afegir fotografies"
+      add_videos: "Compartir vídeos"
+      adding_comment_message: "Afegir comentari ..."
+      all_activities: "Totes les Activitats"
+      clear: "És clar"
+      create_error: "Hi va haver un problema en afegir l'activitat sol • licitada: {{error}}"
       delete: Esborrar
-      invite_friends: "Convidar amics"
-      item_could_not_be_removed: "Tema no pot ser eliminat de la llista d'activitats recents."
-      item_created: "Afegit activitat"
-      item_removed: "Ha eliminat el tema de la recent llista d'activitats."
-      joined_status: "{{name}} joined {{application_name}}"
+      invite_friends: "Convidar els amics"
+      item_could_not_be_removed: "No s'ha pogut treure de la llista d'activitats recents."
+      item_created: "Alta activitat"
+      item_removed: "Article ha eliminat de la llista d'activitats recents."
+      joined_status: "{{name}} Unió {{application_name}}"
       make_comment: Comentari
-      paging_newer: "«Més recent"
-      paging_older: "Més antic »"
+      paging_newer: "«Més recents"
+      paging_older: "Més antics »"
       permission_denied: "Ho sentim, no pots fer això."
       post: Compartir
-      problem_with_status: "Hi ha hagut un problema de canviar el seu estatut"
+      problem_with_status: "Hi va haver un problema en canviar el seu estat de"
       status_indicator: és
       status_update_prompt: "Què estàs fent ara?"
       template_or_item_required: "Una activitat que requereix d'una plantilla o un element per mostrar correctament"
       update_error: "Quin ... Hi ha hagut un problema. {{errors}}"
-      update_status_message: "actualització del seu estat!"
+      update_status_message: "actualitzar el seu estatus!"
       updating_status_message: "L'actualització del seu estat. Si us plau, espereu."
+      upload_files: "Carregar arxius"
+      write: Escriure
       write_prompt: "Vols escriure un comentari ..."
     activity_templates: 
-      status_update: "Actualitzacions d'estat"
+      status_update: "Les actualitzacions d'estat"

data/locales/cs.yml

@@ -2,29 +2,33 @@
 cs: 
   muck: 
     activities: 
-      activity_feed_title: "Poslední aktivita"
+      activity_feed_title: "Nedávná činnost"
+      add_photos: "Přidat fotografie"
+      add_videos: "Share Video"
       adding_comment_message: "Přidání komentáře ..."
       all_activities: "Všechny aktivity"
       clear: Jasný
-      create_error: "Došlo k problému přidáním požadovaných činností: {{error}}"
+      create_error: "Tam byl problém přidat požadované činnosti: {{error}}"
       delete: Odstranit
       invite_friends: "Pozvat přátele"
-      item_could_not_be_removed: "Bod nemohl být odstraněn z posledních aktivit seznamu."
-      item_created: "Přidáno činnost"
-      item_removed: "Bod byl úspěšně odstraněn z posledních aktivit seznamu."
-      joined_status: "{{name}} joined {{application_name}}"
+      item_could_not_be_removed: "Položka nemůže být odstraněna ze seznamu posledních aktivit."
+      item_created: "Added činnost"
+      item_removed: "Položka úspěšně odstraněna ze seznamu posledních aktivit."
+      joined_status: "{{name}} Připojil {{application_name}}"
       make_comment: Komentář
       paging_newer: «Novější
       paging_older: "Starší »"
-      permission_denied: "Omlouváme se, ale nemůžete udělat."
+      permission_denied: "Je nám líto, nemůžete udělat."
       post: Sdílet
-      problem_with_status: "Došlo k problému při změně stavu"
+      problem_with_status: "Došlo k problému změnou svého postavení"
       status_indicator: je
       status_update_prompt: "Co děláte teď?"
-      template_or_item_required: "Činnost vyžaduje šablony nebo položky na displeji správně"
-      update_error: "Jejda ... Došlo k problému. {{errors}}"
+      template_or_item_required: "Činnost vyžaduje šablonu, nebo položku správně zobrazí"
+      update_error: "Jejda ... Tam byl problém. {{errors}}"
       update_status_message: "aktualizovat svůj stav!"
-      updating_status_message: "Aktualizaci stavu. Prosím čekejte."
-      write_prompt: "Napište komentář ..."
+      updating_status_message: "Aktualizace váš status. Prosím čekejte."
+      upload_files: "Upload souborů"
+      write: Psát
+      write_prompt: "Napsat komentář ..."
     activity_templates: 
       status_update: "Stav aktualizace"

data/locales/da.yml

@@ -2,29 +2,33 @@
 da: 
   muck: 
     activities: 
-      activity_feed_title: "Seneste aktivitet"
-      adding_comment_message: "Tilføje kommentarer ..."
+      activity_feed_title: "Recent Activity"
+      add_photos: "Tilføj fotos"
+      add_videos: "Aktie Videos"
+      adding_comment_message: "Tilføje kommentar ..."
       all_activities: "Alle aktiviteter"
       clear: Klar
       create_error: "Der var et problem at tilføje den ønskede aktivitet: {{error}}"
       delete: Slet
       invite_friends: "Inviter venner"
-      item_could_not_be_removed: "Konto ikke kunne fjernes fra de seneste aktiviteter listen."
+      item_could_not_be_removed: "Emnet kunne ikke fjernes fra de seneste aktiviteter listen."
       item_created: "Lagt aktivitet"
-      item_removed: "Konto held fjernet fra de seneste aktiviteter listen."
-      joined_status: "{{name}} joined {{application_name}}"
+      item_removed: "Konto blevet fjernet fra de seneste aktiviteter listen."
+      joined_status: "{{name}} Tiltrådte {{application_name}}"
       make_comment: Kommentar
       paging_newer: «Nyere
       paging_older: "Ældre »"
-      permission_denied: "Beklager, men du kan ikke gøre det."
+      permission_denied: "Undskyld, kan du ikke gøre det."
       post: Del
       problem_with_status: "Der var et problem at ændre din status"
       status_indicator: er
       status_update_prompt: "Hvad laver du lige nu?"
-      template_or_item_required: "En aktivitet kræver en skabelon eller et emne til at vise korrekt"
+      template_or_item_required: "En aktivitet kræver en skabelon eller et emne for at vise korrekt"
       update_error: "Ups ... Der var et problem. {{errors}}"
       update_status_message: "opdatere din status!"
       updating_status_message: "Opdatering af din status. Vent venligst."
+      upload_files: "Upload filer"
+      write: Skrive
       write_prompt: "Skriv en kommentar ..."
     activity_templates: 
-      status_update: "Status Updates"
+      status_update: Statusopdateringer

data/locales/de.yml

@@ -2,29 +2,33 @@
 de: 
   muck: 
     activities: 
-      activity_feed_title: "Letzte Aktivitäten"
+      activity_feed_title: "Recent Activity"
+      add_photos: "Fotos hinzufügen"
+      add_videos: "Sagen Videos"
       adding_comment_message: "Kommentar hinzufügen ..."
       all_activities: "Alle Aktivitäten"
       clear: Klar
-      create_error: "Es wurde ein Problem, das Hinzufügen der beantragten Aktivität: {{error}}"
+      create_error: "Es gab ein Problem indem die gewünschte Aktivität: {{error}}"
       delete: Löschen
       invite_friends: "Freunde einladen"
-      item_could_not_be_removed: "Punkt konnte nicht entfernt werden aus den jüngsten Aktivitäten Liste."
-      item_created: "Hinzugefügt Tätigkeit"
-      item_removed: "Posten erfolgreich aus der jüngsten Aktivitäten Liste."
-      joined_status: "{{name}} joined {{application_name}}"
+      item_could_not_be_removed: "Artikel konnte nicht aus der jüngsten Aktivitäten von Liste gestrichen werden."
+      item_created: "Added Tätigkeit"
+      item_removed: "Artikel erfolgreich aus dem jüngsten Aktivitäten-Liste entfernt."
+      joined_status: "{{name}} Beigetreten {{application_name}}"
       make_comment: Kommentar
       paging_newer: «Neuere
-      paging_older: "Ältere »"
-      permission_denied: "Sorry, Sie können das nicht."
+      paging_older: "Older »"
+      permission_denied: "Leider können Sie nicht tun."
       post: Anteil
-      problem_with_status: "Es gab ein Problem, wenn Sie Ihre Status"
+      problem_with_status: "Es gab ein Problem Ändern Ihres Status"
       status_indicator: ist
-      status_update_prompt: "Was machst du jetzt?"
-      template_or_item_required: "Eine Tätigkeit erfordert eine Vorlage oder ein Element, um korrekt"
+      status_update_prompt: "Was machst du gerade?"
+      template_or_item_required: "Eine Tätigkeit erfordert eine Vorlage oder ein Element, um korrekt angezeigt"
       update_error: "Ups ... Es gab ein Problem. {{errors}}"
       update_status_message: "aktualisieren Sie Ihren Status!"
-      updating_status_message: "Aktualisieren Sie Ihren Status. Bitte warten."
-      write_prompt: "Schreiben Sie einen Kommentar ..."
+      updating_status_message: "Update your status. Bitte warten."
+      upload_files: "Dateien hochladen"
+      write: Schreiben
+      write_prompt: "Schreibe einen Kommentar ..."
     activity_templates: 
       status_update: "Status Updates"

data/locales/el.yml

@@ -3,28 +3,32 @@ el:
   muck: 
     activities: 
       activity_feed_title: "Πρόσφατη δραστηριότητα"
-      adding_comment_message: "Adding σχόλιο ..."
+      add_photos: "Προσθήκη Photos"
+      add_videos: "Μερίδιο Βίντεο"
+      adding_comment_message: "Προσθήκη σχόλιο ..."
       all_activities: "Όλες οι δραστηριότητες"
       clear: Καθαρός
-      create_error: "Υπήρξε πρόβλημα στην προσθήκη του ζήτησε δραστηριότητα: {{error}}"
+      create_error: "Υπήρξε ένα πρόβλημα με προσθήκη του ζήτησε δραστηριότητα: {{error}}"
       delete: Διαγράφω
-      invite_friends: "Πρόσκληση φίλων"
-      item_could_not_be_removed: "Το σημείο δεν μπορούσε να αφαιρεθεί από τον κατάλογο πρόσφατες δραστηριότητες."
+      invite_friends: "Προσκαλέστε τους φίλους"
+      item_could_not_be_removed: "Το σημείο δεν μπορούσε να αφαιρεθεί από την πρόσφατη τον κατάλογο των δραστηριοτήτων."
       item_created: "Προστέθηκε δραστηριότητα"
-      item_removed: "Θέση με επιτυχία από τις πρόσφατες δραστηριότητες λίστα."
-      joined_status: "{{name}} joined {{application_name}}"
+      item_removed: "Θέση επιτυχώς αφαιρεθεί από την πρόσφατη κατάλογο των δραστηριοτήτων."
+      joined_status: "{{name}} Προσχώρησαν {{application_name}}"
       make_comment: Σχόλιο
-      paging_newer: «Νεότερα
+      paging_newer: «Νεότερο
       paging_older: "Παλαιότερο »"
       permission_denied: "Λυπούμαστε, δεν μπορείτε να το κάνετε αυτό."
       post: Μοιράζομαι
-      problem_with_status: "Υπήρξε πρόβλημα στην αλλαγή σας"
+      problem_with_status: "Υπήρξε ένα πρόβλημα αλλάζοντας την κατάστασή σας"
       status_indicator: είναι
       status_update_prompt: "Τι κάνεις τώρα;"
       template_or_item_required: "Μια δραστηριότητα απαιτεί ένα πρότυπο ή ένα στοιχείο για να εμφανιστεί σωστά"
       update_error: "Ωχ ... Υπήρξε ένα πρόβλημα. {{errors}}"
-      update_status_message: "ενημέρωση σας!"
-      updating_status_message: "Η ενημέρωση σας. Παρακαλώ περιμένετε."
+      update_status_message: "ενημερώσετε την κατάστασή σας!"
+      updating_status_message: "Ενημέρωση κατάστασή σας. Παρακαλώ περιμένετε."
+      upload_files: "Upload Files"
+      write: Γράφω
       write_prompt: "Γράψτε ένα σχόλιο ..."
     activity_templates: 
-      status_update: "Status Updates"
+      status_update: "Κατάσταση Updates"

data/locales/en.yml

@@ -25,6 +25,10 @@ en:
       make_comment: Comment
       write_prompt: "Write a comment..."
       adding_comment_message: "Adding comment... "
+      write: "Write"
+      add_photos: Add Photos
+      add_videos: Share Videos
+      upload_files: Upload Files
     activity_templates:
       status_update: "Status Updates"