social_stream 0.30.0 → 0.30.1

data/Gemfile

@@ -1,7 +1,8 @@
 source "http://rubygems.org"
 
-# Freeze Rails version to help with bunlder resolution
-gem 'builder', '~> 3.0.0'
+# Freeze rails version
+# https://github.com/ging/social_stream/issues/291
+gem 'rails', '3.2.8'
 
 # Uncomment the following lines if you are planing to
 # use a local code of any of these gems

data/base/app/assets/javascripts/social_stream.wall.js.erb

@@ -34,7 +34,7 @@ SocialStream.Wall = (function(SS, $, undefined){
       $('.activity_form_selector').removeClass('selected');
       $(this).addClass('selected');
       $('#wrapper_activities_header form').hide();
-      $('#new_'+this.id.split("_")[1]).show();
+      $('#' + this.id.replace(/^select/, 'new')).show();
     });
   }
 

data/base/app/helpers/contacts_helper.rb

@@ -18,7 +18,13 @@ module ContactsHelper
     if user_signed_in?
       contact_link current_subject.contact_to!(a)
     else
-      link_to t("contact.new.link"), new_user_session_path
+      if SocialStream.relation_model == :follow
+        form_tag new_user_session_path do |f|
+          submit_tag t('contact.follow')
+        end
+      else
+        link_to t("contact.new.link"), new_user_session_path
+      end
     end
   end
 end

data/base/app/models/activity.rb

@@ -197,8 +197,8 @@ class Activity < ActiveRecord::Base
     case verb
     when "follow", "make-friend", "like"
       I18n.t "activity.verb.#{ verb }.#{ receiver.subject_type }.title",
-             :subject => view.link_name(sender_subject),
-             :contact => view.link_name(receiver_subject)
+      :subject => view.link_name(sender_subject),
+      :contact => view.link_name(receiver_subject)
     when "post", "update"
       if sender == receiver
         view.link_name sender_subject
@@ -207,6 +207,11 @@ class Activity < ActiveRecord::Base
                :sender => view.link_name(sender_subject),
                :receiver => view.link_name(receiver_subject)
       end
+    when 'join'
+      I18n.t('notification.join.one', 
+            :sender => view.link_name(sender_subject),
+            :thing => I18n.t(direct_object.class.to_s.underscore+'.one'),
+            :title => title_of(direct_object))
     else
       "Must define activity title"
     end.html_safe
@@ -230,20 +235,20 @@ class Activity < ActiveRecord::Base
   def stream_content
     stream_title
   end
-    
+  
   def notificable?
     is_root? or ['post','update'].include?(root.verb)
   end
 
   def notify
     return true unless notificable?
-    #Avaible verbs: follow, like, make-friend, post, update
+    #Avaible verbs: follow, like, make-friend, post, update, join
 
     if direct_object.is_a? Comment
       participants.each do |p|
         p.notify(notification_subject, "Youre not supposed to see this", self) unless p == sender
       end
-    elsif ['like','follow','make-friend','post','update'].include? verb and !reflexive?
+    elsif ['like','follow','make-friend','post','update', 'join'].include? verb and !reflexive?
       receiver.notify(notification_subject, "Youre not supposed to see this", self)
     end
     true
@@ -346,6 +351,12 @@ class Activity < ActiveRecord::Base
               :whose => I18n.t('notification.whose.'+ receiver.subject.class.to_s.underscore,
                                :receiver => receiver_name),
               :thing => I18n.t(direct_object.class.to_s.underscore+'.one'))
+      when 'join'
+        I18n.t('notification.join.one'  , 
+            :sender => sender_name,
+            :thing => I18n.t(direct_object.class.to_s.underscore+'.title.one'),
+            :title => title_of(direct_object))
+      
       else
         t('notification.default')
       end

data/base/app/models/activity_verb.rb

@@ -1,6 +1,6 @@
 class ActivityVerb < ActiveRecord::Base
   # Activity Strems verbs
-  Available = %w(follow like make-friend post update)
+  Available = %w(follow like make-friend post update join)
 
   validates_uniqueness_of :name
 

data/base/app/models/comment.rb

@@ -37,7 +37,7 @@ class Comment < ActiveRecord::Base
   def decrement_comment_count 
     return if self.post_activity.blank? || self.post_activity.parent.blank?
  
-    self.post_activity.parent.direct_activity_object.decrement!(:comment_count) 
+    self.post_activity.parent.direct_activity_object.try(:decrement!, :comment_count) 
   end 
 
 end

data/base/app/models/site.rb

@@ -0,0 +1,16 @@
+# Site is used to store the global configuration. Example:
+# 
+#   Site.config[:host] = 'example.com'
+#   Site.save!
+class Site < ActiveRecord::Base
+  attr_accessible :config
+
+  serialize :config, Hash
+
+  class << self
+    def current
+      @current ||=
+        first || create!
+    end
+  end
+end

