social_stream-base 0.9.14 → 0.9.15

data/app/controllers/search_controller.rb

@@ -1,24 +1,24 @@
 class SearchController < ApplicationController
   include ActionView::Helpers::SanitizeHelper
+  
+  helper_method :get_search_query
 
-  #before_filter :authenticate_user! #??
-
-  FOCUS_SEARCH_PER_PAGE=16
+  RESULTS_SEARCH_PER_PAGE=15
   MIN_QUERY=2
+  
   def index
-    @search_class_sym = params[:focus].singularize.to_sym unless params[:focus].blank?
     if params[:search_query].blank? or too_short_query
-      @search_result = nil_search
+    @search_result = []
     else
       if params[:mode].eql? "header_search"
-        @search_result = header_search
-        render :partial => "header_search", :locals => {:search_result => @search_result}
+        @search_result = search :quick
+        render :partial => "header_search"
       return
       else
         if params[:focus].present?
           @search_result = focus_search
         else
-          @search_result = global_search
+          @search_result = search :extended
         end
       end
     end
@@ -30,6 +30,25 @@ class SearchController < ApplicationController
 
   private
 
+  def search mode
+    models = SocialStream.extended_search_models
+    models = SocialStream.quick_search_models if mode.to_s.eql? "quick"
+    models.map! {|model_sym| model_sym.to_s.classify.constantize}
+    result = ThinkingSphinx.search(get_search_query, :classes => models)
+    if mode.to_s.eql? "quick"
+      result.page(1).per(7)
+    else
+      result.page(params[:page]).per(RESULTS_SEARCH_PER_PAGE)
+    end
+    return result
+  end
+
+  def focus_search
+    @search_class_sym = params[:focus].singularize.to_sym unless params[:focus].blank?
+    search_class = @search_class_sym.to_s.classify.constantize
+    ThinkingSphinx.search(get_search_query, :classes => [search_class]).page(params[:page]).per(RESULTS_SEARCH_PER_PAGE)
+  end
+
   def too_short_query
     bare_query = strip_tags(params[:search_query]) unless bare_query.html_safe?
     return bare_query.strip.size < MIN_QUERY
@@ -45,41 +64,4 @@ class SearchController < ApplicationController
     end
     return search_query.strip
   end
-
-  def global_search
-    return search 6
-  end
-
-  def header_search
-    return search 3
-  end
-
-  def search max_results
-    result = Hash.new
-    total_shown = 0
-    SocialStream.subjects.each do |subject_sym|
-      result.update({subject_sym => ThinkingSphinx.search(get_search_query, :classes => [subject_sym.to_s.classify.constantize]).page(1).per(max_results)})
-      result.update({(subject_sym.to_s+"_total").to_sym => ThinkingSphinx.count(get_search_query, :classes => [subject_sym.to_s.classify.constantize])})
-    end
-    return result
-  end
-
-  def focus_search
-    string_class = params[:focus].singularize
-    search_class = string_class.classify.constantize
-    return ThinkingSphinx.search(get_search_query, :classes => [search_class]).page(params[:page]).per(FOCUS_SEARCH_PER_PAGE)
-  end
-
-  def nil_search
-    if params[:focus].present?
-      result = []
-    else
-      result = Hash.new
-      SocialStream.subjects.each do |subject_sym|
-        result.update({subject_sym => []})
-        result.update({(subject_sym.to_s+"_total").to_sym => 0})
-      end
-    end
-    return result
-  end
 end

data/app/helpers/contacts_helper.rb

@@ -7,11 +7,7 @@ module ContactsHelper
     if c.reflexive?
       t('subject.this_is_you')
     else
-      link_to(c.status,
-              edit_contact_path(c),
-              :title => t("contact.#{ c.action }.title", :name => c.receiver.name)) +
-        "<br/>".html_safe +
-        link_to(t('actor.delete'), contact_path(c), :action => :destroy, :confirm => t('actor.confirm_delete'), :remote => true)
+      render :partial => 'contacts/link', :locals => { :contact => c }
     end
 
   end

data/app/helpers/search_helper.rb

@@ -1,8 +1,8 @@
 module SearchHelper  
