muck-activities 3.0.0 → 3.0.1

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Tatemae
+Copyright (c) 2009-2010 Tatemae
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -1,7 +1,7 @@
 = MuckActivities
 
 == Installation
-The muck activities engine is part of the muck framework and relies upon the muck_engine.  Install with
+The muck activities engine is part of the muck framework and relies upon the muck-engine.  Install with
 
   sudo gem install muck-activites
   
@@ -10,14 +10,14 @@ This should also install the dependencies.
 == Usage
 This engine implements simple activity tracking. 
 
-Models that can have activity feed should call 'include MuckActivities::Models::ActivityConsumer'
+Models that can have activity feed should call 'include MuckActivities::Models::MuckActivityConsumer'
 
   Example:
     class User
-      include MuckActivities::Models::ActivityConsumer
+      include MuckActivities::Models::MuckActivityConsumer
     end
 
-Adding an item to the activity feed requires 'MuckActivities::Models::ActivitySource' which then profiles the method 'add_activity'
+Adding an item to the activity feed with 'include MuckActivities::Models::MuckActivitySource' which then profiles the method 'add_activity'
 
   add_activity(feed_to, actor, item, template, check_method)
 
@@ -30,10 +30,10 @@ Adding an item to the activity feed requires 'MuckActivities::Models::ActivitySo
   Example:
     add_activity(user.feed_to, user, comment, 'comment')
 
-Create an activity model that 'include MuckActivities::Models::Activity':
+Create an activity model that 'include MuckActivities::Models::MuckActivity':
 
   class Activity < ActiveRecord::Base
-    include MuckActivities::Models::Activity
+    include MuckActivities::Models::MuckActivity
   end
 
 === CSS
@@ -42,7 +42,7 @@ You can include that file in your layout or copy it and modify it to meet your n
 (Don't change the file as each time you run rake muck:activities:sync it will overwrite any changes you might have made.)
 
 === Authorization
-Adding 'include MuckActivities::Models::ActivityConsumer' to your model will add a simple 'can_view?' method:
+Adding 'include MuckActivities::Models::MuckActivityConsumer' to your model will add a simple 'can_view?' method:
 
   def can_view?(check_object)
     self == check_object

data/Rakefile

@@ -1,9 +1,14 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
+require 'rspec/core/rake_task'
 
-desc 'Default: run tests.'
+desc 'Default: run specs.'
 task :default => :spec
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.rspec_opts = ["--color", "-c", "-f progress", "-r test/rails_test/spec/spec_helper.rb"]
+  t.pattern = 'test/rails_test/spec/**/*_spec.rb'  
+end
 
 begin
   require 'rcov/rcovtask'
@@ -21,7 +26,7 @@ rescue LoadError
   end
 end
 
-desc 'Generate documentation for the muck_activities plugin.'
+desc 'Generate documentation for the muck-activities plugin.'
 Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title    = 'MuckActivity'
@@ -42,7 +47,7 @@ begin
     gemspec.name = "muck-activities"
     gemspec.summary = "Activity engine for the muck system"
     gemspec.email = "justin@tatemae.com"
-    gemspec.homepage = "http://github.com/tatemae/muck_activities"
+    gemspec.homepage = "http://github.com/tatemae/muck-activities"
     gemspec.description = "Activity engine for the muck system."
     gemspec.authors = ["Justin Ball", "Joel Duffin"]
     gemspec.rubyforge_project = 'muck-activities'

data/VERSION

@@ -1 +1 @@
-3.0.0
+3.0.1

data/app/controllers/muck/activities_controller.rb

@@ -1,5 +1,4 @@
 class Muck::ActivitiesController < ApplicationController
-  unloadable
   
   include ApplicationHelper
   include MuckActivityHelper
@@ -100,21 +99,15 @@ class Muck::ActivitiesController < ApplicationController
   protected
   
   def get_activities_html(activities, limited = false)
-    render_as_html do
-      render_to_string(:partial => "activities/cached_activities", :locals => {:activities => @activities, :limited => limited})
-    end
+    render_to_string(:partial => "activities/cached_activities", :locals => {:activities => @activities, :limited => limited})
   end
   
   def get_status_html(activity)
-    render_as_html do
-      render_to_string(:partial => 'activities/current_status', :locals => {:activities_object => activity})
-    end
+    render_to_string(:partial => 'activities/current_status', :locals => {:activities_object => activity})
   end
   
   def get_activity_html(activity)
-    render_as_html do
-      render_to_string(:partial => "activity_templates/#{activity.template}", :locals => { :activity => activity })
-    end
+    render_to_string(:partial => "activity_templates/#{activity.template}", :locals => { :activity => activity })
   end
   
   def find_parent

data/app/helpers/muck_activity_helper.rb

@@ -5,7 +5,7 @@ module MuckActivityHelper
   end
   
   def activity_comment_link(activity, comment = nil)
-    if GlobalConfig.enable_activity_comments
+    if MuckActivities.configuration.enable_activity_comments
       comment_form(activity, comment)
     end
   end
@@ -37,7 +37,7 @@ module MuckActivityHelper
   # 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.by_latest.created_by(activities_object).only_public.find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
+    activities = activities_object.activities.by_latest.created_by(activities_object).is_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
   
@@ -77,17 +77,18 @@ module MuckActivityHelper
   # Renders a delete button for a comment inside an activity feed
   def delete_activity_comment(comment, button_type = :button, button_text = t("muck.activities.delete"))
     render :partial => 'shared/delete', :locals => { :delete_object => comment, 
-                                                         :button_type => button_type,
-                                                         :button_text => button_text, 
-                                                         :form_class => 'comment-delete',
-                                                         :delete_path => comment_path(comment, :format => 'js') }
+                                                     :button_type => button_type,
+                                                     :button_text => button_text, 
+                                                     :form_class => 'comment-delete',
+                                                     :delete_path => comment_path(comment, :format => 'js') }
   end
   
   # Renders an activity feed filter.  Filter items come from the name of the templates used to render the activities.
   # Pass in an array of templates to leave out as the second parameter
   def activity_filter(activities_object, *dont_include)
     dont_include = [dont_include] unless dont_include.is_a?(Array)