data/base/app/views/notification_mailer/new_notification_email.text.erb

@@ -2,9 +2,13 @@
 <% locale_as @receiver.subject %>
 <%= t('notification.hello', :receiver => @receiver.name)%>
 
-<%= render :partial => "notifications/activities/#{ @notification.notified_object.verb }", 
+<% if @notification.notified_object.verb == 'join' %>
+      <%= render :partial => "notifications/activities/join_#{ @notification.notified_object.direct_object.class.to_s.underscore }", 
+                           :locals =>{:activity => @notification.notified_object} %>
+<% else %>
+  <%= render :partial => "notifications/activities/#{ @notification.notified_object.verb }", 
                      :locals =>{:activity => @notification.notified_object}%>
-
+<% end %>
 
 -----------------------------------------------
 <%= raw t('notification.visit', :url=> notifications_url)%>

data/base/app/views/notifications/_notification.html.erb

@@ -15,10 +15,19 @@
     <%= t('time.ago', :time => time_ago_in_words(notification.created_at)) %>
   </div>
 </div>
+
+
+
 <div class="content_right">
   <div class="briefing">
-    <%= render :partial => "notifications/activities/#{ notification.notified_object.verb }", 
+    <% if notification.notified_object.verb == 'join' %>
+      <%= render :partial => "notifications/activities/join_#{ notification.notified_object.direct_object.class.to_s.underscore }", 
+                           :locals =>{:activity => notification.notified_object} %>
+    <% else %>
+    
+      <%= render :partial => "notifications/activities/#{ notification.notified_object.verb }", 
                            :locals =>{:activity => notification.notified_object} %>
+    <% end %>
   </div>
   <div class="clearfloat">
   </div>

data/base/app/views/notifications/activities/_join.html.erb

@@ -0,0 +1,15 @@
+<div class="subject">
+  <%= raw t('notification.join.one' , 
+           :sender => link_to(truncate_name(activity.sender.name),        polymorphic_url(activity.sender.subject)),
+                      :thing => I18n.t(activity.direct_object.class.to_s.underscore+'.one'),
+                      :title => title_of(activity.direct_object)) %>
+</div>
+<div class="briefing">
+  <% if activity.direct_object.respond_to? :text %>
+    "<%= link_to(sanitize(activity.direct_object.text.truncate(100, :separator =>' ')),
+                     notification_url_of(activity.direct_object, @notification))%>"
+  <% else%>
+    <%= link_to(t('notification.watch_it'),
+                notification_url_of( activity.direct_object, @notification))%>
+  <%end%>
+</div>

data/base/app/views/notifications/activities/_join.text.erb

@@ -0,0 +1,8 @@
+<%= raw  t('notification.join.one' , 
+           :sender => link_to(truncate_name(activity.sender.name),        polymorphic_url(activity.sender.subject)),
+                      :thing => I18n.t(activity.direct_object.class.to_s.underscore+'.one'),
+                      :title => title_of(activity.direct_object)) %>
+
+<%= raw t('notification.look', :sender => truncate_name(activity.sender.name))%>: <%=polymorphic_url(activity.sender.subject)%>
+<%= raw t('notification.confirm', :sender => truncate_name(activity.sender.name)) %> <%= edit_contact_url(activity.receiver.contact_to!(activity.sender),
+                                                                                      :s => activity.receiver.slug)%>

data/base/config/locales/en.yml

@@ -66,7 +66,6 @@ en:
       atom_title: "Activity Stream from %{subject}"
       title:
         follow: "%{author} added %{activity_object} as contact"
-        unfollow: "%{author} removed %{activity_object} as contact"
         like: "%{author} likes %{activity_object}"
         make-friend: "%{author} also added %{activity_object} as contact"
         post: "%{author} posted %{activity_object}"
@@ -89,6 +88,8 @@ en:
         Group:
           title: "%{subject} is a fan of %{contact}."
           message: "%{name} is now your fan."
+      join: 
+        one: "%{sender} joined the %{title} %{thing}."
       make-friend:
         User:
           title: "%{subject} and %{contact} are now connected."

data/base/config/locales/zh.yml