-  def subject_with_details subject
-    subject = subject.subject if subject.is_a? Actor    
-    render :partial => subject.class.to_s.pluralize.downcase + '/' + subject.class.to_s.downcase + '_with_details',
-           :locals => {subject.class.to_s.downcase.to_sym => subject}
+  def model_with_details model
+    model = model.model if model.is_a? Actor    
+    render :partial => model.class.to_s.pluralize.downcase + '/' + model.class.to_s.downcase + '_with_details',
+           :locals => {model.class.to_s.downcase.to_sym => model}
   end
   
   def focus_search_link text, search_class, query

data/app/models/actor.rb

@@ -15,8 +15,6 @@ class Actor < ActiveRecord::Base
   include SocialStream::Models::Supertype
   include SocialStream::Models::Object
   
-  delegate :tag_list, :tag_list=, :tagged_with, :tag_counts, :to => :activity_object
-  
   validates_presence_of :name, :subject_type
   
   acts_as_messageable
@@ -159,7 +157,7 @@ class Actor < ActiveRecord::Base
         when String
           emails << receiver_emails
         when Array
-          receveir_emails.each do |receveir_email|
+          receiver_emails.each do |receiver_email|
             emails << receiver_email
           end
         end

data/app/views/activity_objects/_activity_object.html.erb

@@ -2,6 +2,6 @@
   <%= render activity_object.object %>
 <% else %>
   <div class="block">
-    <%= subject_with_details activity_object.object %>
+    <%= model_with_details activity_object.object %>
   </div>
 <% end %>

data/app/views/contacts/_link.html.erb

@@ -0,0 +1,9 @@
+<%= link_to(contact.status, edit_contact_path(contact),
+            :title => t("contact.#{ contact.action }.title", :name => contact.receiver.name)) %>
+
+<% if controller.controller_name == "contacts" %>
+
+<br/>
+<%= link_to(t('contact.delete'), contact_path(contact), :action => :destroy, :confirm => t('contact.confirm_delete'), :remote => true) %>
+
+<% end %>

data/app/views/frontpage/_caracteristics.html.erb

@@ -0,0 +1,23 @@
+<div id="caracteristics">
+  <ul>
+    <li class="participants">
+        <%= t('frontpage.elements.participants') %>
+    </li>
+    <li class="organizers">
+        <%= t('frontpage.elements.organizers') %>
+    </li>
+    <li class="spaces">
+        <%= t('frontpage.elements.groups') %>
+    </li>
+    <li class="comments">
+        <%= t('frontpage.elements.comments') %>
+    </li>
+    <li class="tags">
+        <%= t('frontpage.elements.tags') %>
+    </li>
+    <li class="networks">
+        <%= t('frontpage.elements.networks') %>
+    </li>
+  </ul>
+</div>
+

data/app/views/frontpage/index.html.erb

@@ -1,5 +1,5 @@
 <% content_for :title do%>
-  <%= t('welcome') %>
+  <%= t('welcome', :site => t('site.name')) %>
 <%end%>
 
 <div class="banner_busqueda">
@@ -40,6 +40,7 @@
     <div class="sentences">
       <ul>
         <li class="green"><%= t('frontpage.meet.sentence1') %></li>
+        <li class="green"><%= t('frontpage.meet.sentence2') %></li>
       </ul>
     </div>
   </div>
@@ -65,30 +66,7 @@
 </div>
 
 <div id="wrapper_right">
-  <div id="caracteristics">
-    <ul>
-      <li class="participants">
-          <%= t('frontpage.elements.participants') %>
-      </li>
-      <li class="organizers">
-          <%= t('frontpage.elements.organizers') %>
-      </li>
-      <li class="spaces">
-          <%= t('frontpage.elements.groups') %>
-      </li>
-      <li class="comments">
-          <%= t('frontpage.elements.comments') %>
-      </li>
-      <li class="tags">
-          <%= t('frontpage.elements.tags') %>
-      </li>
-      <li class="networks">
-          <%= t('frontpage.elements.networks') %>
-      </li>
-    </ul>
-  </div>
+  <%= render :partial => 'frontpage/caracteristics' %>
 </div>
 
 <div id="espacio_body_bottom"></div>
-
-

data/app/views/groups/_index.html.erb

@@ -5,7 +5,7 @@
 <div class="row">
   <% end %>
   <div class="label">
-    <%= subject_with_details group %>
+    <%= model_with_details group %>
   </div>
   <% if ((cont%2) == 0) 	%>
 </div>