-    activity_types = activities_object.activities.all(:select => "DISTINCT activities.template")
+    activity_types = Activity.where(:id => activities_object.id).select("DISTINCT(template)")
+    #activity_types = activities_object.activities.select("DISTINCT(activities.template)")
     filter_types = activity_types.find_all {|activity| !dont_include.include?(activity.template)}
     render :partial => 'activities/template_filter', :locals => { :activity_types => filter_types, :dont_include => dont_include }
   end
@@ -110,9 +111,9 @@ module MuckActivityHelper
   
   def get_profile_activities(activities_object)
     if !params[:latest_activity_id].blank?
-      activities_object.activities.by_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)
+      activities_object.activities.by_latest.filter_by_template(params[:activity_filter]).after(params[:latest_activity_id]).is_public.created_by(activities_object).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
     else
-      activities_object.activities.by_latest.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.by_latest.filter_by_template(params[:activity_filter]).is_public.created_by(activities_object).find(:all, :include => ['comments']).paginate(:page => @page, :per_page => @per_page)
     end
   end
   

data/app/views/activities/{_activity_feed.html.erb → _activity_feed.erb}

@@ -6,8 +6,8 @@
 <%= will_paginate activities, :previous_label => t('muck.activities.paging_newer'), :next_label => t('muck.activities.paging_older') -%>
 <% content_for :javascript do -%>
   jQuery(document).ready(function(){
-    <% if GlobalConfig.enable_live_activity_updates -%>
-    setInterval(function() {jQuery.ajax({success:function(request){update_feed(request);}, type: "GET", url:'<%= activities_path(:parent_id => activities_object, :parent_type => activities_object.class, :activity_filter => params[:activity_filter], :format => 'js') %>&amp;latest_activity_id=' + get_latest_activity_id()})}, <%=GlobalConfig.live_activity_update_interval%> * 1000)
+    <% if MuckActivities.configuration.enable_live_activity_updates -%>
+    setInterval(function() {jQuery.ajax({success:function(request){update_feed(request);}, type: "GET", url:'<%= activities_path(:parent_id => activities_object, :parent_type => activities_object.class, :activity_filter => params[:activity_filter], :format => 'js') %>&amp;latest_activity_id=' + get_latest_activity_id()})}, <%=MuckActivities.configuration.live_activity_update_interval%> * 1000)
     <% end -%>
   });
 <% end -%>