@@ -0,0 +1,552 @@
+zh:
+  language_name: "中文"
+  actor:
+    name: "姓名"
+  action:
+    send: "送出"
+    accept: "接收"
+  account:
+    cancel: "取消帐号"
+    edit: "编辑帐号"
+    email: 
+      change: "更改邮箱地址"
+    lang: 
+      change: "切换语言"
+    one: "帐号"
+    password:
+      change: "修改密码"
+      new: "新密码"
+      retype: "再次输入新密码"
+    privacy: "私隐"
+  activerecord:
+    attributes:
+      contact:
+        relation_ids: "联系方式"
+      relation/custom:
+        name: "姓名"
+      user:
+        email: "邮箱"
+        name: "姓名"
+        password: "密码"
+        password_confirmation: "确定密码"
+        remember_me: "记住我"
+  activity:
+    audience:
+      hidden:
+        summary: "禁止"
+        full: "连接分享 %{audience}"
+      public:
+        summary: "公开"
+        full: "分享给网络"
+      show: "展示"
+      visible:
+        summary: "禁止"
+        full: "分享 %{audience}"
+    confirm_delete: "刪除活动?"
+    delete: "删除"
+    last: "次前活动"
+    like: "我喜爱"
+    like_sentence:
+      one: "%{likers} 喜欢这个"
+      other: "%{likers} 喜欢这个"
+      more:
+    one: "一个活动"
+    other: "很多活动"
+    privacy:
+      myself:
+        contacts:
+          group: "所有会员"
+          user: "发送给"
+      outside:
+        contacts:
+          group: "会员的 %{receiver}"
+          user: "联系的 %{receiver}"
+    sending: "传送中"
+    stream:
+      atom_title: "%{subject}的活动流"
+      title:
+        follow: "%{author}已加了%{activity_object}為关连"
+        like: "%{author}喜欢%{activity_object}"
+        make-friend: "%{author}还加了%{activity_object}为关连"
+        post: "%{author}发布了%{activity_object}"
+        updated: "%{author}更新了%{activity_object}"
+    title: "活动"
+    to_comment: "评论"
+    unlike: "我不再喜欢了"
+    verb:
+      follow:
+        User:
+          title: "%{subject} 已加 %{contact} 作为联络."
+          message: "%{name} 已加您作为联系人."
+        Group:
+          title: "%{subject} 已加 %{contact} 作为联络."
+          message: "%{name} 已加您作为联络."
+      like:
+        User:
+          title: "%{subject} 已成为粉丝 %{contact}."
+          message: "%{name} 已成为你的粉丝."
+        Group:
+          title: "%{subject} 已成为粉丝 %{contact}."
+          message: "%{name} 已成为你的粉丝."
+      make-friend:
+        User:
+          title: "%{subject} 和 %{contact} 现已連结."
+          message: "%{姓名} 已加您作为联系人."
+        Group:
+          title: "%{subject} 已加 %{contact} 联络."
+          message: "%{name} 已加您作为联系人."           
+      post:
+        title:
+          other_wall: "%{sender} → %{receiver}"
+  activity_action:
+    follow: "关注"
+    sentence:
+      follow:
+        one: "%{followers} 关注这个"
+        other: "%{followers} 关注这个"
+      more:
+        one: "%{count} 一个人"
+        other: "%{count} 再多些人"
+    unfollow: "不再关注"
+  browse: "浏览"
+  button:
+    cancel: "取消"
+    create: "创建"
+    save: "保存"
+    update: "更新"
+  cheesecake:
+    changes:
+      details: "更改详情"
+      none: "沒有更改"
+      save: "保存更改"
+      saving: "保存中..."
+    form:
+      editing: "编辑中..."
+      fields:
+        color: "颜色"
+        name: "姓名"
+        permissions: "权限"
+        subsector: "界别分组"
+    select:
+      hint: "点击图片以便选择"
+  comment:
+    input: "请填写评论..."
+    confirm_delete: "删除评论?"
+    name: "评论"
+    one: "一篇评论"
+    title:
+      one: "评论"
+      other: "所有评论"
+    view_all: "查看所有评论 "
+  contact:
+    addressbook: "我的通讯录"
+    all_n: "所有联系(%{count})"
+    confirm_delete: "刪除联系?"
+    current: "近期"
+    delete: "刪除"
+    edit:
+      title: "编辑联络 %{name}"
+      submit: "编辑联络"
+    error_count:
+      one: "一个错误导致不能保存这个联络 :"
+      other: "%{count} 有一些错误导致不能保存这个联络:"
+    follow: "关注"
+    following: "关注中"
+    graph:
+      one: "图片"
+      empty: "对不起, 您沒有任何联系人. 您可以通过查找功能去查找可能认识的朋友!"
+    in_common:
+      one: "一个共同联系人"
+      other: "%{count} 共同联系人"
+    new:
+      link: "+ 加入联络"
+      title: "加入 %{name} 到您的联系人列表"
+      menu: "加入联络"
+      submit: "加入联络"
+    one: "联络"
+    other: "联系"
+    pending:
+      other: "暂缓"
+      all: "所有"
+      all_n: "查看所有暂缓申请 (%{count})"
+    relation:
+      one: "联络类别"
+      new: "新类别"
+    reply:
+      link: "+ 回复联系人"
+      title: "回复联络申请至 %{name}"
+      submit: "回复"
+      link: "+ 回复联系人"
+    suggestion:
+      one: "建议"
+      other: "建议"
+      all: "所有"
+    type:
+      new: "+ 新类别"
+    unfollow: "不再关注"
+  copyright: "2010 版权 - 版权所有"
+  delete:
+    confirm: 刪除 %{element}}?
+  devise:
+    links:
+      sign_in: "登录"
+      sign_up: "注册"
+      forgot_password: "忘了您的密码?"
+      confirmation_instructions: "还没收到激活指引吗?"
+      unlock_instructions: "还没收到解锁指引吗?"
+      sign_in_with: "以 %{provider} 登录"
+    passwords:
+      confirm: "确认密码"
+      forgot: "忘了?"
+      instructions: "请输入你的帐号关联的邮箱, 以便我们给您发送更改指示:"
+      update: "更改您的密码"
+  follower:
+    follower:
+      title: "粉丝"
+    following:
+      title: "关注"
+    n:
+      one: "一个粉丝"
+      other: "%{count} 粉丝"
+  forgot_password: "忘了您的密码吗?"
+  frontpage:
+    collaborate:
+      default: "合作"
+      sentence1: "组织您的习作和活动"
+      sentence2: "参与会议和活动"
+      sentence3: "创建您的群组和会议"
+    elements:
+      comments: "评论"
+      conferences: "发布会"
+      networks: "社交网络"
+      organizers: "主办单位"
+      participants: "参加者"
+      groups: "群组"
+      tags: "标记"
+    main_title: "社交视频互动是我们建立社交网的核心."
+    meet:
+      default: "认识"
+      sentence1: "认识有趣的人和群组"
+      sentence2: " 寻找于你相关的最新活动"
+    register: "请注册!"
+    share:
+      default: "分享"
+      sentence1: " 您的习作和活动"
+      sentence2: "近况, 照片, 音频 和 视频"
+    stats: "%{users} 用户 和 %{groups} 已注册的群组"
+  group:
+    one: "群组"
+    other: "群组"
+    all: "所有群组"
+    all_n: "所有群组 (%{count})"
+    by: "被群组"    
+    destroy:
+      one: "删除群组"
+      explanation: "所有和这个群组相关的活动的资料和联系会被删除!"
+      go_ahead: "是, 我肯定. 删除所有東西!"
+      last_confirm: "这是您最后机会. 您肯定吗?"
+    form:
+      title: "群组"
+    input: "这个群组叫什么名称?"
+    last: "最後的群组"
+    my: "我的群组"
+    new:
+      action: "新群组"
+      name: "名称"
+      description: "描述"
+      participants: "参与者"
+    cloud: "群组标记云"
+    most:
+      followed: "最多人关注"
+      liked: "最受欢迎"
+    tags: "标记"
+    title:
+      one: "群组"
+      other: "群组们"
+  help: "帮助"
+  helpers:
+    submit:
+      relation_custom:
+        create: "保存"
+        update: "更新"
+  home: "主页"
+  inbox:
+    one: "收件箱"
+  invitation:
+    e-mails: "电子邮箱"
+    error: "您的申请未能被处理. 请确定您的邮箱地址是否正确无误."
+    invited: "%{sender} 已邀请您到 %{site}!"
+    join: "邀请其他人加入 %{site}!"
+    join_me: "跟我一起在 %{site}!"
+    one: "邀请"
+    other: "邀请"
+    toolbar: "邀请"
+    success: "您的邀请已成功发送"
+    text: "写上您的讯息"
+  like:
+    n:
+      one: "一个粉丝"
+      other: "%{count} 粉丝们"
+  location:
+    message: "您在此 > %{location}"
+    base: "您在此"
+    separator: " > "
+  mailboxer:
+    delete: "刪除"
+    delete_confirm: "您要把 '%{object}' 移除到垃圾桶?"
+    form:
+      body: "主体"
+      recipients: "收件人"
+      subject: "主题"
+    mark_as_read: "标记已读"
+    message_mailer:
+      has_sent_new: 
+        event: "己发送新讯息 %{receiver}"
+        group: "己发送新讯息 %{receiver}"
+        user: "己给您发送新讯息"
+      has_sent_reply: 
+        event: "已给您回复 %{receiver}"
+        group: "已给您回复 %{receiver}"
+        user: "已给您回复"
+      subject_new: "%{subject}"
+      subject_reply: "%{subject}"
+    notification_mailer:
+      subject: "%{subject}"
+    reply: "回复"
+    send: "发送讯息"
+    sent: "您的讯息已发送"
+  menu:
+    options: "菜單选择"
+    information: "个人资料"
+    wall: "最新發佈"
+  message:
+    answer: "写上答案"
+    inbox: "收件箱"
+    look: "请留意这个对话"
+    new: "新讯息"
+    one: "讯息"
+    other: "讯息"
+    participants: "参与者"
+    send: "发送讯息"
+    sentbox: "寄件备份"
+    trash: "垃圾桶"
+  notification:
+    all_text: "在 %{url} 阅读所有內容"
+    confirm: "确定 %{sender} 作为联络?"
+    default: "您有新通知"
+    destroy_sure: "您是否想删除这个通知?"
+    fan: "%{sender} 现在是 %{whose} 粉丝."
+    follow:
+      chamber: "%{sender} 已加入 %{name}."
+      group: "%{sender} 已加到 %{who} 作为联络."
+      user: "%{sender} 已加到 %{who} 作为联络."
+    hello: "您好 %{receiver},"
+    join: 
+      one: "%{sender}參加了%{thing}%{title}."
+    like:
+      group: "%{sender} 喜欢 %{whose} %{thing}." 
+      user: "%{sender} 喜欢 %{whose} %{thing}."
+    look: "请看看这个 %{sender} 的最新发布"
+    makefriend:
+      group: "%{sender} 另加至 %{who} 作为联络."
+      user: "%{sender} 另加至 %{who} 作为联络."
+    one: "通知"
+    other: "通知"
+    post:
+      group: "%{title} -- %{sender} 發佈給 %{whose} "
+      user: "%{title} -- %{sender} 發佈給 %{whose} "
+    read: "标记已读"
+    read_all: "标记全部已读"
+    unread: "标记未读"
+    update:
+      group: "%{sender} 在 %{whose} 的最新发布已更新 %{thing} "
+      user: "%{sender} 在 %{whose} 的最新发布已更新 %{thing}"
+    visit: "浏览 %{url} 和检查您的所有通知."
+    watch: "在这里 %{url}查看这里"
+    watch_it: "查看这里!"
+    who:
+      group: "%{name}"
+      user: "您"
+    whose: 
+      group: "%{receiver} 的"
+      user: "您的"
+  post:
+    confirm_delete: "删除近況吗?"
+    form:
+      title: "近況"
+    input: "您有什么近況?"
+    name: "近況"
+    one: "一条近況"
+    title:
+      one: "近況"
+      other: "近況"
+  preposition:
+    and: "和"
+    on: "在上"
+  profile:
+    one: "个人背景资料"
+    age: "年齡"
+    is_on: "有效"
+    must_be_signed_id: "您必须持有有效证件"
+    group:
+      about: "关于我们"
+      birthday: "周年"
+      experience: "经验范畴"
+      info: "群组资料"
+      tags: "群组标记"
+    user:
+      about: "关于我"
+      birthday: "生日"
+      experience: "经验"
+      info: "个人资料"
+      tags: "标记"
+    actualcity: "上课城市"
+    address: "地址"
+    contact: "联络资料"
+    country: "国家"
+    email: "邮箱"
+    empty: "这些空格未填上. 请更新."
+    fax: "传真"
+    mobile: "手机"
+    organization: "组织"
+    phone: "电话"
+    profile: "编辑个人背景资料"
+    tags:
+      default: "社交, 视频,"
+      other: "标记"
+    website: "网站" 
+    update:
+      error: "请重组您的个人背景资料:"
+      success: "您的个人背景资料已更新"     
+  public:
+    other: "大家"
+  permission:
+    description:
+      default:
+        brief:
+          create: 
+            activity: "贴到您的最新发布"
+          follow:
+            nil: "关注他们的活动"
+          read:
+            activity: "阅读您的最新发布"
+          represent:
+            nil: "管理"
+          notify:
+            nil: "通知"
+        detailed:
+          create:
+            activity:
+              positive: "他们将会在您的最新发布标贴新的活动"
+              negative: "他们不能在您的最新发布标贴新的活动"
+          follow:
+            nil:
+              positive: "已有联系的活动 %{relation} 将出现在您主页的最新发布上"
+              negative: "已有联系的活动 %{relation} 将不会出现在您主页的最新发布上"
+          read:
+            activity:
+              positive: "他们能夠阅读在您的最新发布的內容, 除了那些有特別联系的分享"
+              negative: "他们能夠阅读在您的最新发布的內容, 除了那些被标识为公开"
+          represent:
+            nil:
+              positive: "他们将更改环节及作为 %{subject}"
+              negative: "他们不能更改环节及作为 %{subject}"
+          notify:
+            nil:
+              positive: "活动将会通知 %{name} 的联系"
+              negative: "活动将不会通知 %{name} 的联系"
+    of_relation:
+      choose: "2. <strong>%{name}</strong>圈內的权限"
+  privacy:
+    intro: "拥有 <strong>%{relation}</strong>级别的联系只容许作出以下行为:"
+    rule:
+      add: "加上"
+      title: "私隐规则"
+      saved: "私隐规则己保存"
+  relation_custom:
+    choose: "1. 选择圈子"
+    confirm_delete: "删除这个圈子?"
+    delete: "刪除"
+    edit: "更改名称"
+    new: "+ 新圈子"
+    title: "私隐和內容"
+  relation_public:
+    name: "公众"
+  representation:
+    notice: "您的环节已更改. 现在您以%{subject}的身份行动. 请使用右上角菜单回到您的环节"
+    switch: "转换环节"
+  required: "(*) 以上空格必須填写"
+  search:
+    all_results: "查找所有 %{subject} (%{count})"
+    at_least: "写下最少两个字符"
+    global: 
+      name: "全球搜查"
+      first_result:
+        more: "展示首回 %{count} 结果."
+        one: "首回结果展示中."
+      query: "查看更多结果 %{query} >"
+    name: "搜索"
+    no_subject_found: "沒有搜索到关于 %{subject} 的结果."
+    nothing: "沒有查询到任何结果"
+    searching: "查找中: %{query}"
+    show_all: "所有"
+    write: "写下您的问题 ..."
+    wrong: "搜查器发生了问题"
+  settings:
+    api_key:
+      briefing: "管理您的API钥匙"
+      confirm: "您肯定吗?"
+      empty: "沒有"
+      explanation: "这是您的的 API 钥匙"
+      name: "API 钥匙"
+      regenerate: "重新获取 API 钥匙"
+    cancel_account:
+      briefing: "让您注销帐号"
+    email_change:
+      briefing: "更改您的邮箱"
+    lang_change:
+      briefing: "更改您的语言"
+      name: "更改您的语言"
+    error: "当您保存更改时, 出现一些错误"
+    for: "为....设定"
+    main: "设定"
+    manage:
+      name: "行政联络"
+      briefing: "联系设定"
+      explanation: "更改联系允许"
+    notifications:
+      briefing: "关于通知行为和邮件提示的设定"
+      name: "通知"
+      by_email:
+        name: "当我收到通知时发邮件给我"
+        always: "经常"
+        never: "永不"
+    one: "设定"
+    password_change:
+      briefing: "更改密码"
+    success: "您的设定已成功更改"
+  share: "Share"
+  sign_in: "登录"
+  sign_out: "退出"
+  sign_up: "注册"
+  site:
+    name: "Gocess.com"
+  subject:
+    this_is_you: "这是您!"
+  sure: "您肯定吗?"
+  time:
+    ago: "%{time} 之前"
+  unknown: "不明"
+  user:
+    all: "所有用户"
+    all_n: "所有用户 (%{count})"
+    by: "被用户"
+    one: "用户"
+    other: "用户们"
+    title:
+      one: "用户"
+      other: "用户们"
+  welcome: "欢迎来到 %{site}!"
+  lang:
+    browser: "自动搜查浏览器语言"
+    none: "语言自主內容"