data/app/views/invitation_mailer/send_invitation.html.erb

@@ -7,11 +7,11 @@
     <div>
       <div>
         <div style="padding: 10px 5px 5px 5px;">
-          <span id="name" style="font-weight: bold;"><%= @sender.name %></span> has invited you to <%= link_to( t('site.name'), new_user_registration_url)%>
+          <%= raw t('invitation.invited', :sender => "<span id=\"name\" style=\"font-weight: bold;\">#{ h @sender.name}</span>", :site => link_to(t('site.name'), new_user_registration_url)) %>
         </div>
         <div style="position: static;padding: 5px; border: #2A3890 solid 2px; background-color: #E1EEF5; margin:10px; min-height: 125px; width: 500px;">
           <div style="float:left; margin-right:7px; border: thin solid #D4E4EA; background-color: white; max-height: 119px;">
-            <img src="http://<%= ActionMailer::Base.default_url_options[:host] +@sender.logo.url(:profile)%>" alt="<%=@sender.name%>">
+            <img src="<%= root_url + @sender.logo.url(:profile)%>" alt="<%=@sender.name%>">
           </div>
           <div style=" margin: 5px 5px 5px 5px;">
             <p style="font-weight: bold; "><%= @sender.name %>
@@ -20,7 +20,7 @@
               <% end %>
             </p>       
             <% if @message.blank? %>
-              <p style="text-align: justify;"><%= t('invitation.join_me')%></p>         
+              <p style="text-align: justify;"><%= t('invitation.join_me', :site => t('site.name'))%></p>         
             <%else%>
               <p style="text-align: justify; font-style: italic;">"<%= @message%>"</p>
             <%end%>

data/app/views/invitation_mailer/send_invitation.text.erb

@@ -1,7 +1,7 @@
-<%= @sender.name %> has invited you to <%= t('site.name')%>: <%= new_user_registration_url%>
+<%= t('invitation.invited', :sender => @sender.name, :site => t('site.name')) %>: <%= new_user_registration_url%>
 
 <% if @message.blank? %>
-  <%= t('invitation.join_me')%>         
+  <%= t('invitation.join_me', :site => t('site.name'))%>         
 <%else%>
   "<%= @message%>"
 <%end%>
@@ -14,6 +14,7 @@
 
 <%= t('frontpage.meet.default')%>:
 <%= t('frontpage.meet.sentence1') %>
+<%= t('frontpage.meet.sentence2') %>
 
 <%= t('frontpage.collaborate.default')%>:
 <%= t('frontpage.collaborate.sentence1') %>

data/app/views/invitations/_new.html.erb

@@ -10,7 +10,7 @@
 
 <%= form_tag invitations_path, :method=> :post, :class => "invitation_form", :remote => true  do %>
   <div class="block">   
-    <h3 class= "form_row"><%=t('invitation.join')%></h3>
+    <h3 class= "form_row"><%=t('invitation.join', :site => t('site.name'))%></h3>
     <div class="form_row form_label ">
       <%= label_tag t('invitation.e-mails')%>
       <span class= "form_comment">(Separated by commas)</span>
@@ -30,4 +30,4 @@
   <div class="form_row space_center">
     <%= submit_tag t('action.send'), :class => "button" %>
   </div>
-<%end%>
+<%end%>

data/app/views/layouts/_header_dropdown_menu.html.erb

@@ -1,7 +1,7 @@
 <div id="header_dropdown_menu">
   <ul class="sf-menu" >
     <li class="header_dropdown_li">
-      <a href="#" class="sf-with-ul" id="current_subject_avatar_img" style="background: transparent url('<%= image_path current_subject.logo.url(:representation)%>') no-repeat left top;"><%= truncate_name current_subject.name %><span class="sf-sub-indicator"> »</span></a>
+      <a href="#" class="sf-with-ul" id="current_subject_avatar_img" style="background: transparent url('<%= image_path current_subject.logo.url(:representation)%>') no-repeat left top;"><%= truncate_name current_subject.name, :length => 15 %><span class="sf-sub-indicator"> »</span></a>
       <ul>
         <%= render :partial => 'layouts/header_dropdown_menu_sessions'%>
         <li>

data/app/views/layouts/_header_dropdown_menu_sessions.html.erb