data/app/views/activities/{_cached_activities.html.erb → _cached_activities.erb}

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

data/app/views/activities/{_contribute.html.erb → _contribute.erb}

@@ -1,22 +1,22 @@
 <div id="activity-status-control">
   <div id="status-container" class="status-activity"><%= status_update(@user) %></div>
-  <% if GlobalConfig.enable_activity_image_uploads -%>
+  <% if MuckActivities.configuration.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 -%>
+  <% if MuckActivities.configuration.enable_activity_video_sharing -%>
     <div id="videos-container" class="status-activity" style="display:none;"></div>
   <% end -%>
-  <% if GlobalConfig.enable_activity_file_uploads -%>
+  <% if MuckActivities.configuration.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 -%>
+    <% if MuckActivities.configuration.enable_activity_image_uploads -%><li><a id="photos-action" class="status-action" href="#"><%= t('muck.activities.add_photos') %></a></li><% end -%>
+    <% if MuckActivities.configuration.enable_activity_video_sharing -%><li><a id="videos-action" class="status-action" href="#"><%= t('muck.activities.add_videos') %></a></li><% end -%>
+    <% if MuckActivities.configuration.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/activities/{_status_update.html.erb → _status_update.erb}

@@ -1,6 +1,6 @@
 <div id="status-update">
   <%= output_errors(t('muck.users.problem_with_status'), {:class => 'help-box'}, @activity) %>
-  <% form_for(:activity, 
+  <%= form_for(:activity, 
               :url => activities_path(:parent_id => activities_object, :parent_type => activities_object.class), 
               :html => { :id => 'status_update_form', :class => 'clear ajax',
                          :action => activities_path(:parent_id => activities_object, :parent_type => activities_object.class) } ) do |f| -%>

data/app/views/activity_templates/_status_update.erb

@@ -0,0 +1,3 @@
+<%= activity_for(activity, :activity_css_class => 'activity-status-update') do %>
+  <%= activity.content %>
+<% end -%>

data/config/locales/ar.yml

@@ -2,33 +2,33 @@
 ar: 
   muck: 
     activities: 
-      activity_feed_title: "النشاط في الآونة الأخيرة"
-      add_photos: "إضافة صور"
-      add_videos: "حصة كليب"
+      activity_feed_title: "الأخيرة نشاط"
+      add_photos: "أضف صور"
+      add_videos: "تبادل أشرطة الفيديو"
       adding_comment_message: "واضاف التعليق..."
       all_activities: "جميع الأنشطة"
       clear: واضح
       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}}انضم %{application_name}"
+      item_removed: "البند نجحت في إزالة من قائمة الأنشطة الأخيرة."
+      joined_status: "انضم %{name}} %{application_name}"
       make_comment: التعليق
       paging_newer: «أحدث
       paging_older: "أقدم »"
-      permission_denied: "آسف ، لا يمكنك فعل ذلك."
-      post: مشاركة
-      problem_with_status: "كانت هناك مشكلة تغيير حالتك"
-      status_indicator: يكون
+      permission_denied: "عذرا ، لا يمكنك أن تفعل ذلك."
+      post: حصة
+      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: "تحديث حالتك. يرجى الانتظار."
-      upload_files: "تحميل ملفات"
-      write: يكتب
+      upload_files: "تحميل الملفات"
+      write: الكتابة
       write_prompt: "كتابة تعليق..."
     activity_templates: 