data/base/db/migrate/20121031111857_create_sites.rb

@@ -0,0 +1,9 @@
+class CreateSites < ActiveRecord::Migration
+  def change
+    create_table :sites do |t|
+      t.text :config
+
+      t.timestamps
+    end
+  end
+end

data/base/lib/social_stream/base/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Base
-    VERSION = "0.24.0".freeze
+    VERSION = "0.24.1".freeze
   end
 end

data/base/lib/social_stream/controllers/objects.rb

@@ -77,6 +77,7 @@ module SocialStream
       def set_author_ids
         resource_params.first[:author_id] = current_subject.try(:actor_id)
         resource_params.first[:user_author_id] = current_user.try(:actor_id)
+        resource_params.first[:owner_id] ||= current_subject.try(:actor_id)
       end
 
       def collection_variable_get

data/base/spec/models/site_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Site do
+  it "should access configuration" do
+    Site.current.config[:test] = "test"
+
+    Site.current.config[:test].should eq("test")
+  end
+
+  it "should save configuration" do
+    Site.current.config[:test] = "test"
+
+    Site.current.save!
+
+    Site.instance_variable_defined?("@current").should be_true
+
+    Site.instance_variable_set "@current", nil
+
+    Site.current.config[:test].should eq("test")
+  end
+end