@@ -5,7 +5,7 @@
   <ul>
     <% representations.each do |representation| %>
     <li>
-      <%= link_to truncate_name(representation.name), { :s => representation.slug }, { :style => "background: transparent url('#{ image_path representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;" } %>
+      <%= link_to truncate_name(representation.name, :length => 15), { :s => representation.slug }, { :style => "background: transparent url('#{ image_path representation.logo.url(:representation)}') no-repeat left center;margin-left:2px;" } %>
     </li>
     <% end %>
   </ul>

data/app/views/posts/_new_activity.html.erb

@@ -1 +1 @@
-<%= render :partial => 'objects/new_activity', :locals => {:receiver => receiver, :object => Post.new(:text => t('activity.input')), :remote => true} %>
+<%= render :partial => 'objects/new_activity', :locals => {:receiver => receiver, :object => Post.new, :remote => true} %>

data/app/views/posts/_new_activity_fields.erb

@@ -1 +1,7 @@
 <%= f.text_field :text, :id => "input_activities", :size => 85 %>
+
+<%= javascript_tag do %>
+  $(function() {
+    $("#input_activities").Watermark("<%= I18n.t('post.input') %>","#666");
+  });
+<% end %>

data/app/views/search/_extended_search.html.erb

@@ -0,0 +1,14 @@
+<% if @search_result.empty? %>
+<div class="model_with_details">
+  <%= I18n.t('search.nothing') %>
+</div>
+<% else %>
+<% total = 0 %>
+<% @search_result.each do |model|%>
+<div class="subject_search_results block left">
+  <%= model_with_details model %>
+</div>
+<% end %>
+<br class="clearfloat">
+<%= paginate @search_result %>
+<% end %> 

data/app/views/search/_form.html.erb

@@ -8,12 +8,22 @@
       <div  id="focus_options" class="form_row search_row">
         <ul class="menu_plain_list">
           <li><%= link_to content_tag(:span,t('search.show_all'),:class => params[:focus].blank? ? 'global selected' : 'global'), search_path(:search_query => params[:search_query]), :remote => true %></li>
-          <% SocialStream.subjects.each do |subject| %>
-            <% selected_class = (params[:focus].present? and params[:focus].pluralize.downcase.eql?(subject.to_s.pluralize.downcase)) ? 'selected' : ''%>
-            <li><%= focus_search_link content_tag(:span, subject.to_s.pluralize.capitalize, 
-                                                  :class => selected_class + " " + subject.to_s.pluralize.downcase), 
-                                      subject.to_s.classify.constantize, 
-                                      params[:search_query] %></li>
+          <% SocialStream.extended_search_models.each do |model_sym| %>
+            <% selected_class = (params[:focus].present? and params[:focus].pluralize.downcase.eql?(model_sym.to_s.pluralize.downcase)) ? 'selected' : ''%>
+            <% disabled =ThinkingSphinx.count(get_search_query, :classes => [model_sym.to_s.classify.constantize])==0 %>
+            <% disabled_class = (disabled ? 'disabled' : '') %>
+            <li>
+            <% unless disabled %>
+              <%= focus_search_link content_tag(:span, model_sym.to_s.pluralize.capitalize, 
+                                                    :class => selected_class + " " + disabled_class + " " + model_sym.to_s.pluralize.downcase), 
+                                        model_sym.to_s.classify.constantize, 
+                                        params[:search_query] %>
+            <% else %>
+               <%= content_tag(:span, model_sym.to_s.pluralize.capitalize, 
+                               :class => selected_class + " " + disabled_class + " " + model_sym.to_s.pluralize.downcase,
+                               :title => I18n.t('search.no_subject_found', :subject => model_sym.to_s)) %>
+            <% end %>
+            </li>
           <% end %>
         </ul>
       </div>      
@@ -21,11 +31,11 @@
   </form>
 
 <%= javascript_tag do %>
-	$(document).ready(function() {
-	  $.preloadImages ("assets/mini-loading.gif");
-	  
-	  $('#search_form').submit(function() {
-	    query = $('#global_search_input').val();
+  $(function() {
+    $.preloadImages ("assets/mini-loading.gif");
+
+    $('#search_form').submit(function() {
+      query = $('#global_search_input').val();
       if((query=="")||(query.length < 2)||(query=="<%= t('search.write') %>")){
         $('#too_short_error').show();
         $('#global_search_input').removeClass("searching");
@@ -37,6 +47,8 @@
         $('#global_search_input').blur();
       }
       return true;
-	  });
-	});
+    });
+
+    $("#global_search_input").Watermark("<%= I18n.t('search.write') %>");
+  });
 <% end %>