-      status_update: "مركز التحديثات"
+      status_update: "حالة التحديثات"

data/config/locales/bg.yml

@@ -2,33 +2,33 @@
 bg: 
   muck: 
     activities: 
-      activity_feed_title: "Recent Activity"
+      activity_feed_title: "Скорошна активност"
       add_photos: "Добавяне на снимки"
       add_videos: "Сподели Видео"
       adding_comment_message: "Добавяне на коментар ..."
       all_activities: "Всички дейности"
-      clear: Ясен
-      create_error: "Имаше проблем при добавянето на замолената дейност: %{error}"
-      delete: Изтривам
-      invite_friends: "Поканете приятели"
-      item_could_not_be_removed: "Позиция не може да бъде заличено от списъка на последните дейности."
-      item_created: "Added дейност"
-      item_removed: "Позиция успешно премахнат от списъка на последните дейности."
-      joined_status: "%{name}} Присъединиха %{application_name}"
+      clear: Ясно
+      create_error: "Имаше проблем при добавянето на поисканото действие: %{error}"
+      delete: Изтриване
+      invite_friends: "Покани приятели"
+      item_could_not_be_removed: "Позицията не може да бъде заличено от списъка последните дейности."
+      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: "Дейността изисква шаблон или елемент да показва правилно"
-      update_error: "Ами ... Имаше проблем. %{errors}"
-      update_status_message: "актуализиране състоянието си!"
-      updating_status_message: "Актуализиране на състоянието ви. Моля, изчакайте."
-      upload_files: "Upload Files"
-      write: Пиша
+      status_update_prompt: "Какво правиш в момента?"
+      template_or_item_required: "Една дейност изисква по шаблон или елемент, за да се показват правилно"
+      update_error: "Ами сега ... Имаше проблем. %{errors}"
+      update_status_message: "актуализира състоянието си!"
+      updating_status_message: "Актуализиране на вашето състояние. Моля, изчакайте."
+      upload_files: "Качване на файлове"
+      write: Добави
       write_prompt: "Напиши коментар ..."
     activity_templates: 
       status_update: "Статус актуализации"

data/config/locales/ca.yml

@@ -3,32 +3,32 @@ ca:
   muck: 
     activities: 
       activity_feed_title: "Activitat recent"
-      add_photos: "Afegir fotografies"
+      add_photos: "Afegir fotos"
       add_videos: "Compartir vídeos"
-      adding_comment_message: "Afegir comentari ..."
+      adding_comment_message: "Afegeix 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
+      clear: Esborrar
+      create_error: "Hi va haver un problema en afegir l'activitat sol.licitada: %{error}"
+      delete: Eliminar
       invite_friends: "Convidar els amics"
-      item_could_not_be_removed: "No s'ha pogut treure de la llista d'activitats recents."
+      item_could_not_be_removed: "L'article no pot ser remogut de la llista d'activitats recents."
       item_created: "Alta activitat"
-      item_removed: "Article ha eliminat de la llista d'activitats recents."
+      item_removed: "Tema eliminat correctament de la llista d'activitats recents."
       joined_status: "%{name}} Unió %{application_name}"
       make_comment: Comentari
       paging_newer: "«Més recents"
       paging_older: "Més antics »"
       permission_denied: "Ho sentim, no pots fer això."
       post: Compartir
-      problem_with_status: "Hi va haver un problema en canviar el seu estat de"
+      problem_with_status: "Hi va haver un problema en canviar el seu estat"
       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: "actualitzar el seu estatus!"
-      updating_status_message: "L'actualització del seu estat. Si us plau, espereu."
+      update_error: "Ui ... Hi ha hagut un problema. %{errors}"
+      update_status_message: "actualitzar el teu estat!"
+      updating_status_message: "Actualització del seu estat. Si us plau, espereu."
       upload_files: "Carregar arxius"
-      write: Escriure
+      write: Escriu
       write_prompt: "Vols escriure un comentari ..."
     activity_templates: 
       status_update: "Les actualitzacions d'estat"