data/events/lib/social_stream/events/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Events
-    VERSION = "0.16.0".freeze
+    VERSION = "0.16.1".freeze
   end
 end

data/events/social_stream-events.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.24.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.24.1')
   s.add_runtime_dependency('rails-scheduler', '~> 0.0.8')
 
   # Development Gem dependencies

data/events/vendor/assets/javascripts/fullcalendar.js

@@ -1,6 +1,6 @@
 /**
  * @preserve
- * FullCalendar v1.5.2
+ * FullCalendar v1.5.4
  * http://arshaw.com/fullcalendar/
  *
  * Use fullcalendar.css for basic styling.
@@ -11,7 +11,7 @@
  * Dual licensed under the MIT and GPL licenses, located in
  * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
  *
- * Date: Sun Aug 21 22:06:09 2011 -0700
+ * Date: Tue Sep 4 23:38:33 2012 -0700
  *
  */
  
@@ -111,7 +111,7 @@ var rtlDefaults = {
 
 
 
-var fc = $.fullCalendar = { version: "1.5.2" };
+var fc = $.fullCalendar = { version: "1.5.4" };
 var fcViews = fc.views = {};
 
 
@@ -1658,7 +1658,7 @@ function sliceSegs(events, visEventEnds, start, end) {
 				msLength: segEnd - segStart
 			});
 		}