data/app/views/search/_header_search.html.erb

@@ -1,22 +1,16 @@
 <% total = 0 %>
 <ul>
-<% SocialStream.subjects.each do |subject_type| %>  
-    <% unless @search_result[subject_type].empty? %>
-      <li class="title">
-        <%= subject_type.to_s.capitalize.pluralize %>
-      </li>
-      <% @search_result[subject_type].each do |subject|%>
+    <% unless @search_result.empty? %>
+      <% @search_result.each do |model|%>
         <% total+=1 %>
-        <li class="subject_result"><%= subject_with_details subject %></li>
+        <li class="result"><%= model_with_details model %></li>
       <% end %>
     <% end %>    
   </li>
-<% end %>
-
   <%= link_to raw('<li class="more">' + 
-              t('search.global.query', :query => truncate(params[:search_query],:length => 20)) + 
-              '<br>' +
-              t('search.global.first_result.' + (total==1 ? 'one' : 'more'), 
-              :count => total.to_s) + '</li>'), 
+                  t("search.global.first_result.#{ total == 1 ? 'one' : 'more' }", :count => total) +
+                  '<br>' +
+                  t('search.global.query', :query => truncate(h(params[:search_query]),:length => 20)) + 
+                  '</li>'), 
               search_path(:search_query => params[:search_query]) %>
 </ul>

data/app/views/search/_index.html.erb

@@ -7,11 +7,6 @@
 <%= render :partial => 'form' %> 
 </div>
 <div class="space_center"></div>
-<div class="space_center"></div>
 <div id="search_results" class="block">  
-  <% unless params[:focus].present? %>
-    <%= render :partial => 'global_search' %>
-  <% else %>
-    <%= render :partial => 'focus_search' %>
-  <% end %>
+    <%= render :partial => 'extended_search' %>
 </div>

data/app/views/search/_index_frontpage.html.erb

@@ -4,24 +4,8 @@
 	</div>
 </nav>
 <div id= "center_body">
-	<section id="content">
-		<%= location(link_to(t('search.global.name')))%>
-		<br class="clearfloat" />
-		<div class="space_center"></div>
-		<h2><%= t('search.name') %></h2>
-		<div class="space_center"></div>
-		<div id="search_form_div">
-			<%= render :partial => 'form' %>
-		</div>
-		<div class="space_center"></div>
-		<div class="space_center"></div>
-		<div id="search_results" class="block">
-			<% unless params[:focus].present? %>
-			<%= render :partial => 'global_search' %>
-			<% else %>
-			<%= render :partial => 'focus_search' %>
-			<% end %>
-		</div>
+	<section id="content">		
+    <%= render :partial => 'index' %>
 	</section>
 </div>
 <aside id="sidebar">

data/app/views/search/index.js.erb

@@ -1,4 +1,4 @@
-  $('#search_results').html("<% unless params[:focus].present? %><%= escape_javascript render :partial => 'global_search' %><% else %><%= escape_javascript render :partial => 'focus_search' %><% end %>");
+  $('#search_results').html("<%= escape_javascript render :partial => 'extended_search' %>");
   $('#search_form_div').html("<%= escape_javascript render :partial => 'form' %>");
   
   $('#focus_options ul li a span').removeClass('selected');

data/app/views/subjects/_subject_with_details.html.erb

@@ -1,4 +1,4 @@
-<div class="subject_with_details">
+<div class="model_with_details">
   <div class="logo">
     <%= link_to (image_tag(subject.logo.url , :size => "50x50", :alt => subject.name )), subject  %>
   </div>

data/app/views/toolbar/_home.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'toolbar/logo', :locals => {:subject => current_subject} %>
+<%= render :partial => 'toolbar/subject' %>
 
 <div class="block space_center">
 </div>

data/app/views/toolbar/_messages.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'toolbar/logo', :locals => {:subject => current_subject} %>
+<%= render :partial => 'toolbar/subject' %>
 
 <div class="block space_center">
 </div>

data/app/views/toolbar/_subject.html.erb