data/config/locales/cs.yml

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

data/config/locales/da.yml

@@ -2,33 +2,33 @@
 da: 
   muck: 
     activities: 
-      activity_feed_title: "Recent Activity"
+      activity_feed_title: "Seneste aktivitet"
       add_photos: "Tilføj fotos"
-      add_videos: "Aktie Videos"
-      adding_comment_message: "Tilføje kommentar ..."
+      add_videos: "Del videoer"
+      adding_comment_message: "Tilføjelse kommentar ..."
       all_activities: "Alle aktiviteter"
-      clear: Klar
+      clear: Ryd
       create_error: "Der var et problem at tilføje den ønskede aktivitet: %{error}"
       delete: Slet
       invite_friends: "Inviter venner"
-      item_could_not_be_removed: "Emnet kunne ikke fjernes fra de seneste aktiviteter listen."
-      item_created: "Lagt aktivitet"
-      item_removed: "Konto blevet fjernet fra de seneste aktiviteter listen."
+      item_could_not_be_removed: "Emnet kunne ikke fjernes fra den seneste listen over aktiviteter."
+      item_created: "Tilføjet aktivitet"
+      item_removed: "Konto blev fjernet fra den seneste listen over aktiviteter."
       joined_status: "%{name}} Tiltrådte %{application_name}"
       make_comment: Kommentar
       paging_newer: «Nyere
       paging_older: "Ældre »"
-      permission_denied: "Undskyld, kan du ikke gøre det."
+      permission_denied: "Du kan desværre 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 for at vise korrekt"
-      update_error: "Ups ... Der var et problem. %{errors}"
+      template_or_item_required: "En aktivitet kræver en skabelon eller et element til at vise korrekt"
+      update_error: "Ups ... Der opstod 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: Skriv
       write_prompt: "Skriv en kommentar ..."
     activity_templates: 
       status_update: Statusopdateringer

data/config/locales/de.yml

@@ -2,33 +2,33 @@
 de: 
   muck: 
     activities: 
-      activity_feed_title: "Recent Activity"
+      activity_feed_title: "Letzte Aktivität"
       add_photos: "Fotos hinzufügen"
       add_videos: "Sagen Videos"
-      adding_comment_message: "Kommentar hinzufügen ..."
+      adding_comment_message: "Hinzufügen Kommentar ..."
       all_activities: "Alle Aktivitäten"
-      clear: Klar
-      create_error: "Es gab ein Problem indem die gewünschte Aktivität: %{error}"
+      clear: Clear
+      create_error: "Es gab ein Problem indem die angeforderte Aktivität: %{error}"
       delete: Löschen
       invite_friends: "Freunde einladen"
-      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
+      item_could_not_be_removed: "Artikel konnte nicht aus der jüngsten Aktivitäten Liste gestrichen werden."
+      item_created: "Hinzugefügt Aktivität"
+      item_removed: "Artikel erfolgreich aus der jüngsten Aktivitäten Liste entfernt."
+      joined_status: "%{name}} Verbunden %{application_name}"
+      make_comment: Kommentieren
       paging_newer: «Neuere
-      paging_older: "Older »"
+      paging_older: "Ältere »"
       permission_denied: "Leider können Sie nicht tun."
-      post: Anteil
-      problem_with_status: "Es gab ein Problem Ändern Ihres Status"
+      post: Empfehlen
+      problem_with_status: "Es gab ein Problem, wenn Sie Ihre Status"
       status_indicator: ist
       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_error: "Oops ... Es gab ein Problem. %{errors}"
       update_status_message: "aktualisieren Sie Ihren Status!"
-      updating_status_message: "Update your status. Bitte warten."
+      updating_status_message: "Aktualisieren Sie Ihren Status. Bitte warten Sie."
       upload_files: "Dateien hochladen"
       write: Schreiben
       write_prompt: "Schreibe einen Kommentar ..."
     activity_templates: 
-      status_update: "Status Updates"
+      status_update: Status-Updates

data/config/locales/el.yml

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