-	} 
+	}
 	return segs.sort(segCmp);
 }
 
@@ -1742,29 +1742,26 @@ function setOuterHeight(element, height, includeMargins) {
 }
 
 
-// TODO: curCSS has been deprecated (jQuery 1.4.3 - 10/16/2010)
-
-
 function hsides(element, includeMargins) {
 	return hpadding(element) + hborders(element) + (includeMargins ? hmargins(element) : 0);
 }
 
 
 function hpadding(element) {
-	return (parseFloat($.curCSS(element[0], 'paddingLeft', true)) || 0) +
-	       (parseFloat($.curCSS(element[0], 'paddingRight', true)) || 0);
+	return (parseFloat($.css(element[0], 'paddingLeft', true)) || 0) +
+	       (parseFloat($.css(element[0], 'paddingRight', true)) || 0);
 }
 
 
 function hmargins(element) {
-	return (parseFloat($.curCSS(element[0], 'marginLeft', true)) || 0) +
-	       (parseFloat($.curCSS(element[0], 'marginRight', true)) || 0);
+	return (parseFloat($.css(element[0], 'marginLeft', true)) || 0) +
+	       (parseFloat($.css(element[0], 'marginRight', true)) || 0);
 }
 
 
 function hborders(element) {
-	return (parseFloat($.curCSS(element[0], 'borderLeftWidth', true)) || 0) +
-	       (parseFloat($.curCSS(element[0], 'borderRightWidth', true)) || 0);
+	return (parseFloat($.css(element[0], 'borderLeftWidth', true)) || 0) +
+	       (parseFloat($.css(element[0], 'borderRightWidth', true)) || 0);
 }
 
 