@@ -0,0 +1,10 @@
+<div class="model_with_details">
+  <div class="logo">
+    <%= link_to (image_tag(current_subject.logo.url , :size => "50x50", :alt => current_subject.name )), current_subject  %>
+  </div>
+  <div class="sub-block">
+    <div class="name black" >
+      <%= link_to truncate_name(current_subject.name, :length => 80), current_subject %>
+    </div>
+  </div>
+</div>

data/app/views/users/_index.html.erb

@@ -7,7 +7,7 @@
 <div class="row">
   <% end %>
   <div class="label">
-    <%= subject_with_details user %>
+    <%= model_with_details user %>
   </div>
   <% end %>
 

data/config/locales/en.yml

@@ -21,7 +21,6 @@ en:
       hidden: "Shared with spheres of %{audience}"
     confirm_delete: "Delete activity?"
     delete: "Delete"
-    input: "What are you doing?"
     last: "Last Activities"
     like: "I like"
     one: "Activity"
@@ -69,7 +68,9 @@ en:
     view_all: "View all comments"
   contact:
     all_n: "All contacts (%{count})"
+    confirm_delete: "Delete contact?"
     current: "Current"
+    delete: "Delete"
     edit:
       title: "Edit contact to %{name}"
       submit: "Edit contact"
@@ -126,19 +127,19 @@ en:
       comments: "Comments"
       networks: "Social Networks"
       organizers: "Organizers"
-      participants: "Participants"
+      participants: "Video conferences"
       groups: "Groups"
       tags: "Tags"
     main_title: "Social Stream is a core for building social network websites."
     meet:
       default: "Meet"
       sentence1: "Meet interesting people and groups"
+      sentence2: "Find last activity of your contacts"
     share:
       default: "Share"
-      sentence1: "Your contacts and relations"
-      sentence2: "Posts, comments and activities"
+      sentence1: "Your proyects and activities"
+      sentence2: "Posts, photos, audio and videos"
     stats: "%{users} users and %{groups} groups registered"
-  find: "Find"
   group:
     one: "Group"
     other: "Groups"
@@ -172,9 +173,9 @@ en:
   invitation:
     e-mails: "E-mail addresses"
     error: "Your request was unprocessable. Make sure you wrote correct e-mail addresses."
-    invited: " has invited you to Social Stream!"
-    join: "Invite other people to join Social Stream!"
-    join_me: "Join me at Social Stream!"
+    invited: "%{sender} has invited you to %{site}!"
+    join: "Invite other people to join %{site}!"
+    join_me: "Join me at %{site}!"
     one: "Invitation"
     other: "Invitations"
     toolbar: "Invite"
@@ -222,6 +223,7 @@ en:
     confirm_delete: "Delete post?"
     form:
       title: "Post"
+    input: "What are you doing?"
     title: "Posts"  
   preposition:
     and: "and"
@@ -261,12 +263,6 @@ en:
       success: "Your profile has been updated"     
   public:
     other: "Everybody"
-  representation:
-    action: "as"
-    change: "Change"
-  service:
-    one: "Service"
-    other: "Services"
   permission:
     description:
       brief:
@@ -296,9 +292,6 @@ en:
       add: "Add"
       title: "Privacy rules"
       saved: "Privacy rules saved"
-  products:
-    one: "Product"
-    other: "Products"
   relation_custom:
     choose: "1. Choose sphere"
     confirm_delete: "Delete this sphere?"
@@ -310,9 +303,7 @@ en:
     name: "Public"
   required: "(*) These fields are required"
   search:
-    actor:
-      none: "Nothing found"
-    all_subject_results: "Search all %{subject} (%{count})"
+    all_results: "Search all %{subject} (%{count})"
     at_least: "Write at least two characters"
     global: 
       name: "Global search"
@@ -322,6 +313,7 @@ en:
       query: "See more results for %{query} >"
     name: "Search"
     no_subject_found: "No %{subject} was found."
+    nothing: "Nothing found"
     searching: "Searching: %{query}"
     show_all: "Show all results"
     write: "Write your query ..."
@@ -367,5 +359,4 @@ en:
     other: "Users"
     all: "All users"
     all_n: "All users (%{count})"
-  welcome: "Welcome to Social Stream!"
-
+  welcome: "Welcome to %{site}!"