@@ -1774,20 +1771,20 @@ function vsides(element, includeMargins) {
 
 
 function vpadding(element) {
-	return (parseFloat($.curCSS(element[0], 'paddingTop', true)) || 0) +
-	       (parseFloat($.curCSS(element[0], 'paddingBottom', true)) || 0);
+	return (parseFloat($.css(element[0], 'paddingTop', true)) || 0) +
+	       (parseFloat($.css(element[0], 'paddingBottom', true)) || 0);
 }
 
 
 function vmargins(element) {
-	return (parseFloat($.curCSS(element[0], 'marginTop', true)) || 0) +
-	       (parseFloat($.curCSS(element[0], 'marginBottom', true)) || 0);
+	return (parseFloat($.css(element[0], 'marginTop', true)) || 0) +
+	       (parseFloat($.css(element[0], 'marginBottom', true)) || 0);
 }
 
 
 function vborders(element) {
-	return (parseFloat($.curCSS(element[0], 'borderTopWidth', true)) || 0) +
-	       (parseFloat($.curCSS(element[0], 'borderBottomWidth', true)) || 0);
+	return (parseFloat($.css(element[0], 'borderTopWidth', true)) || 0) +
+	       (parseFloat($.css(element[0], 'borderBottomWidth', true)) || 0);
 }
 
 
@@ -1956,7 +1953,6 @@ function firstDefined() {
 }
 
 
-
 fcViews.month = MonthView;
 
 function MonthView(element, calendar) {
@@ -5157,6 +5153,7 @@ function HoverListener(coordinateGrid) {
 	
 	
 	function mouse(ev) {
+		_fixUIEvent(ev); // see below
 		var newCell = coordinateGrid.cell(ev.pageX, ev.pageY);
 		if (!newCell != !cell || newCell && (newCell.row != cell.row || newCell.col != cell.col)) {
 			if (newCell) {
@@ -5180,6 +5177,19 @@ function HoverListener(coordinateGrid) {
 	
 }
 
+
+
+// this fix was only necessary for jQuery UI 1.8.16 (and jQuery 1.7 or 1.7.1)
+// upgrading to jQuery UI 1.8.17 (and using either jQuery 1.7 or 1.7.1) fixed the problem
+// but keep this in here for 1.8.16 users
+// and maybe remove it down the line
+
+function _fixUIEvent(event) { // for issue 1168
+	if (event.pageX === undefined) {
+		event.pageX = event.originalEvent.pageX;
+		event.pageY = event.originalEvent.pageY;
+	}
+}
 function HorizontalPositionCache(getElement) {
 
 	var t = this,
@@ -5206,5 +5216,5 @@ function HorizontalPositionCache(getElement) {
 	};
 	
 }
-
+
 })(jQuery);

data/events/vendor/assets/stylesheets/fullcalendar.css

@@ -1,11 +1,11 @@
 /*
- * FullCalendar v1.5.2 Stylesheet
+ * FullCalendar v1.5.4 Stylesheet
  *
  * Copyright (c) 2011 Adam Shaw
  * Dual licensed under the MIT and GPL licenses, located in
  * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
  *
- * Date: Sun Aug 21 22:06:09 2011 -0700
+ * Date: Tue Sep 4 23:38:33 2012 -0700
  *
  */
 

data/events/vendor/assets/stylesheets/fullcalendar.print.css

@@ -1,5 +1,5 @@
 /*
- * FullCalendar v1.5.2 Print Stylesheet
+ * FullCalendar v1.5.4 Print Stylesheet
  *
  * Include this stylesheet on your page to get a more printer-friendly calendar.
  * When including this stylesheet, use the media='print' attribute of the <link> tag.
@@ -9,7 +9,7 @@
  * Dual licensed under the MIT and GPL licenses, located in
  * MIT-LICENSE.txt and GPL-LICENSE.txt respectively.
  *
- * Date: Sun Aug 21 22:06:09 2011 -0700
+ * Date: Tue Sep 4 23:38:33 2012 -0700
  *
  */
  

data/lib/social_stream/version.rb

@@ -1,3 +1,3 @@
 module SocialStream
-  VERSION = "0.30.0".freeze
+  VERSION = "0.30.1".freeze
 end

data/social_stream.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 0.24.0')
+  s.add_runtime_dependency('social_stream-base', '~> 0.24.1')
   s.add_runtime_dependency('social_stream-documents', '~> 0.18.0')
-  s.add_runtime_dependency('social_stream-events', '~> 0.16.0')
+  s.add_runtime_dependency('social_stream-events', '~> 0.16.1')
   s.add_runtime_dependency('social_stream-linkser', '~> 0.15.0')
   s.add_runtime_dependency('social_stream-presence', '~> 0.17.0')
   s.add_runtime_dependency('social_stream-ostatus', '~> 0.2.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: social_stream
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.30.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: social_stream-base
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.24.0
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: social_stream-documents
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: social_stream-linkser
   requirement: !ruby/object:Gem::Requirement
@@ -534,6 +534,7 @@ files:
 - base/app/models/relation/reject.rb
 - base/app/models/relation/single.rb
 - base/app/models/relation_permission.rb
+- base/app/models/site.rb
 - base/app/models/tie.rb
 - base/app/models/user.rb
 - base/app/views/activities/_activity.html.erb
@@ -667,6 +668,8 @@ files:
 - base/app/views/notifications/_notification.html.erb
 - base/app/views/notifications/activities/_follow.html.erb
 - base/app/views/notifications/activities/_follow.text.erb
+- base/app/views/notifications/activities/_join.html.erb
+- base/app/views/notifications/activities/_join.text.erb
 - base/app/views/notifications/activities/_like.html.erb
 - base/app/views/notifications/activities/_like.text.erb
 - base/app/views/notifications/activities/_make-friend.html.erb
@@ -744,6 +747,7 @@ files:
 - base/config/locales/pt.yml
 - base/config/locales/rails.es.yml
 - base/config/locales/rails.pt.yml
+- base/config/locales/zh.yml
 - base/config/routes.rb
 - base/db/migrate/20120326083509_create_social_stream.rb
 - base/db/migrate/20120403175913_create_activity_object_audiences.rb
@@ -752,6 +756,7 @@ files:
 - base/db/migrate/20120526171311_remove_activity_channels.rb
 - base/db/migrate/20120621135650_add_comment_count_to_activity_object.rb
 - base/db/migrate/20120627115244_fix_activity_object_follower_count.rb
+- base/db/migrate/20121031111857_create_sites.rb
 - base/lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
 - base/lib/acts_as_taggable_on/social_stream.rb
 - base/lib/generators/social_stream/base/install_generator.rb
@@ -908,6 +913,7 @@ files:
 - base/spec/models/profile_spec.rb
 - base/spec/models/relation_follow_spec.rb
 - base/spec/models/relation_spec.rb
+- base/spec/models/site_spec.rb
 - base/spec/models/tie_spec.rb
 - base/spec/models/user_spec.rb
 - base/spec/social_stream_activity_streams_spec.rb