Merge branch 'backbone-stream'

Gemfile

@@ -73,6 +73,7 @@ gem 'jammit', '0.6.5'
 
 gem 'json', '1.5.2'
 gem 'vanna', :git => 'git://github.com/MikeSofaer/vanna.git'
+gem 'acts_as_api'
 
 # localization
 
@@ -128,6 +129,8 @@ group :test do
   gem 'cucumber-api-steps', '0.6', :require => false
   gem 'database_cleaner', '0.7.0'
   gem 'diaspora-client', :git => 'git://github.com/diaspora/diaspora-client.git'
+
+  gem 'timecop'
                           #"0.1.0", #:path => '~/workspace/diaspora-client'
   gem 'factory_girl_rails'
   gem 'fixture_builder', '0.3.1'

Gemfile.lock

@@ -85,6 +85,10 @@ GEM
       activemodel (= 3.0.11)
       activesupport (= 3.0.11)
     activesupport (3.0.11)
+    acts_as_api (0.3.11)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      rack (>= 1.1.0)
     addressable (2.2.4)
     archive-tar-minitar (0.5.2)
     arel (2.0.10)
@@ -413,6 +417,7 @@ GEM
       rack (>= 1.0.0)
     thor (0.14.6)
     tilt (1.3.3)
+    timecop (0.3.5)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
@@ -450,6 +455,7 @@ DEPENDENCIES
   SystemTimer (= 1.2.3)
   activerecord-import
   acts-as-taggable-on!
+  acts_as_api
   addressable (= 2.2.4)
   bundler (>= 1.0.0)
   capistrano (~> 2.9.0)
@@ -525,6 +531,7 @@ DEPENDENCIES
   sod!
   sqlite3
   thin (~> 1.3.1)
+  timecop
   twitter (= 2.0.2)
   typhoeus
   vanna!

app/controllers/application_controller.rb

@@ -13,8 +13,6 @@ class ApplicationController < ActionController::Base
   before_filter :set_git_header if (AppConfig[:git_update] && AppConfig[:git_revision])
   before_filter :set_grammatical_gender
 
-  prepend_before_filter :clear_gc_stats
-
   inflection_method :grammatical_gender => :gender
 
   helper_method :all_aspects,
@@ -85,10 +83,6 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def clear_gc_stats
-    GC.clear_stats if GC.respond_to?(:clear_stats)
-  end
-
   def redirect_unless_admin
     unless current_user.admin?
       redirect_to multi_url, :notice => 'you need to be an admin to do that'
@@ -135,20 +129,19 @@ class ApplicationController < ActionController::Base
     @tags ||= current_user.followed_tags
   end
 
-  def save_sort_order
-    if params[:sort_order].present?
-      session[:sort_order] = (params[:sort_order] == 'created_at') ? 'created_at' : 'updated_at'
-    elsif session[:sort_order].blank?
-      session[:sort_order] = 'created_at'
-    else
-      session[:sort_order] = (session[:sort_order] == 'created_at') ? 'created_at' : 'updated_at'
-    end
+  # @param stream_klass [Constant]
+  # @return [String] JSON representation of posts given a [Stream] constant.
+  def stream_json(stream_klass)
+    render_for_api :backbone, :json => stream(stream_klass).stream_posts, :root => :posts
+  end
+
+  def stream(stream_klass)
+    authenticate_user!
+    stream_klass.new(current_user, :max_time => max_time)
   end
 
   def default_stream_action(stream_klass)
-    authenticate_user!
-    save_sort_order
-    @stream = stream_klass.new(current_user, :max_time => max_time, :order => sort_order)
+    @stream = stream(stream_klass)
 
     if params[:only_posts]
       render :partial => 'shared/stream', :locals => {:posts => @stream.stream_posts}
@@ -157,10 +150,6 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def sort_order
-    is_mobile_device? ? 'created_at' : session[:sort_order]
-  end
-
   def max_time
     params[:max_time] ? Time.at(params[:max_time].to_i) : Time.now
   end

app/controllers/aspects_controller.rb

@@ -6,21 +6,29 @@ require File.join(Rails.root, "lib", 'stream', "aspect")
 
 class AspectsController < ApplicationController
   before_filter :authenticate_user!
-  before_filter :save_sort_order, :only => :index
   before_filter :save_selected_aspects, :only => :index
   before_filter :ensure_page, :only => :index
 
-  respond_to :html, :js
-  respond_to :json, :only => [:show, :create]
+  respond_to :html,
+             :js,
+             :json
 
   def index
+    @backbone = true
+    stream_klass = Stream::Aspect
     aspect_ids = (session[:a_ids] ? session[:a_ids] : [])
     @stream = Stream::Aspect.new(current_user, aspect_ids,
-                               :order => sort_order,
-                               :max_time => params[:max_time].to_i)
+                                 :max_time => params[:max_time].to_i)
 
-    if params[:only_posts]
-      render :partial => 'shared/stream', :locals => {:posts => @stream.stream_posts}
+    respond_with do |format|
+      format.html do
+        if params[:only_posts]
+          render :partial => 'shared/stream', :locals => {:posts => @stream.stream_posts}
+        else
+          render 'aspects/index'
+        end
+      end
+      format.json{ render_for_api :backbone, :json => @stream.stream_posts, :root => :posts }
     end
   end
 

app/controllers/blocks_controller.rb

@@ -1,6 +1,8 @@
 class BlocksController < ApplicationController
   before_filter :authenticate_user!
 
+  respond_to :html, :json
+
   def create
     block = current_user.blocks.new(params[:block])
 
@@ -10,7 +12,11 @@ class BlocksController < ApplicationController
     else
       notice = {:error => t('blocks.create.failure')}
     end
-    redirect_to :back, notice
+
+    respond_with do |format|
+      format.html{ redirect_to :back, notice }
+      format.json{ render :nothing => true, :status => 204 }
+    end
   end
 
   def destroy
@@ -19,7 +25,11 @@ class BlocksController < ApplicationController
     else
       notice = {:error => t('blocks.destroy.failure')}
     end
-    redirect_to :back, notice
+
+    respond_with do |format|
+      format.html{ redirect_to :back, notice }
+      format.json{ render :nothing => true, :status => 204 }
+    end
   end
 
   protected

app/controllers/comment_stream_controller.rb

@@ -5,7 +5,16 @@
 require File.join(Rails.root, 'lib','stream', 'comments')
 
 class CommentStreamController < ApplicationController
+
+  respond_to :html, :json
+
   def index
-    default_stream_action(Stream::Comments)
+    @backbone = true
+    stream_klass = Stream::Comments
+
+    respond_with do |format|
+      format.html{ default_stream_action(stream_klass) }
+      format.json{ stream_json(stream_klass) }
+    end
   end
 end

app/controllers/comments_controller.rb

@@ -6,8 +6,9 @@ class CommentsController < ApplicationController
   include ApplicationHelper
   before_filter :authenticate_user!, :except => [:index]
 
-  respond_to :html, :mobile, :except => :show
-  respond_to :js, :only => [:index]
+  respond_to :html,
+             :mobile,
+             :json
 
   rescue_from ActiveRecord::RecordNotFound do
     render :nothing => true, :status => 404
@@ -26,7 +27,7 @@ class CommentsController < ApplicationController
         Postzord::Dispatcher.build(current_user, @comment).post
 
         respond_to do |format|
-          format.js{ render(:create, :status => 201)}
+          format.json{ render :json => @comment.as_api_response(:backbone), :status => 201 }
           format.html{ render :nothing => true, :status => 201 }
           format.mobile{ render :partial => 'comment', :locals => {:post => @comment.post, :comment => @comment} }
         end
@@ -44,12 +45,14 @@ class CommentsController < ApplicationController
       current_user.retract(@comment)
       respond_to do |format|
         format.js { render :nothing => true, :status => 204 }
+        format.json { render :nothing => true, :status => 204 }
         format.mobile{ redirect_to @comment.post }
       end
     else
       respond_to do |format|
         format.mobile {redirect_to :back}
         format.js {render :nothing => true, :status => 403}
+        format.json { render :nothing => true, :status => 403 }
       end
     end
   end
@@ -63,13 +66,11 @@ class CommentsController < ApplicationController
 
     if @post
       @comments = @post.comments.includes(:author => :profile).order('created_at ASC')
-      render :layout => false
+      respond_with do |format|
+        format.json  { render :json => @post.comments.as_api_response(:backbone), :status => 200 }
+      end
     else
       raise ActiveRecord::RecordNotFound.new
     end
   end
-
-  def new
-    render :layout => false
-  end
 end

app/controllers/like_stream_controller.rb

@@ -5,7 +5,16 @@
 require File.join(Rails.root, 'lib','stream', 'likes')
 
 class LikeStreamController < ApplicationController
+
+  respond_to :html, :json
+
   def index
-    default_stream_action(Stream::Likes)
+    @backbone = true
+    stream_klass = Stream::Likes
+
+    respond_with do |format|
+      format.html{ default_stream_action(stream_klass) }
+      format.json{ stream_json(stream_klass) }
+    end
   end
 end

app/controllers/likes_controller.rb

@@ -9,19 +9,17 @@ class LikesController < ApplicationController
   respond_to :html, :mobile, :json
 
   def create
-    positive = (params[:positive] == 'true') ? true : false
     if target
-      @like = current_user.build_like(:positive => positive, :target => target)
+      @like = current_user.build_like(:target => target)
 
       if @like.save
-        Rails.logger.info("event=create type=like user=#{current_user.diaspora_handle} status=success like=#{@like.id} positive=#{positive}")
+        Rails.logger.info("event=create type=like user=#{current_user.diaspora_handle} status=success like=#{@like.id}")
         Postzord::Dispatcher.build(current_user, @like).post
 
         respond_to do |format|
-          format.js { render 'likes/update', :status => 201 }
           format.html { render :nothing => true, :status => 201 }
           format.mobile { redirect_to post_path(@like.post_id) }
-          format.json { render :json => {"id" => @like.id}, :status => 201 }
+          format.json{ render :json => @like.parent.as_api_response(:backbone), :status => 201 }
         end
       else
         render :nothing => true, :status => 422
@@ -36,13 +34,11 @@ class LikesController < ApplicationController
       current_user.retract(@like)
       respond_to do |format|
         format.any { }
-        format.js { render 'likes/update' }
-        format.json { render :nothing => true, :status => :ok}
+        format.json{ render :json => @like.parent.as_api_response(:backbone), :status => 202 }
       end
     else
       respond_to do |format|
         format.mobile { redirect_to :back }
-        format.js { render :nothing => true, :status => 403 }
         format.json { render :nothing => true, :status => 403}
       end
     end
@@ -52,12 +48,18 @@ class LikesController < ApplicationController
     if target
       @likes = target.likes.includes(:author => :profile)
       @people = @likes.map{|x| x.author}
-      render :layout => false
+
+      respond_to do |format|
+        format.all{ render :layout => false }
+        format.json{ render :json => @likes.as_api_response(:backbone) }
+      end
     else
       render :nothing => true, :status => 404
     end
   end
 
+  protected
+
   def target
     @target ||= if params[:post_id]
       current_user.find_visible_shareable_by_id(Post, params[:post_id])

app/controllers/mentions_controller.rb

@@ -5,7 +5,16 @@
 require File.join(Rails.root, 'lib','stream', 'mention')
 
 class MentionsController < ApplicationController
+
+  respond_to :html, :json
+
   def index
-    default_stream_action(Stream::Mention)
+    @backbone = true
+    stream_klass = Stream::Mention
+
+    respond_with do |format|
+      format.html{ default_stream_action(stream_klass) }
+      format.json{ stream_json(stream_klass) }
+    end
   end
 end

app/controllers/multis_controller.rb

@@ -5,7 +5,16 @@
 require File.join(Rails.root, 'lib', 'stream', 'multi')
 
 class MultisController < ApplicationController
+
+  respond_to :html, :json
+
   def index
-    default_stream_action(Stream::Multi)
+    @backbone = true
+    stream_klass = Stream::Multi
+
+    respond_with do |format|
+      format.html{ default_stream_action(stream_klass) }
+      format.json{ stream_json(stream_klass) }
+    end
   end
 end

app/controllers/people_controller.rb

@@ -84,6 +84,8 @@ class PeopleController < ApplicationController
   end
 
   def show
+    @backbone = true
+
     @person = Person.find_from_id_or_username(params)
 
     if remote_profile_with_no_user_session?
@@ -124,16 +126,15 @@ class PeopleController < ApplicationController
     end
 
     if params[:only_posts]
-      render :partial => 'shared/stream', :locals => {:posts => @stream.stream_posts}
+      respond_to do |format|
+        format.html{ render :partial => 'shared/stream', :locals => {:posts => @stream.stream_posts} }
+      end
     else
       respond_to do |format|
         format.all { respond_with @person, :locals => {:post_type => :all} }
-        format.json {
-          render :json => @person.to_json(:includes => params[:includes])
-        }
+        format.json{ render_for_api :backbone, :json => @stream.stream_posts, :root => :posts }
       end
     end
-
   end
 
   def retrieve_remote

app/controllers/posts_controller.rb

@@ -35,6 +35,7 @@ class PostsController < ApplicationController
       respond_to do |format|
         format.xml{ render :xml => @post.to_diaspora_xml }
         format.mobile{render 'posts/show.mobile.haml'}
+        format.json{ render :json => {:posts => @post.as_api_response(:backbone)}, :status => 201 }
         format.any{render 'posts/show.html.haml'}
       end
 
@@ -52,6 +53,7 @@ class PostsController < ApplicationController
       current_user.retract(@post)
       respond_to do |format|
         format.js {render 'destroy'}
+        format.json { render :nothing => true, :status => 204 }
         format.all {redirect_to multi_path}
       end
     else

app/controllers/reshares_controller.rb

@@ -1,6 +1,6 @@
 class ResharesController < ApplicationController
   before_filter :authenticate_user!
-  respond_to :js, :json
+  respond_to :json
 
   def create
     @reshare = current_user.build_post(:reshare, :root_guid => params[:root_guid])
@@ -9,6 +9,6 @@ class ResharesController < ApplicationController
       current_user.dispatch_post(@reshare, :url => post_url(@reshare), :additional_subscribers => @reshare.root.author)
     end
 
-    respond_with @reshare
+    render :json => @reshare.as_api_response(:backbone), :status => 201
   end
 end

app/controllers/share_visibilities_controller.rb

@@ -20,7 +20,7 @@ class ShareVisibilitiesController < ApplicationController
       @vis.hidden = !@vis.hidden
       if @vis.save
         update_cache(@vis)
-        render 'update'
+        render :nothing => true, :status => 200
         return
       end
     end

app/controllers/status_messages_controller.rb

@@ -4,11 +4,12 @@
 
 class StatusMessagesController < ApplicationController
   before_filter :authenticate_user!
-  
+
   before_filter :remove_getting_started, :only => [:create]
 
-  respond_to :html
-  respond_to :mobile
+  respond_to :html,
+             :mobile,
+             :json
 
   # Called when a user clicks "Mention" on a profile page
   # @param person_id [Integer] The id of the person to be mentioned
@@ -40,8 +41,7 @@ class StatusMessagesController < ApplicationController
   end
 
   def create
-    params[:status_message][:aspect_ids] = params[:aspect_ids]
-
+    params[:status_message][:aspect_ids] = [*params[:aspect_ids]]
     normalize_public_flag!
 
     @status_message = current_user.build_post(:status_message, params[:status_message])
@@ -69,9 +69,9 @@ class StatusMessagesController < ApplicationController
       end
 
       respond_to do |format|
-        format.js { render :create, :status => 201}
         format.html { redirect_to :back}
         format.mobile{ redirect_to multi_path}
+        format.json{ render :json => @status_message.as_api_response(:backbone), :status => 201 }
       end
     else
       unless photos.empty?
@@ -79,11 +79,8 @@ class StatusMessagesController < ApplicationController
       end
 
       respond_to do |format|
-        format.js {
-          errors = @status_message.errors.full_messages.collect { |msg| msg.gsub(/^Text/, "") }
-          render :json =>{:errors => errors}, :status => 422
-        }
-        format.html {redirect_to :back}
+        format.json { render :nothing, :status => 403 }
+        format.html { redirect_to :back }
       end
     end
   end

app/controllers/tag_followings_controller.rb

@@ -7,8 +7,16 @@ require File.join(Rails.root, 'lib', 'stream', 'followed_tag')
 class TagFollowingsController < ApplicationController
   before_filter :authenticate_user!
 
+  respond_to :html, :json
+
   def index
-    default_stream_action(Stream::FollowedTag)
+    @backbone = true
+    stream_klass = Stream::FollowedTag
+
+    respond_with do |format|
+      format.html{ default_stream_action(stream_klass) }
+      format.json{ stream_json(stream_klass) }
+    end
   end
 
   # POST /tag_followings

app/controllers/tags_controller.rb

@@ -12,19 +12,17 @@ class TagsController < ApplicationController
   helper_method :tag_followed?
 
   respond_to :html, :only => [:show]
-  respond_to :json, :only => [:index]
+  respond_to :json, :only => [:index, :show]
 
   def index
-    if params[:q] && params[:q].length > 1 && request.format.json?
+    if params[:q] && params[:q].length > 1
       params[:q].gsub!("#", "")
       params[:limit] = !params[:limit].blank? ? params[:limit].to_i : 10
       @tags = ActsAsTaggableOn::Tag.autocomplete(params[:q]).limit(params[:limit] - 1)
       prep_tags_for_javascript
 
       respond_to do |format|
-        format.json{
-          render(:json => @tags.to_json, :status => 200)
-        }
+        format.json{ render(:json => @tags.to_json, :status => 200) }
       end
     else
       respond_to do |format|
@@ -35,11 +33,18 @@ class TagsController < ApplicationController
   end
 
   def show
+    @backbone = true
+
     @stream = Stream::Tag.new(current_user, params[:name], :max_time => max_time, :page => params[:page])
 
-    if params[:only_posts]
-      render :partial => 'shared/stream', :locals => {:posts => @stream.stream_posts}
-      return
+    respond_with do |format|
+      format.html do
+        if params[:only_posts]
+          render :partial => 'shared/stream', :locals => {:posts => @stream.stream_posts}
+          return
+        end
+      end
+      format.json{ render_for_api :backbone, :json => @stream.stream_posts, :root => :posts }
     end
   end
 

app/controllers/vanna_controller.rb

@@ -28,7 +28,6 @@ class VannaController < Vanna::Base
   before_filter :set_git_header if (AppConfig[:git_update] && AppConfig[:git_revision])
   before_filter :which_action_and_user
   before_filter :all_aspects
-  prepend_before_filter :clear_gc_stats
   before_filter :set_grammatical_gender
 
   def ensure_http_referer_is_set
@@ -82,10 +81,6 @@ class VannaController < Vanna::Base
     WillPaginate::ViewHelpers.pagination_options[:next_label] = "#{I18n.t('next')} &raquo;"
   end
 
-  def clear_gc_stats
-    GC.clear_stats if GC.respond_to?(:clear_stats)
-  end
-
   def redirect_unless_admin
     unless current_user.admin?
       redirect_to multi_path, :notice => 'you need to be an admin to do that'

app/helpers/stream_helper.rb

@@ -11,21 +11,21 @@ module StreamHelper
     elsif controller.instance_of?(PeopleController)
       local_or_remote_person_path(@person, :max_time => time_for_scroll(opts[:ajax_stream], @stream))
     elsif controller.instance_of?(TagFollowingsController)
-      tag_followings_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream), :sort_order => session[:sort_order])
+      tag_followings_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream))
     elsif controller.instance_of?(CommunitySpotlightController)
-      spotlight_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream), :sort_order => session[:sort_order])
+      spotlight_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream))
     elsif controller.instance_of?(MentionsController)
-      mentions_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream), :sort_order => session[:sort_order])
+      mentions_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream))
     elsif controller.instance_of?(MultisController)
-      multi_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream), :sort_order => session[:sort_order])
+      multi_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream))
     elsif controller.instance_of?(PostsController)
-      public_stream_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream), :sort_order => session[:sort_order])
+      public_stream_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream))
     elsif controller.instance_of?(AspectsController)
-      aspects_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream), :a_ids => @stream.aspect_ids, :sort_order => session[:sort_order])
+      aspects_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream), :a_ids => @stream.aspect_ids)
     elsif controller.instance_of?(LikeStreamController)
-      like_stream_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream), :sort_order => session[:sort_order])
+      like_stream_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream))
     elsif controller.instance_of?(CommentStreamController)
-      comment_stream_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream), :sort_order => session[:sort_order])
+      comment_stream_path(:max_time => time_for_scroll(opts[:ajax_stream], @stream))
     else
       raise 'in order to use pagination for this new controller, update next_page_path in stream helper'
     end
@@ -40,11 +40,7 @@ module StreamHelper
   end
 
   def time_for_sort(post)
-    if controller.instance_of?(AspectsController)
-      post.send(session[:sort_order].to_sym)
-    else
-      post.created_at
-    end
+    post.created_at
   end
 
   def comments_expanded

app/models/aspect.rb

@@ -11,7 +11,7 @@ class Aspect < ActiveRecord::Base
   has_many :aspect_visibilities
   has_many :posts, :through => :aspect_visibilities, :source => :shareable, :source_type => 'Post'
   has_many :photos, :through => :aspect_visibilities, :source => :shareable, :source_type => 'Photo'
-  
+
   validates :name, :presence => true, :length => { :maximum => 20 }
 
   validates_uniqueness_of :name, :scope => :user_id, :case_sensitive => false

app/models/comment.rb

@@ -16,6 +16,16 @@ class Comment < ActiveRecord::Base
   extract_tags_from :text
   before_create :build_tags
 
+  # NOTE API V1 to be extracted
+  acts_as_api
+  api_accessible :backbone do |t|
+    t.add :id
+    t.add :guid
+    t.add :text
+    t.add :author
+    t.add :created_at
+  end
+
   xml_attr :text
   xml_attr :diaspora_handle
 

app/models/like.rb

@@ -11,6 +11,15 @@ class Like < ActiveRecord::Base
   xml_attr :target_type
   include Diaspora::Relayable
 
+  # NOTE API V1 to be extracted
+  acts_as_api
+  api_accessible :backbone do |t|
+    t.add :id
+    t.add :guid
+    t.add :author
+    t.add :created_at
+  end
+
   xml_attr :positive
   xml_attr :diaspora_handle
 

app/models/person.rb

@@ -10,13 +10,28 @@ class Person < ActiveRecord::Base
   include Encryptor::Public
   include Diaspora::Guid
 
+  # NOTE API V1 to be extracted
+  acts_as_api
+  api_accessible :backbone do |t|
+    t.add :id
+    t.add :name
+    t.add lambda { |person|
+      person.diaspora_handle
+    }, :as => :diaspora_id
+    t.add lambda { |person|
+      {:small => person.profile.image_url(:small),
+       :medium => person.profile.image_url(:medium),
+       :large => person.profile.image_url(:large) }
+    }, :as => :avatar
+  end
+
   xml_attr :diaspora_handle
   xml_attr :url
   xml_attr :profile, :as => Profile
   xml_attr :exported_key
 
   has_one :profile, :dependent => :destroy
-  delegate :last_name, :to => :profile
+  delegate :last_name, :image_url, :to => :profile
   accepts_nested_attributes_for :profile
 
   before_validation :downcase_diaspora_handle
@@ -59,7 +74,7 @@ class Person < ActiveRecord::Base
 
   scope :profile_tagged_with, lambda{|tag_name| joins(:profile => :tags).where(:profile => {:tags => {:name => tag_name}}).where('profiles.searchable IS TRUE') }
 
-  scope :who_have_reshared_a_users_posts, lambda{|user| 
+  scope :who_have_reshared_a_users_posts, lambda{|user|
     joins(:posts).where(:posts => {:root_guid => StatusMessage.guids_for_author(user.person), :type => 'Reshare'} )
   }
 
@@ -274,7 +289,7 @@ class Person < ActiveRecord::Base
   def self.url_batch_update(people, url)
     people.each do |person|
       person.update_url(url)
-    end 
+    end
   end
 
   # @param person [Person]

app/models/photo.rb

@@ -8,6 +8,20 @@ class Photo < ActiveRecord::Base
   include Diaspora::Commentable
   include Diaspora::Shareable
 
+  # NOTE API V1 to be extracted
+  acts_as_api
+  api_accessible :backbone do |t|
+    t.add :id
+    t.add :guid
+    t.add :created_at
+    t.add :author
+    t.add lambda { |photo|
+      { :small => photo.url(:thumb_small),
+        :medium => photo.url(:thumb_medium),
+        :large => photo.url(:scaled_full) }
+    }, :as => :sizes
+  end
+
   mount_uploader :processed_image, ProcessedImage
   mount_uploader :unprocessed_image, UnprocessedImage
 

app/models/post.rb

@@ -9,6 +9,41 @@ class Post < ActiveRecord::Base
   include Diaspora::Commentable
   include Diaspora::Shareable
 
+  attr_accessor :user_like
+
+  # NOTE API V1 to be extracted
+  acts_as_api
+  api_accessible :backbone do |t|
+    t.add :id
+    t.add :guid
+    t.add lambda { |post|
+      post.raw_message
+    }, :as => :text
+    t.add :public
+    t.add :created_at
+    t.add :comments_count
+    t.add :likes_count
+    t.add :reshares_count
+    t.add :last_three_comments
+    t.add :provider_display_name
+    t.add :author
+    t.add :post_type
+    t.add :photos_count
+    t.add :image_url
+    t.add :object_url
+    t.add :root
+    t.add :o_embed_cache
+    t.add :user_like
+    t.add :mentioned_people
+    t.add lambda { |post|
+      if post.photos_count > 0
+        post.photos
+      else
+        []
+      end
+    }, :as => :photos
+  end
+
   xml_attr :provider_display_name
 
   has_many :mentions, :dependent => :destroy
@@ -23,6 +58,24 @@ class Post < ActiveRecord::Base
   #scopes
   scope :includes_for_a_stream, includes(:o_embed_cache, {:author => :profile}, :mentions => {:person => :profile}) #note should include root and photos, but i think those are both on status_message
 
+  def post_type
+    self.class.name
+  end
+
+  def raw_message
+    ""
+  end
+
+  def mentioned_people
+    []
+  end
+
+  # gives the last three comments on the post
+  def last_three_comments
+    return if self.comments_count == 0
+    self.comments.includes(:author => :profile).last(3)
+  end
+
   def self.excluding_blocks(user)
     people = user.blocks.includes(:person).map{|b| b.person}
 

app/models/profile.rb

@@ -29,10 +29,10 @@ class Profile < ActiveRecord::Base
 
   before_save :strip_names
   after_validation :strip_names
-  
+
   validates :first_name, :length => { :maximum => 32 }
   validates :last_name, :length => { :maximum => 32 }
-  
+
   validates_format_of :first_name, :with => /\A[^;]+\z/, :allow_blank => true
   validates_format_of :last_name, :with => /\A[^;]+\z/, :allow_blank => true
   validate :max_tags

app/models/reshare.rb

@@ -29,6 +29,10 @@ class Reshare < Post
     self.root.author.diaspora_handle
   end
 
+  def raw_message
+    self.root ? root.raw_message : ""
+  end
+
   def receive(recipient, sender)
     local_reshare = Reshare.where(:guid => self.guid).first
     if local_reshare && local_reshare.root.author_id == recipient.person.id

app/models/status_message.rb

@@ -40,6 +40,10 @@ class StatusMessage < Post
     joins(:likes).where(:likes => {:author_id => person.id})
   }
 
+  def photos_count
+    self.photos.size
+  end
+
   def self.guids_for_author(person)
     Post.connection.select_values(Post.where(:author_id => person.id).select('posts.guid').to_sql)
   end

app/views/aspects/_aspect_listings.haml

@@ -4,18 +4,20 @@
 
 %ul#aspect_nav.left_nav
   %li.all_aspects
-    .root_element= link_to t('aspects.index.your_aspects'), aspects_path
+    .root_element
+      = link_to t('aspects.index.your_aspects'), aspects_path
 
-    %ul.sub_nav
-      - if defined?(stream)
-        %a.toggle_selector{:href => '#'}
-          = stream.for_all_aspects? ? t('.deselect_all') : t('.select_all')
-      - for aspect in all_aspects
-        %li{:data => {:aspect_id => aspect.id}, :class => ("active" if defined?(stream) && stream.aspect_ids.include?(aspect.id))}
-          .edit
-            = link_to image_tag("icons/pencil.png", :title => t('.edit_aspect', :name => aspect.name)), edit_aspect_path(aspect), :rel => "facebox"
-          %a.aspect_selector{:href => aspects_path("a_ids[]" => aspect.id), :class => "name", 'data-guid' => aspect.id}
-            = aspect
+    - if @stream.is_a?(Stream::Aspect)
+      %ul.sub_nav
+        - if defined?(stream)
+          %a.toggle_selector{:href => '#'}
+            = stream.for_all_aspects? ? t('.deselect_all') : t('.select_all')
+        - for aspect in all_aspects
+          %li{:data => {:aspect_id => aspect.id}, :class => ("active" if defined?(stream) && stream.aspect_ids.include?(aspect.id))}
+            .edit
+              = link_to image_tag("icons/pencil.png", :title => t('.edit_aspect', :name => aspect.name)), edit_aspect_path(aspect), :rel => "facebox"
+            %a.aspect_selector{:href => aspects_path("a_ids[]" => aspect.id), :class => "name", 'data-guid' => aspect.id}
+              = aspect
 
-      %li
-        = link_to t('.add_an_aspect'), new_aspect_path, :class => "new_aspect", :rel => "facebox"
+        %li
+          = link_to t('.add_an_aspect'), new_aspect_path, :class => "new_aspect", :rel => "facebox"

app/views/aspects/_aspect_stream.haml

@@ -3,13 +3,6 @@
 -#   the COPYRIGHT file.
 
 #aspect_stream_header
-  #sort_by
-    = t('streams.recently')
-    %span.controls
-      = link_to_if(session[:sort_order] == 'created_at', t('streams.commented_on'), stream.link(:sort_order => 'updated_at'))
-      ·
-      = link_to_if(session[:sort_order] == 'updated_at', t('streams.posted'), stream.link(:sort_order => 'created_at' ))
-
   %h3
     = stream.title
 
@@ -18,11 +11,13 @@
 
 #gs-shim{:title => popover_with_close_html("3. #{t('.stay_updated')}"), 'data-content' => t('.stay_updated_explanation')}
 
-#main_stream.stream{:data => {:guids => stream.aspect_ids.join(','), :time_for_scroll => time_for_scroll(stream.ajax_stream?, stream)}}
-  - if !stream.ajax_stream? && stream.stream_posts.length > 0
+#main_stream.stream{:data => {:guids => stream.aspect_ids.join(','), :time_for_scroll => (@backbone ? '' : time_for_scroll(stream.ajax_stream?, stream))}}
+  - if !@backbone && !stream.ajax_stream? && stream.stream_posts.length > 0
     = render 'shared/stream', :posts => stream.stream_posts
-  #pagination
-    =link_to(t('more'), next_page_path(:ajax_stream => stream.ajax_stream?), :class => 'paginate')
+
+  - if !@backbone
+    #pagination
+      =link_to(t('more'), next_page_path(:ajax_stream => stream.ajax_stream?), :class => 'paginate')
 
 - if current_user.contacts.size < 2
   = render 'aspects/no_contacts_message'

app/views/aspects/index.html.haml

@@ -31,38 +31,35 @@
   .section
     %ul.left_nav
       %li
-        %b
-          = link_to t("streams.multi.title"), multi_path, :class => 'home_selector'
+        = link_to t("streams.multi.title"), multi_path, :class => 'home_selector'
 
-  .section
     = render 'aspects/aspect_listings', :stream => @stream
 
-  .section
     %ul.left_nav
       %li
-        %b
-          = link_to t('streams.mentions.title'), mentions_path, :class => 'home_selector'
+        = link_to t('streams.mentions.title'), mentions_path, :class => 'home_selector'
 
-  .section
     %ul.left_nav
       %li
-        %b
-          = link_to t('streams.comment_stream.title'), comment_stream_path, :class => 'home_selector'
+        = link_to t('streams.comment_stream.title'), comment_stream_path, :class => 'home_selector'
 
-  .section
     %ul.left_nav
       %li
-        %b
-          = link_to t('streams.like_stream.title'), like_stream_path, :class => 'home_selector'
+        = link_to t('streams.like_stream.title'), like_stream_path, :class => 'home_selector'
 
-  .section#followed_tags_listing
-    = render 'tags/followed_tags_listings'
+    #followed_tags_listing
+      = render 'tags/followed_tags_listings'
 
 .span-13.append-1
   #aspect_stream_container.stream_container
     = render 'aspects/aspect_stream', :stream => @stream
 
 .span-5.rightBar.last
-  = render 'aspects/selected_contacts', :stream => @stream
+  /= render 'aspects/selected_contacts', :stream => @stream
+  #selected_aspect_contacts.section
+    .title.no_icon
+      %h5
+        = @stream.title
+    .content
 
   = render 'shared/right_sections'

app/views/comments/create.js.erb

@@ -1,3 +1,7 @@
+App.stream.collection.get(<%= @comment.post.id %>);
+
+console.log(post);
+
 ContentUpdater.addCommentToPost("<%= @comment.post.guid %>",
    "<%= @comment.guid%>",
    "<%= escape_javascript(render(:partial => 'comments/comment', :locals => { :comment => @comment, :person => current_user.person, :post => @comment.post}))%>");

app/views/conversations/index.haml

@@ -20,18 +20,18 @@
       = t('.inbox')
 
   #conversation_inbox
-    - if @conversations.count > 0
-      .stream.conversations
+    .stream.conversations
+      - if @conversations.count > 0
         = render :partial => 'conversations/conversation', :collection => @conversations, :locals => {:authors => @authors, :unread_counts => @unread_counts}
+      - else
+        %br
+        %br
+        %br
+        %br
+        %div{:style => 'text-align:center;'}
+          %i
+            = t('.no_messages')
       = will_paginate @conversations
-    - else
-      %br
-      %br
-      %br
-      %br
-      %div{:style => 'text-align:center;'}
-        %i
-          = t('.no_messages')
 
 
 .span-15.prepend-9.last

app/views/layouts/_header.html.haml

@@ -3,85 +3,10 @@
 -#   the COPYRIGHT file.
 
 .container{:style => "position:relative;"}
+  = link_to image_tag('logo_small.png', :height => "16px", :width => "161px", :style => 'position:relative;top:5px;'), root_path
 
-  - if current_user
-    = link_to image_tag('logo_small.png', :height => "16px", :width => "161px", :class => "diaspora_header_logo"), multi_path
-  - else
-    = link_to image_tag('logo_large.png', :height => "32px", :width => "321px", :class => "diaspora_header_logo"), root_path
-
-  - if !current_user
-    .right
-      %ul#landing_nav
-        %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
-        %li= link_to 'github', "https://github.com/diaspora/diaspora"
-        %li= link_to t('.blog'), 'http://blog.joindiaspora.com/'
-        %li= link_to t('.login'), new_user_session_path, :class => 'login'
-
-  - elsif (current_user || !@landing_page)
-    #global_search
-      = form_tag(people_path, :method => 'get', :class => "search_form") do
-        = text_field_tag 'q', params[:q], :placeholder => t('find_people'), :type => 'search', :results => 5
-
-    #nav_badges
-      #home_badge.badge
-        = link_to multi_path, :title => t('_home') do
-          = image_tag 'icons/home_grey.png', :alt => t('_home')
-
-      #notification_badge.badge
-        = link_to notifications_path, :title => new_notification_text(@notification_count) do
-          = image_tag 'icons/notifications_grey.png', :id => "notification-flag", :alt => new_notification_text(@notification_count)
-          .badge_count{:class => ("hidden" if @notification_count == 0)}
-            = @notification_count
-
-      #message_inbox_badge.badge
-        = link_to conversations_path, :title => new_message_text(@unread_message_count) do
-          = image_tag 'icons/mail_grey.png', :alt => new_message_text(@unread_message_count)
-          .badge_count{:class => ("hidden" if @unread_message_count == 0)}
-            = @unread_message_count
-
-    #notification_dropdown
-      .header
-        .right
-          = link_to t('notifications.index.mark_all_as_read'), read_all_notifications_path
-          \|
-          = link_to t('.view_all'), notifications_path, :id => "view_all_notifications"
-        %h4
-          = t('.recent_notifications')
-      .notifications
-        .ajax_loader
-          = image_tag("ajax-loader.gif")
-
-    #hovercard_container
-      #hovercard
-        %img.avatar
-        %h4
-          %a.person
-        %p.handle
-        #hovercard_dropdown_container
-
-        .hovercard_footer
-          .footer_container
-            .hashtags
-
-    %ul#user_menu.dropdown
-      %li
-        .right
-          ▼
-        .avatar
-          = owner_image_tag(:thumb_small)
-        = link_to current_user.name, '#', :title => current_user.diaspora_handle
-      %li= link_to t('.profile'), local_or_remote_person_path(current_user.person)
-      %li= link_to t('_contacts'), contacts_link
-      %li= link_to t('.settings'), edit_user_path
-      -if current_user.admin?
-        %li= link_to t('.admin'), user_search_path
-      %li= link_to t('.logout'), destroy_user_session_path
-
-  #lightbox
-    #lightbox-content
-      = link_to "[x] close", '#', :id => 'lightbox-close-link'
-      %img#lightbox-image
-      #lightbox-imageset
-
-  #lightbox-backdrop
-
+  %ul#landing_nav
+    %li= link_to '@joindiaspora', "http://twitter.com/joindiaspora"
+    %li= link_to 'github', "https://github.com/diaspora/diaspora"
+    %li= link_to t('.blog'), 'http://blog.joindiaspora.com/'
+    %li= link_to t('.login'), new_user_session_path, :class => 'login'

app/views/layouts/application.html.haml

@@ -17,6 +17,26 @@
     %link{:rel => 'shortcut icon', :href => '/favicon.png'}
     %link{:rel => 'apple-touch-icon', :href => '/apple-touch-icon.png'}
 
+    :css
+      @-webkit-keyframes fade-in {
+        0%   { opacity: 0; }
+        100% { opacity: 1; }
+      }
+
+      @-webkit-keyframes spin {
+        0%   { -webkit-transform: rotate(0deg); }
+        100% { -webkit-transform: rotate(360deg); }
+      }
+
+      .loaded {
+        -webkit-animation: fade-in 0.16s linear;
+      }
+
+      .loader {
+        -webkit-animation: spin 1s infinite ease-in-out,
+                           fade-in 0.2s ease-in;
+      }
+
     / Social Media Icons are by Paul Robert Lloyd @ http://paulrobertlloyd.com/2009/06/social_media_icons
 
     / bootstrap/blueprint switch
@@ -44,9 +64,15 @@
         Diaspora.I18n.loadLocale(#{get_javascript_strings_for(I18n.locale).to_json}, "#{I18n.locale}");
         Diaspora.Page = "#{params[:controller].camelcase}#{params[:action].camelcase}";
 
+    - if current_user
+      :javascript
+        app.user({
+          current_user: _.extend(#{current_user.person.as_api_response(:backbone).to_json}, {notifications_count : #{@notification_count}, unread_messages_count : #{@unread_message_count}})
+        });
+
     = yield(:head)
 
-    -unless Rails.env == "production" 
+    -unless Rails.env == "production"
       :css
         .translation_missing {
           color: purple;
@@ -64,14 +90,13 @@
           .message
             = msg
 
-    - unless @landing_page
-      %a{:id=>"back-to-top", :title=>"Back to top", :href=>"#"}
-        ⇧
-
       #notifications
 
-    %header{:class=>('landing' unless current_user)}
-      = render 'layouts/header'
+    - unless current_user
+      %header
+        = render 'layouts/header'
+
+    = render 'templates/templates'
 
     .container{:style=> "#{yield(:break_the_mold)}"}
       - if @aspsect == :getting_started || @page == :logged_out

app/views/likes/update.js.erb

@@ -1,3 +0,0 @@
-var targetGuid = "<%=@like.target.guid%>";
-$(".like_action", "#"+targetGuid).first().html("<%= escape_javascript(like_action(@like.target))%>");
-ContentUpdater.addLikesToPost(targetGuid, "<%= escape_javascript(render("likes/likes_container", :target_id => @like.target_id, :likes_count => @like.target.reload.likes_count, :target_type => @like.target_type)) %>");

app/views/people/show.html.haml

@@ -27,14 +27,15 @@
     = render 'people/sub_header', :person => @person, :contact => @contact
 
     / hackity hack until we get a photo stream
-    - if (@posts && @posts.length > 0) || (@stream && @stream.stream_posts.length > 0)
+    - if @backbone && (@posts && @posts.length > 0) || (@stream && @stream.stream_posts.length > 0)
       -if @post_type == :photos
         = render 'photos/index', :photos => @posts
       - else
         #main_stream.stream
-          = render 'shared/stream', :posts => @stream.stream_posts
-          #pagination
-            =link_to(t('more'), next_page_path, :class => 'paginate')
+          - if !@backbone
+            = render 'shared/stream', :posts => @stream.stream_posts
+            #pagination
+              =link_to(t('more'), next_page_path, :class => 'paginate')
 
     - else
       #main_stream

app/views/photos/_new_photo.haml

@@ -72,10 +72,6 @@
                               if ( $('.publisher_photo').length  == 0){
                                 textarea.removeClass("with_attachments");
                                 textarea.css('paddingBottom', '');
-
-                                if( $('#status_message_text').attr("value") == ""){
-                                  Publisher.close()
-                                }
                               }
                             });
                           }

app/views/posts/show.html.haml

@@ -5,10 +5,10 @@
 .span-20.append-2.prepend-2.last
 
   #main_stream.stream.status_message_show
-    - if @post.is_a?(Photo)
-      = render 'posts/photo', :post => @post
-    - else
-      = render 'shared/stream_element', :post => @post, :commenting_disabled => commenting_disabled?(@post)
+    /- if @post.is_a?(Photo)
+    /  = render 'posts/photo', :post => @post
+    /- else
+    /  = render 'shared/stream_element', :post => @post, :commenting_disabled => commenting_disabled?(@post)
   %br
   %br
   %br

app/views/reshares/create.js.erb

@@ -1,9 +0,0 @@
-<% if @reshare.persisted? %>
-  $('.stream_element#<%=params[:root_guid]%>').addClass('reshared');
-  ContentUpdater.addPostToStream(
-      "<%= escape_javascript(render(:partial => 'shared/stream_element', :locals => {:post => @reshare }))=%>"
-  );
-  <% else  %>
-  Diaspora.page.flashMessages.render({success:false,
-    notice: "<%= reshare_error_message(@reshare)  %>"});
-<% end %>

app/views/share_visibilities/update.js.erb

@@ -1,10 +0,0 @@
-var target = $("#<%= @post.guid %>")
-target.find(".sm_body").toggleClass("hidden");
-target.find(".undo_text").toggleClass("hidden");
-target.find(".hide_loader").toggleClass("hidden");
-
-var hide_icon = target.find(".stream_element_delete")
-if (target.find(".undo_text").hasClass("hidden")) {
-  hide_icon.toggleClass("hidden");
-  target.find(".hide_loader").toggleClass("hidden");
-}

app/views/shared/_publisher.html.haml

@@ -2,29 +2,15 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-:javascript
-  $(function() {
-    $(".question_mark").twipsy({trigger: 'hover', placement: 'bottom'});
-    $(".service_icon").twipsy({trigger: 'hover', placement: 'bottom'});
-    $(".public_icon").twipsy({trigger: 'hover', placement: 'bottom'});
-  });
-
-- if publisher_open
-  :javascript
-    $(document).ready(function() {
-        Publisher.open();
-      });
-
 -if publisher_explain
   :javascript
-    $(document).ready(function()
-      {
+    $(document).ready(function() {
         Publisher.triggerGettingStarted();
       });
 
-#publisher.closed{:class => ((aspect == :profile)? 'mention_popup' : nil )}
+#publisher{:class => ((aspect == :profile || publisher_open) ? "mention_popup" : "closed")}
   .content_creation
-    = form_for(StatusMessage.new, :remote => remote?, :html => {"data-type" => "json"}) do |status|
+    = form_for(StatusMessage.new) do |status|
       = status.error_messages
       %p
         %params
@@ -81,7 +67,7 @@
                 - for aspect in all_aspects
                   = aspect_dropdown_list_item(aspect, !all_aspects_selected?(selected_aspects) && selected_aspects.include?(aspect) )
 
-          = status.submit t('.share'), :disable_with => t('.posting'), :class => 'button creation', :tabindex => 2
+          = status.submit t('.share'), :disabled => publisher_hidden_text.blank?, :class => 'button creation', :tabindex => 2
 
           .facebox_content
             #question_mark_pane

app/views/status_messages/create.js.erb

@@ -1,12 +0,0 @@
-<%= {:html =>  render(
-    :partial => 'shared/stream_element',
-    :locals => {
-      :post => @status_message,
-      :author => @status_message.author,
-      :photos => @status_message.photos,
-      :comments => [],
-      :all_aspects => current_user.aspects,
-      :reshare => nil
-    }
-  ),
-  :post_id => @status_message.guid}.to_json.html_safe%>

app/views/status_messages/new.html.haml

@@ -12,8 +12,7 @@
       Publisher.autocompletion.onSelect($("#status_message_fake_text"),person,'#{@person.name}');
       $("#publisher #status_message_fake_text").val(function(index, value){ return value + " " });
       $("#publisher").bind('ajax:success', function(){location.reload();});
-      Publisher.bookmarklet =true;
-      Publisher.open();
+      Publisher.bookmarklet = true;
     });
 
 #new_status_message_pane

app/views/tags/_followed_tags_listings.haml

@@ -7,14 +7,15 @@
     %li
       %b=link_to t('streams.followed_tag.title'), tag_followings_path, :class => 'home_selector'
 
-      %ul.sub_nav
-        - if tags.size > 0
-          - for tg in tags
-            %li.unfollow{:id => "tag-following-#{tg.name}"}
-              .unfollow_icon.hidden
-                = link_to image_tag("icons/monotone_close_exit_delete.png", :height => 16, :title => t('aspects.index.unfollow_tag', :tag => tg.name)), tag_tag_followings_path(:name => tg.name, :remote => true), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :id => "unfollow_" + tg.name
-              = link_to "##{tg.name}", tag_path(:name => tg.name), :class => "tag_selector"
-        %li
-          = form_for TagFollowing.new do |tg|
-            = text_field_tag :name, "", :class => "tag_input", :placeholder => t('streams.followed_tag.add_a_tag')
-            = tg.submit t('streams.followed_tag.follow'), :class => "button hidden"
+      - if @stream.is_a?(Stream::FollowedTag)
+        %ul.sub_nav
+          - if tags.size > 0
+            - for tg in tags
+              %li.unfollow{:id => "tag-following-#{tg.name}"}
+                .unfollow_icon.hidden
+                  = link_to image_tag("icons/monotone_close_exit_delete.png", :height => 16, :title => t('aspects.index.unfollow_tag', :tag => tg.name)), tag_tag_followings_path(:name => tg.name, :remote => true), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :id => "unfollow_" + tg.name
+                = link_to "##{tg.name}", tag_path(:name => tg.name), :class => "tag_selector"
+          %li
+            = form_for TagFollowing.new do |tg|
+              = text_field_tag :name, "", :class => "tag_input", :placeholder => t('streams.followed_tag.add_a_tag')
+              = tg.submit t('streams.followed_tag.follow'), :class => "button hidden"

app/views/tags/show.haml

@@ -67,10 +67,11 @@
     %hr
 
     #main_stream.stream
-      - if @stream.stream_posts.length > 0
-        = render 'shared/stream', :posts => @stream.stream_posts
-        #pagination
-          =link_to(t('more'), next_page_path, :class => 'paginate')
-      - else
-        = t('.nobody_talking', :tag => @stream.display_tag_name)
+      - if !@backbone
+        - if @stream.stream_posts.length > 0
+          = render 'shared/stream', :posts => @stream.stream_posts
+          #pagination
+            =link_to(t('more'), next_page_path, :class => 'paginate')
+        - else
+          = t('.nobody_talking', :tag => @stream.display_tag_name)
 

app/views/templates/_templates.haml

@@ -0,0 +1,18 @@
+-#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+- ["header",
+  "feedback",
+  "static_text",
+  "stream_element",
+  "comment_stream",
+  "comment",
+  "status_message",
+  "activity_streams_photo",
+  "reshare",
+  "likes_info",
+  "stream_faces"].each do |template_name|
+
+  %script{:id => "#{template_name.gsub("_","-")}-template", :type => 'text/template'}
+    != File.read("#{Rails.root}/app/views/templates/#{template_name}.jst")

app/views/templates/activity_streams_photo.jst

@@ -0,0 +1,3 @@
+<a href="<%= object_url %>" class="stream-photo-link">
+  <img src="<%= image_url %>" data-small-photo="<%= image_url %>" data-full-photo="<%= image_url %>" class="stream-photo" />
+</a>

app/views/templates/comment.jst

@@ -0,0 +1,28 @@
+<div class="right controls">
+  <!-- need access to post -->
+  <% if(author.id === current_user.id) { %>
+    <a href="#" class="delete comment_delete" title="<%= Diaspora.I18n.t('delete') %>">
+      <img alt="Deletelabel" src="/images/deletelabel.png" />
+    <a/>
+  <% } %>
+</div>
+
+<a href="/people/<%= author.id %>">
+  <img src="<%= author.avatar.small %>" class="avatar" data-person-id="<%= author.id %>"/>
+</a>
+
+<div class="content">
+  <span class="from">
+    <a href="/people/<%= author.id %>">
+      <%= author.name %>
+    </a>
+  </span>
+
+  <p class="collapsible">
+    <%= text %>
+  </p>
+
+  <div class="comment_info">
+    <time class="timeago" datetime="<%= created_at %>"/>
+  </div>
+</div>

app/views/templates/comment_stream.jst

@@ -0,0 +1,29 @@
+<% if(typeof(all_comments_loaded) == 'undefined' || !all_comments_loaded) { %>
+  <ul class="show_comments <%= comments_count <= 3 ? 'hidden' : '' %>">
+    <li>
+      <a href="/posts/<%= id %>/comments" class="toggle_post_comments">
+      <%= Diaspora.I18n.t('stream.more_comments', {count : comments_count - 3}) %>
+      </a>
+    </li>
+  </ul>
+<% } %>
+
+<ul class="comments"> </ul>
+
+<% if(current_user) { %>
+  <div class="new_comment_form_wrapper <%= comments_count > 0 ? '' : 'hidden' %>">
+    <form accept-charset="UTF-8" action="/posts/<%= id %>/comments" class="new_comment" id="new_comment_on_<%= id %>" method="post">
+      <a href="/people/<%= current_user.id %>">
+        <img src="<%= current_user.avatar.small %>" class="avatar" data-person-id="<%= current_user.id %>"/>
+      </a>
+
+      <p>
+      <label for="comment_text_on_<%= id %>"><%= Diaspora.I18n.t('stream.comment') %></label>
+        <textarea class="comment_box" id="comment_text_on_<%= id %>" name="text" rows="2" />
+      </p>
+      <div class="submit_button">
+        <input class="button creation" id="comment_submit_<%= id %>" name="commit" type="submit" value="<%= Diaspora.I18n.t('stream.comment') %>" />
+      </div>
+    </form>
+  </div>
+<% } %>

app/views/templates/feedback.jst

@@ -0,0 +1,21 @@
+<span class="post_scope">
+  <%= public ? Diaspora.I18n.t("stream.public") : Diaspora.I18n.t("stream.limited") %>
+</span>
+–
+
+<a href="#" class="like_action" rel='nofollow'>
+  <%= user_like ? Diaspora.I18n.t("stream.unlike") : Diaspora.I18n.t("stream.like") %>
+</a>
+·
+
+<% if(public && author.id != current_user.id && (post_type == "Reshare" ? root : true)) { %>
+  <a href="#" class="reshare_action" rel='nofollow'>
+    <%= Diaspora.I18n.t("stream.reshare") %>
+  </a>
+  ·
+<% } %>
+
+<a href="#" class="focus_comment_textarea" rel="nofollow">
+  <%= Diaspora.I18n.t("stream.comment") %>
+</a>
+

app/views/templates/header.jst

@@ -0,0 +1,102 @@
+<div class="container" style="position:relative;">
+
+  <a href="/stream">
+    <img alt="Logo_small" class="diaspora_header_logo" height="38px" width="38px" src="/images/header-logo.png" />
+  </a>
+
+  <div id="global_search">
+    <form accept-charset="UTF-8" action="/people" class="search_form" method="get">
+      <input name="utf8" type="hidden" value="✓">
+      <input id="q" name="q" placeholder="<%= Diaspora.I18n.t('header.search') %>" results="5" type="search" autocomplete="off" class="ac_input">
+    </form>
+  </div>
+
+  <div id="nav_badges">
+    <div class="badge" id="home_badge">
+      <a href="/stream" title="<%= Diaspora.I18n.t('header.home') %>"><img alt="Home" src="/images/icons/home_grey.png">
+      </a>
+    </div>
+
+    <div class="badge" id="notification_badge">
+      <a href="/notifications" title="<%= Diaspora.I18n.t('header.notifications') %>">
+        <img alt="<%= Diaspora.I18n.t('header.notifications') %>" id="notification-flag" src="/images/icons/notifications_grey.png">
+        <div class="badge_count <%= current_user.notifications_count > 0 ? '' : 'hidden' %>">
+          <%= current_user.notifications_count %>
+        </div>
+      </a>
+    </div>
+
+    <div class="badge" id="message_inbox_badge">
+      <a href="/conversations" title="<%= Diaspora.I18n.t('header.messages') %>">
+        <img alt="<%= Diaspora.I18n.t('header.messages') %>" src="/images/icons/mail_grey.png">
+        <div class="badge_count <%= current_user.unread_messages_count > 0 ? '' : 'hidden' %>">
+          <%= current_user.unread_messages_count %>
+        </div>
+      </a>
+    </div>
+  </div>
+
+  <div id="notification_dropdown">
+    <div class="header">
+      <div class="right">
+        <a href="/notifications/read_all">
+          <%= Diaspora.I18n.t("header.mark_all_as_read") %>
+        </a>
+        |
+        <a href="/notifications" id="view_all_notifications">
+          <%= Diaspora.I18n.t("header.view_all") %>
+        </a>
+      </div>
+
+      <h4>
+        <%= Diaspora.I18n.t("header.recent_notifications") %>
+      </h4>
+    </div>
+
+    <div class="notifications">
+      <div class="ajax_loader">
+        <img alt="Ajax-loader" src="/images/ajax-loader.gif">
+      </div>
+    </div>
+  </div>
+
+  <div id="hovercard_container">
+    <div id="hovercard">
+      <img class="avatar">
+      <h4>
+        <a class="person"></a>
+      </h4>
+      <p class="handle"></p>
+      <div id="hovercard_dropdown_container"></div>
+      <div class="hovercard_footer">
+        <div class="footer_container">
+          <div class="hashtags"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <ul class="dropdown" id="user_menu">
+    <li>
+    <div class="right">
+      ▼
+    </div>
+    <img alt="<%= current_user.name %>" class="avatar" data-person_id="<%= current_user.id %>" src="<%= current_user.avatar.small %>" title="<%= current_user.name %>" />
+    <a href="#"><%= current_user.name %></a>
+    </li>
+    <li><a href="/people/<%= current_user.id %>"><%= Diaspora.I18n.t("header.profile") %></a></li>
+    <li><a href="/contacts"><%= Diaspora.I18n.t("header.contacts") %></a></li>
+    <li><a href="/user/edit"><%= Diaspora.I18n.t("header.settings") %></a></li>
+    <li><a href="/users/sign_out"><%= Diaspora.I18n.t("header.log_out") %></a></li>
+  </ul>
+
+  <div id="lightbox">
+    <div id="lightbox-content">
+      <a href="#" id="lightbox-close-link">[x] close</a>
+      <img id="lightbox-image">
+      <div id="lightbox-imageset"></div>
+    </div>
+  </div>
+  <div id="lightbox-backdrop"></div>
+
+</div>

app/views/templates/likes_info.jst

@@ -0,0 +1,6 @@
+<% if(likes_count > 0) { %>
+  <img alt="Heart" src="/images/icons/heart.png" />
+  <a href="#" class="expand_likes">
+    <%= Diaspora.I18n.t('stream.likes', {count: likes_count}) %>
+  </a>
+<% } %>

app/views/templates/reshare.jst

@@ -0,0 +1,54 @@
+<div class="reshare">
+
+  <% if(root) { %>
+
+    <a href="/people/<%= root.author.id %>">
+      <img src="<%= root.author.avatar.small %>" class="avatar" data-person-id="<%= root.author.id %>"/>
+    </a>
+
+    <div class="content">
+      <div class="post_initial_info">
+        <span class="from">
+          <a href="/people/<%= root.author.id %>">
+            <%= root.author.name %>
+          </a>
+        </span>
+        <span class="details">
+          -
+          <a href="/posts/<%= root.id %>">
+            <time class="timeago" datetime="<%= root.created_at %>"/>
+          </a>
+        </span>
+
+        <% if(root.reshares_count) { %>
+          -
+          <%= Diaspora.I18n.t("stream.reshares", {count : root.reshares_count}) %>
+        <% } %>
+      </div>
+
+      <!-- duplicate from statusmessage partial -->
+      <% if(root.photos_count > 0) { %>
+        <div class="photo_attachments">
+          <img src="<%= root.photos[0].sizes.large %>" class="stream-photo big_stream_photo">
+          <% for(photo in root.photos) {
+            if(photo == 0){ continue; }
+            if(photo == 8){ break; } %>
+            <img src="<%= root.photos[photo].sizes.small %>" class="stream-photo thumb_small">
+          <% } %>
+      <% } %>
+
+      <%= root.text %>
+
+      <% if(o_embed_cache) { %>
+        <%= root.o_embed_cache.posts.data.html %>
+      <% } %>
+      <!-- end duplication -->
+
+    </div>
+
+  <% } else { %>
+    <p>
+      <%= Diaspora.I18n.t('stream.original_post_deleted') %>
+    </p>
+  <% } %>
+</div>

app/views/templates/static_text.jst

@@ -0,0 +1 @@
+<span class=text><%= text %></span>

app/views/templates/status_message.jst

@@ -0,0 +1,19 @@
+<% if(photos_count > 0) { %>
+  <div class="photo_attachments">
+    <a href="#" class="stream-photo-link">
+      <img src="<%= photos[0].sizes.large %>" class="stream-photo big_stream_photo" data-small-photo="<%= photos[0].sizes.small %>" data-full-photo="<%= photos[0].sizes.large %>" rel="lightbox">
+    </a>
+    <% for(photo in photos) {
+      if(photo == 0){ continue; }
+      if(photo == 8){ break; } %>
+      <a href="#" class="stream-photo-link">
+        <img src="<%= photos[photo].sizes.small %>" class="stream-photo thumb_small" data-small-photo="<%= photos[photo].sizes.small %>" data-full-photo="<%= photos[photo].sizes.large %>" rel="lightbox">
+      </a>
+    <% } %>
+<% } %>
+
+<%= text %>
+
+<% if(o_embed_cache) { %>
+  <%= o_embed_cache.posts.data.html %>
+<% } %>

app/views/templates/stream_element.jst

@@ -0,0 +1,62 @@
+<div class="right controls">
+  <% if(author.id != current_user.id) { %>
+    <a href="#" rel=nofollow>
+      <img src="/images/icons/ignoreuser.png" alt="Ignoreuser" class="block_user control_icon" title= "<%= Diaspora.I18n.t('ignore') %>" />
+      <img src="/images/deletelabel.png" class="delete control_icon hide_post" title="<%= Diaspora.I18n.t('stream.hide') %>" />
+    </a>
+  <% } else { %>
+    <a href="#" rel=nofollow>
+      <img src="/images/deletelabel.png" class="delete control_icon remove_post" title="<%= Diaspora.I18n.t('delete') %>" />
+    </a>
+  <% } %>
+
+</div>
+
+<div class="sm_body">
+  <a href="/people/<%= author.id %>">
+    <img src="<%= author.avatar.small %>" class="avatar" />
+  </a>
+
+  <div class="content">
+
+    <div class="post_initial_info">
+      <span class="from">
+        <a href="/people/<%= author.id %>">
+          <%= author.name %>
+        </a>
+      </span>
+
+      <span class="details">
+        -
+        <a href="/posts/<%= id %>">
+          <time class="timeago" datetime="<%= created_at %>"/>
+        </a>
+
+        <% if(reshares_count) { %>
+          -
+          <%= Diaspora.I18n.t("stream.reshares", {count : reshares_count}) %>
+        <% } %>
+      </span>
+    </div>
+
+    <% if(text !== null && text.match(/#nsfw/i)) { %>
+      <div class="shield_wrapper">
+        <div class="shield">
+          <%= Diaspora.I18n.t('stream.nsfw') %>
+          <a href="#">
+            <%= Diaspora.I18n.t('stream.show') %>
+          </a>
+        </div>
+    <% } %>
+
+    <div class="post-content"> </div>
+
+    <% if(text !== null && text.match(/#nsfw/)) { %>
+      </div>
+    <% } %>
+
+    <div class="feedback"> </div>
+    <div class="likes"> </div>
+    <div class="comments"> </div>
+
+  </div>

app/views/templates/stream_faces.jst

@@ -0,0 +1,5 @@
+<% _.each(people, function(person) { %>
+  <a href="/people/<%= person.id %>" title="<%= person.name %>">
+    <img class="avatar" src="<%= person.avatar.small %>" />
+  </a>
+<% }) %>

config/assets.yml

@@ -3,23 +3,32 @@ embed_assets: datauri
 compress_assets: on
 gzip_assets: off
 javascripts:
-  flash_socket:
-    - public/javascripts/vendor/FABridge.js
-    - public/javascripts/vendor/swfobject.js
-    - public/javascripts/vendor/web_socket.js
   jquery:
-    - public/javascripts/vendor/jquery162.min.js
+    - public/javascripts/vendor/jquery-1.7.1.min.js
+
   main:
+    - public/javascripts/vendor/underscore.js
+    - public/javascripts/vendor/backbone.js
+
+    - public/javascripts/vendor/markdown.js
+
+    - public/javascripts/app/app.js
+    - public/javascripts/app/router.js
+    - public/javascripts/app/views.js
+    - public/javascripts/app/models/post.js
+    - public/javascripts/app/models/*
+    - public/javascripts/app/collections/*
+    - public/javascripts/app/views/stream_object_view.js
+    - public/javascripts/app/views/*
+
     - public/javascripts/rails.validations.js
     - public/javascripts/rails.js
     - public/javascripts/vendor/jquery.hotkeys.js
     - public/javascripts/vendor/jquery.autoresize.min.js
     - public/javascripts/vendor/jquery-ui-1.8.9.custom.min.js
     - public/javascripts/vendor/jquery.charcount.js
-    - public/javascripts/vendor/jquery-debounce.js
     - public/javascripts/vendor/jquery.expander.js
     - public/javascripts/vendor/timeago.js
-    - public/javascripts/vendor/Mustache.js
     - public/javascripts/vendor/facebox.js
     - public/javascripts/jquery.infinitescroll-custom.js
     - public/javascripts/jquery.autocomplete-custom.js
@@ -33,8 +42,6 @@ javascripts:
     - public/javascripts/widgets/*.js
 
     - public/javascripts/view.js
-    - public/javascripts/stream.js
-    - public/javascripts/content-updater.js
     - public/javascripts/aspects-dropdown.js
     - public/javascripts/contact-edit.js
     - public/javascripts/contact-list.js
@@ -46,11 +53,12 @@ javascripts:
   login:
     - public/javascripts/login.js
   mobile:
+    - public/javascripts/vendor/jquery-1.7.1.min.js
     - public/javascripts/vendor/jquery.charcount.js
     - public/javascripts/rails.js # we only include this to hijack ajax requests
     - public/javascripts/vendor/mbp-helper.js
     - public/javascripts/mobile.js
-    
+
   mailchimp:
     - public/javascripts/vendor/mailchimp/jquery.form.js
     - public/javascripts/vendor/mailchimp/jquery.validate.js

config/locales/diaspora/en.yml

@@ -881,9 +881,6 @@ en:
       no_applications: "You haven't registered any applications yet."
 
   streams:
-    recently: "recently:"
-    commented_on: "commented on"
-    posted: "posted"
     community_spotlight_stream: "Community Spotlight"
     aspects_stream: "Aspects"
     mentioned_stream: "@Mentions"

config/locales/javascript/javascript.ar.yml

@@ -10,11 +10,11 @@ ar:
       add_to_aspect: "أضف مراسلا"
       all_aspects: "جميع الفئات"
       toggle:
-        few: "في {{count}} فئات"
-        many: "في {{count}} فئات"
-        one: "في {{count}} فئة"
-        other: "في {{count}} فئات"
-        two: "في {{count}} فئات"
+        few: "في <%= count %> فئات"
+        many: "في <%= count %> فئات"
+        one: "في <%= count %> فئة"
+        other: "في <%= count %> فئات"
+        two: "في <%= count %> فئات"
         zero: "حدّد الفئات"
     comments:
       hide: "أخفِ التعليقات"
@@ -32,7 +32,7 @@ ar:
       public: "عام - مشاركتك ستكون متاحة للجميع ومفهرسة في محركات البحث"
     reshares:
       duplicate: "رائع، أليس كذلك؟ أعدت نشر هذه المشاركة مسبقا"
-    search_for: "إبحث عن {{name}}"
+    search_for: "إبحث عن <%= name %>"
     show_more: المزيد
     timeago:
       day: "منذ يوم"
@@ -51,6 +51,6 @@ ar:
       years: "منذ %d أعوام"
     videos:
       unknown: "نوع فيديو غير معروف"
-      watch: "شاهد هذا الفيديو عبر {{provider}}"
+      watch: "شاهد هذا الفيديو عبر <%= provider %>"
     web_sockets:
       disconnected: "الـ websocket مغلق; الرسائل لن تنشر بعد الآن"

config/locales/javascript/javascript.bg.yml

@@ -9,16 +9,16 @@ bg:
     aspect_dropdown:
       add_to_aspect: "Избиране на аспект(и)"
       all_aspects: "Във всеки аспект"
-      error: "Не е възможно започване на споделяне с {{name}}.  Вероятно ги игнорирате?"
+      error: "Не е възможно започване на споделяне с <%= name %>.  Вероятно ги игнорирате?"
       select_aspects: "Избиране на аспект(и)"
-      started_sharing_with: "Започнахте да споделяте с {{name}}!"
-      stopped_sharing_with: "Престанахте да споделяте с {{name}}."
+      started_sharing_with: "Започнахте да споделяте с <%= name %>!"
+      stopped_sharing_with: "Престанахте да споделяте с <%= name %>."
       toggle:
-        few: "В {{count}} аспекта"
-        many: "В {{count}} аспекта"
-        one: "В {{count}} аспект"
-        other: "В {{count}} аспекта"
-        two: "В {{count}} аспекта"
+        few: "В <%= count %> аспекта"
+        many: "В <%= count %> аспекта"
+        one: "В <%= count %> аспект"
+        other: "В <%= count %> аспекта"
+        two: "В <%= count %> аспекта"
         zero: "Избиране на аспект(и)"
     aspect_navigation:
       deselect_all: Никой
@@ -32,7 +32,7 @@ bg:
     failed_to_post_message: "Съобщението не бе публикувано!"
     getting_started:
       alright_ill_wait: "Добре, ще изчакам."
-      hey: "Здравейте, {{name}}!"
+      hey: "Здравейте, <%= name %>!"
       no_tags: "Не следите нито една марка!  Желаете ли да продължите въпреки това?"
       preparing_your_stream: "Вашият персонализиран поток се подготвя..."
     infinite_scroll:
@@ -45,10 +45,10 @@ bg:
       public: "Публично - публикацията ще бъде видима за всеки, а съдържанието ѝ ще бъде налично за търсещите машини"
     reshares:
       duplicate: "Вече сте споделили публикацията!"
-    search_for: "Търсене за {{name}}"
+    search_for: "Търсене за <%= name %>"
     show_more: "покажи още"
     tags:
-      wasnt_that_interesting: "Е, вероятно марката #{{tagName}} не е чак толкова интересна..."
+      wasnt_that_interesting: "Е, вероятно марката #<%= tagName %> не е чак толкова интересна..."
     timeago:
       day: ден
       days: "%d дни"
@@ -67,4 +67,4 @@ bg:
       years: "%d години"
     videos:
       unknown: "Неизвестен вид видео"
-      watch: "Гледайте видеото в {{provider}}"
+      watch: "Гледайте видеото в <%= provider %>"

config/locales/javascript/javascript.br.yml

@@ -9,11 +9,11 @@ br:
     aspect_dropdown:
       add_to_aspect: "Add to aspect"
       toggle:
-        few: "In {{count}} aspects"
-        many: "In {{count}} aspects"
-        one: "In {{count}} aspect"
-        other: "In {{count}} aspects"
-        two: "In {{count}} aspects"
+        few: "In <%= count %> aspects"
+        many: "In <%= count %> aspects"
+        one: "In <%= count %> aspect"
+        other: "In <%= count %> aspects"
+        two: "In <%= count %> aspects"
         zero: "Add to aspect"
     confirm_dialog: "Emaoc'h sur?"
     getting_started:
@@ -22,7 +22,7 @@ br:
       at_least_one_aspect: "Dav eo deoc'h embann un arvez da'n nebeutañ"
     reshares:
       duplicate: "You've already reshared that post!"
-    search_for: "Klask war-lerc'h {{name}}"
+    search_for: "Klask war-lerc'h <%= name %>"
     timeago:
       day: "un devezh"
       days: "%d a zevezhioù"
@@ -39,4 +39,4 @@ br:
       years: "%d a vloavezhioù"
     videos:
       unknown: "Stumm ar video dianav"
-      watch: "Sellet ouzh ar video gant {{provider}}"
+      watch: "Sellet ouzh ar video gant <%= provider %>"

config/locales/javascript/javascript.ca.yml

@@ -26,9 +26,9 @@ ca:
         year: "aproximadament un any"
         years: "%d anys"
       videos:
-          watch: "Visualitza aquest video a {{provider}}"
+          watch: "Visualitza aquest video a <%= provider %>"
           unknown: "El tipus de vídeo és desconegut"
-      search_for: "Cerca per {{name}}"
+      search_for: "Cerca per <%= name %>"
       publisher:
         at_least_one_aspect: "Heu de publicar en almenys un aspecte."
         limited: "Limitat - la vostra publicació només serà visible per a la gent amb qui esteu compartint"
@@ -41,16 +41,16 @@ ca:
         add_to_aspect: "Afegeix el contacte"
         select_aspects: "Selecciona els aspectes"
         all_aspects: "Tots els aspectes"
-        stopped_sharing_with: "Heu deixat de compartir amb {{name}}."
-        started_sharing_with: "Heu començat a compartir amb {{name}}!"
-        error: "No s'ha pogut començar a compartir amb {{name}}. L'esteu ignorant?"
+        stopped_sharing_with: "Heu deixat de compartir amb <%= name %>."
+        started_sharing_with: "Heu començat a compartir amb <%= name %>!"
+        error: "No s'ha pogut començar a compartir amb <%= name %>. L'esteu ignorant?"
         toggle:
           zero: "Selecciona els aspectes"
-          one: "En {{count}} aspecte"
-          two: "En {{count}} aspectes"
-          few: "En {{count}} aspectes"
-          many: "En {{count}} aspectes"
-          other: "En {{count}} aspectes"
+          one: "En <%= count %> aspecte"
+          two: "En <%= count %> aspectes"
+          few: "En <%= count %> aspectes"
+          many: "En <%= count %> aspectes"
+          other: "En <%= count %> aspectes"
       show_more: "mostra'n més"
       failed_to_like: "No s'ha pogut comunicar que us agrada!"
       failed_to_post_message: "No s'ha pogut publicar el missatge!"
@@ -64,11 +64,11 @@ ca:
         deselect_all: "Desselecciona'ls tots"
         no_aspects: "No heu seleccionat cap aspecte"
       getting_started:
-        hey: "Ei, {{name}}!"
+        hey: "Ei, <%= name %>!"
         no_tags: "Ei, no heu seguit cap etiqueta! Voleu continuar igualment?"
         alright_ill_wait: "D'acord, m'esperaré."
         preparing_your_stream: "S'està preparant el vostre flux personalitzat…"
       photo_uploader:
         looking_good: "Vaja, teniu un aspecte fantàstic!"
       tags:
-        wasnt_that_interesting: "D'acord, es possible que #{{tagName}} no fos tan interessant…"
+        wasnt_that_interesting: "D'acord, es possible que #<%= tagName %> no fos tan interessant…"

config/locales/javascript/javascript.cs.yml

@@ -10,11 +10,11 @@ cs:
       add_to_aspect: "Přidat kontakt"
       all_aspects: "Všechny aspekty"
       toggle:
-        few: "Ve {{count}} aspektech"
-        many: "V {{count}} aspektech"
-        one: "V {{count}} aspektu"
-        other: "Ve {{count}} aspektech"
-        two: "Ve {{count}} aspektech"
+        few: "Ve <%= count %> aspektech"
+        many: "V <%= count %> aspektech"
+        one: "V <%= count %> aspektu"
+        other: "Ve <%= count %> aspektech"
+        two: "Ve <%= count %> aspektech"
         zero: "Vybrat aspekty"
     comments:
       hide: "skrýt komentáře"
@@ -32,7 +32,7 @@ cs:
       public: "Veřejné - váši zprávu si bude moci přečíst kdokoliv a může být nalezena vyhledávači"
     reshares:
       duplicate: "Tato zprávu už sdílíte!"
-    search_for: "Hledat {{name}}"
+    search_for: "Hledat <%= name %>"
     show_more: "zobrazit více"
     timeago:
       day: "1 dnem"
@@ -51,6 +51,6 @@ cs:
       years: "%d roky"
     videos:
       unknown: "Neznámý typ videa"
-      watch: "Podívejte se na tohle video na {{provider}}"
+      watch: "Podívejte se na tohle video na <%= provider %>"
     web_sockets:
       disconnected: "Websocket je uzavřen, příspěvky již nebude možno sledovat živě."

config/locales/javascript/javascript.cy.yml

@@ -10,14 +10,14 @@ cy:
       add_to_aspect: "Ychwanegu cysylltiad"
       all_aspects: "Agweddau i gŷd"
       select_aspects: "Dewis agweddau"
-      started_sharing_with: "Rydych chi'n rhannu gyda {{name}}!"
-      stopped_sharing_with: "Dydych chi ddim yn rhannu nawr gyda {{name}}."
+      started_sharing_with: "Rydych chi'n rhannu gyda <%= name %>!"
+      stopped_sharing_with: "Dydych chi ddim yn rhannu nawr gyda <%= name %>."
       toggle:
-        few: "Mewn {{count}} agweddau"
-        many: "Mewn {{count}} agweddau"
-        one: "Mewn {{count}} agwedd"
-        other: "Mewn {{count}} agweddau"
-        two: "Mewn {{count}} agweddau"
+        few: "Mewn <%= count %> agweddau"
+        many: "Mewn <%= count %> agweddau"
+        one: "Mewn <%= count %> agwedd"
+        other: "Mewn <%= count %> agweddau"
+        two: "Mewn <%= count %> agweddau"
         zero: "Dewiswch agweddau"
     aspect_navigation:
       deselect_all: "Dad-ddewis i gŷd"
@@ -31,7 +31,7 @@ cy:
     failed_to_post_message: "Methwyd i bostio neges!"
     getting_started:
       alright_ill_wait: "O'r gorau - 'dwi'n aros..."
-      hey: "Hei, {{name}}!"
+      hey: "Hei, <%= name %>!"
       no_tags: "Hei, dydych chi ddim yn dilyn unrhyw tagiau! Dal ymlaen beth bynnag?"
       preparing_your_stream: "Preparing your personalised stream..."
     infinite_scroll:
@@ -40,10 +40,10 @@ cy:
       looking_good: "OMG, rydych chi'n ymddangos yn neis iawn!"
     reshares:
       duplicate: "Mae hynny'n dda, eh? Rydych chi wedi rhannu'r bost eisoes!"
-    search_for: "Chwilio am {{name}}"
+    search_for: "Chwilio am <%= name %>"
     show_more: "dangos mwy"
     tags:
-      wasnt_that_interesting: "OK, mae'n debyg nid yw #{{tagName}} yn ddiddorol iawn..."
+      wasnt_that_interesting: "OK, mae'n debyg nid yw #<%= tagName %> yn ddiddorol iawn..."
     timeago:
       day: diwrnod
       days: "%d diwrnod"
@@ -60,4 +60,4 @@ cy:
       years: "%d blyddynoedd"
     videos:
       unknown: "Math o fideo anhysbys"
-      watch: "Gwyliwch y fideo ar {{provider}}"
+      watch: "Gwyliwch y fideo ar <%= provider %>"

config/locales/javascript/javascript.da.yml

@@ -9,16 +9,16 @@ da:
     aspect_dropdown:
       add_to_aspect: "Tilføj kontakt"
       all_aspects: "Alle aspekter"
-      error: "Kunne ikke begynde at dele med {{name}}.  Ignorerer du vedkommende?"
+      error: "Kunne ikke begynde at dele med <%= name %>.  Ignorerer du vedkommende?"
       select_aspects: "Vælg aspekter"
-      started_sharing_with: "Du er begyndt at dele med {{name}}!"
-      stopped_sharing_with: "Du deler ikke længere med {{name}}."
+      started_sharing_with: "Du er begyndt at dele med <%= name %>!"
+      stopped_sharing_with: "Du deler ikke længere med <%= name %>."
       toggle:
-        few: "I {{count}} aspekter"
-        many: "I {{count}} aspekter"
-        one: "I {{count}} aspekt"
-        other: "I {{count}} aspekter"
-        two: "I {{count}} aspekter"
+        few: "I <%= count %> aspekter"
+        many: "I <%= count %> aspekter"
+        one: "I <%= count %> aspekt"
+        other: "I <%= count %> aspekter"
+        two: "I <%= count %> aspekter"
         zero: "Vælg aspekter"
     aspect_navigation:
       deselect_all: "Fravælg alle"
@@ -32,7 +32,7 @@ da:
     failed_to_post_message: "Kunne ikke indsende besked!"
     getting_started:
       alright_ill_wait: "Okay, jeg venter."
-      hey: "Hej {{name}}!"
+      hey: "Hej <%= name %>!"
       no_tags: "Du har ikke fulgt nogen tags! Vil du fortsætte alligevel?"
       preparing_your_stream: "Forbereder din personlige strøm..."
     infinite_scroll:
@@ -45,10 +45,10 @@ da:
       public: "Offentlig - dit indlæg vil være synligt for alle og kan findes af søgemaskiner"
     reshares:
       duplicate: "Du har allerede delt indlægget!"
-    search_for: "Søg efter {{name}}"
+    search_for: "Søg efter <%= name %>"
     show_more: "Vis mere"
     tags:
-      wasnt_that_interesting: "OK, jeg formoder #{{tagName}} ikke var så spændende igen..."
+      wasnt_that_interesting: "OK, jeg formoder #<%= tagName %> ikke var så spændende igen..."
     timeago:
       day: "en dag"
       days: "%d dage"
@@ -67,6 +67,6 @@ da:
       years: "%d år"
     videos:
       unknown: "Ukendt videotype"
-      watch: "Se denne video på {{provider}}"
+      watch: "Se denne video på <%= provider %>"
     web_sockets:
       disconnected: "Forbindelse er lukket; indlæg vil ikke længere blive opdateret live."

config/locales/javascript/javascript.de.yml

@@ -9,16 +9,16 @@ de:
     aspect_dropdown:
       add_to_aspect: "Kontakt hinzufügen"
       all_aspects: "Alle Aspekte"
-      error: "Konnte nicht anfangen, mit {{name}} zu teilen. Ignorierst du sie/ihn?"
+      error: "Konnte nicht anfangen, mit <%= name %> zu teilen. Ignorierst du sie/ihn?"
       select_aspects: "Wähle Aspekte aus"
-      started_sharing_with: "Du hast angefangen, mit {{name}} zu teilen!"
-      stopped_sharing_with: "Du hast aufgehört, mit {{name}} zu teilen!"
+      started_sharing_with: "Du hast angefangen, mit <%= name %> zu teilen!"
+      stopped_sharing_with: "Du hast aufgehört, mit <%= name %> zu teilen!"
       toggle:
-        few: "In {{count}} Aspekten"
-        many: "In {{count}} Aspekten"
+        few: "In <%= count %> Aspekten"
+        many: "In <%= count %> Aspekten"
         one: "In einem Aspekt"
-        other: "In {{count}} Aspekten"
-        two: "In {{count}} Aspekten"
+        other: "In <%= count %> Aspekten"
+        two: "In <%= count %> Aspekten"
         zero: "Aspekt auswählen"
     aspect_navigation:
       deselect_all: "Auswahl aufheben"
@@ -44,10 +44,10 @@ de:
       public: "Öffentlich - dein Beitrag ist für alle sichtbar und kann von Suchmaschinen gefunden werden"
     reshares:
       duplicate: "Du hast diesen Beitrag bereits weitergesagt!"
-    search_for: "Nach {{name}} suchen"
+    search_for: "Nach <%= name %> suchen"
     show_more: "Mehr zeigen"
     tags:
-      wasnt_that_interesting: "OK, ich nehme an, #{{tagName}} war nicht so interessant..."
+      wasnt_that_interesting: "OK, ich nehme an, #<%= tagName %> war nicht so interessant..."
     timeago:
       day: "einem Tag"
       days: "%d Tagen"
@@ -66,6 +66,6 @@ de:
       years: "%d Jahren"
     videos:
       unknown: "Unbekanntes Videoformat"
-      watch: "Dieses Video auf {{provider}} ansehen"
+      watch: "Dieses Video auf <%= provider %> ansehen"
     web_sockets:
       disconnected: "Der Websocket ist geschlossen. Beiträge werden nicht länger in Echtzeit aktualisiert."

config/locales/javascript/javascript.de_formal.yml

@@ -10,14 +10,14 @@ de_formal:
       add_to_aspect: "Kontakt hinzufügen"
       all_aspects: "Alle Aspekte"
       select_aspects: "Wählen Sie Aspekte aus"
-      started_sharing_with: "Sie haben angefangen, mit {{name}} zu teilen!"
-      stopped_sharing_with: "Sie haben aufgehört, mit {{name}} zu teilen!"
+      started_sharing_with: "Sie haben angefangen, mit <%= name %> zu teilen!"
+      stopped_sharing_with: "Sie haben aufgehört, mit <%= name %> zu teilen!"
       toggle:
-        few: "In {{count}} Aspekten"
-        many: "In {{count}} Aspekten"
+        few: "In <%= count %> Aspekten"
+        many: "In <%= count %> Aspekten"
         one: "In einem Aspekt"
-        other: "In {{count}} Aspekten"
-        two: "In {{count}} Aspekten"
+        other: "In <%= count %> Aspekten"
+        two: "In <%= count %> Aspekten"
         zero: "Aspekt auswählen"
     aspect_navigation:
       deselect_all: "Auswahl aufheben"
@@ -43,10 +43,10 @@ de_formal:
       public: "Öffentlich - Ihr Beitrag ist für alle sichtbar und kann von Suchmaschinen gefunden werden"
     reshares:
       duplicate: "Sie haben diesen Beitrag bereits weitergesagt!"
-    search_for: "Nach {{name}} suchen"
+    search_for: "Nach <%= name %> suchen"
     show_more: "Mehr zeigen"
     tags:
-      wasnt_that_interesting: "OK, ich nehme an, #{{tagName}} war nicht so interessant..."
+      wasnt_that_interesting: "OK, ich nehme an, #<%= tagName %> war nicht so interessant..."
     timeago:
       day: "einem Tag"
       days: "%d Tagen"
@@ -65,6 +65,6 @@ de_formal:
       years: "%d Jahren"
     videos:
       unknown: "Unbekanntes Videoformat"
-      watch: "Dieses Video auf {{provider}} ansehen"
+      watch: "Dieses Video auf <%= provider %> ansehen"
     web_sockets:
       disconnected: "Der Websocket ist geschlossen. Beiträge werden nicht länger in Echtzeit aktualisiert."

config/locales/javascript/javascript.el.yml

@@ -9,16 +9,16 @@ el:
     aspect_dropdown:
       add_to_aspect: "Προσθήκη επαφής"
       all_aspects: "Όλες οι πτυχές"
-      error: "Δεν μπορεί να ξεκινήσει ο διαμοιρασμός με το χρήστη {{name}}. Μήπως τον αγνοείτε;"
+      error: "Δεν μπορεί να ξεκινήσει ο διαμοιρασμός με το χρήστη <%= name %>. Μήπως τον αγνοείτε;"
       select_aspects: "Επιλογή πτυχών"
-      started_sharing_with: "Ξεκινήσατε να διαμοιράζεστε με τον χρήστη {{name}}!"
-      stopped_sharing_with: "Σταματήσατε να διαμοιράζεστε με τον χρήστη {{name}}."
+      started_sharing_with: "Ξεκινήσατε να διαμοιράζεστε με τον χρήστη <%= name %>!"
+      stopped_sharing_with: "Σταματήσατε να διαμοιράζεστε με τον χρήστη <%= name %>."
       toggle:
-        few: "Σε {{count}} πτυχές"
-        many: "Σε {{count}} πτυχές"
-        one: "Σε {{count}} πτυχή"
-        other: "Σε {{count}} πτυχές"
-        two: "Σε {{count}} πτυχές"
+        few: "Σε <%= count %> πτυχές"
+        many: "Σε <%= count %> πτυχές"
+        one: "Σε <%= count %> πτυχή"
+        other: "Σε <%= count %> πτυχές"
+        two: "Σε <%= count %> πτυχές"
         zero: "Επιλέξτε πτυχές"
     aspect_navigation:
       deselect_all: "Εξαίρεση όλων"
@@ -32,7 +32,7 @@ el:
     failed_to_post_message: "Αποτυχία δημοσίευσης μηνύματος!"
     getting_started:
       alright_ill_wait: "Εντάξει, θα περιμένω."
-      hey: "Γεια σου, {{name}}!"
+      hey: "Γεια σου, <%= name %>!"
       no_tags: "Γεια, δεν ακολουθείς ακόμα καμία ετικέτα! Συνεχίζουμε παρ' όλ' αυτά;"
       preparing_your_stream: "Ετοιμάζεται η προσωπική σας ροή..."
     infinite_scroll:
@@ -45,10 +45,10 @@ el:
       public: "Δημόσιο - οι δημοσιεύσεις σας θα είναι ορατές στον καθένα και θα μπορούν να βρεθούν από τις μηχανές αναζήτησης."
     reshares:
       duplicate: "Αυτό είναι τόσο καλό ε; Έχετε ήδη κοινοποιήσει αυτή τη δημοσίευση!"
-    search_for: "Αναζήτηση για {{name}}"
+    search_for: "Αναζήτηση για <%= name %>"
     show_more: "Προβολή περισσότερων"
     tags:
-      wasnt_that_interesting: "OK, φαντάζομαι πως το #{{tagName}} δεν ήταν και τόσο ενδιαφέρον τελικά..."
+      wasnt_that_interesting: "OK, φαντάζομαι πως το #<%= tagName %> δεν ήταν και τόσο ενδιαφέρον τελικά..."
     timeago:
       day: "μία μέρα"
       days: "%d μέρες"
@@ -65,6 +65,6 @@ el:
       years: "%d χρόνια"
     videos:
       unknown: "Άγνωστος τύπος βίντεο"
-      watch: "Δείτε το βίντεο στο {{provider}}"
+      watch: "Δείτε το βίντεο στο <%= provider %>"
     web_sockets:
       disconnected: "Το websocket είναι κλειστό: οι δημοσιεύσεις δεν θα αναμεταδίδονται ζωντανά πλέον."

config/locales/javascript/javascript.en.yml

@@ -6,6 +6,8 @@
 en:
   javascripts:
       confirm_dialog: "Are you sure?"
+      delete: "Delete"
+      ignore: "Ignore"
       timeago:
         prefixAgo: ""
         prefixFromNow: ""
@@ -23,31 +25,28 @@ en:
         year: "about a year"
         years: "%d years"
       videos:
-          watch: "Watch this video on {{provider}}"
+          watch: "Watch this video on <%= provider %>"
           unknown: "Unknown video type"
-      search_for: "Search for {{name}}"
+      search_for: "Search for <%= name %>"
       publisher:
         at_least_one_aspect: "You must publish to at least one aspect"
         limited: "Limited - your post will only be seen by people you are sharing with"
         public: "Public - your post will be visible to everyone and found by search engines"
       infinite_scroll:
         no_more: "No more posts."
-      web_sockets:
-        disconnected: "The websocket is closed; posts will no longer be streamed live."
       aspect_dropdown:
         add_to_aspect: "Add contact"
         select_aspects: "Select aspects"
         all_aspects: "All aspects"
-        stopped_sharing_with: "You have stopped sharing with {{name}}."
-        started_sharing_with: "You have started sharing with {{name}}!"
-        error: "Couldn't start sharing with {{name}}.  Are you ignoring them?"
+        stopped_sharing_with: "You have stopped sharing with <%= name %>."
+        started_sharing_with: "You have started sharing with <%= name %>!"
+        error: "Couldn't start sharing with <%= name %>.  Are you ignoring them?"
         toggle:
           zero: "Select aspects"
-          one: "In {{count}} aspect"
-          two: "In {{count}} aspects"
-          few: "In {{count}} aspects"
-          many: "In {{count}} aspects"
-          other: "In {{count}} aspects"
+          one: "In <%= count %> aspect"
+          few: "In <%= count %> aspects"
+          many: "In <%= count %> aspects"
+          other: "In <%= count %> aspects"
       show_more: "show more"
       failed_to_like: "Failed to like!"
       failed_to_post_message: "Failed to post message!"
@@ -61,11 +60,61 @@ en:
         deselect_all: "Deselect all"
         no_aspects: "No aspects selected"
       getting_started:
-        hey: "Hey, {{name}}!"
+        hey: "Hey, <%= name %>!"
         no_tags: "Hey, you haven't followed any tags!  Continue anyway?"
         alright_ill_wait: "Alright, I'll wait."
         preparing_your_stream: "Preparing your personalized stream..."
       photo_uploader:
         looking_good: "OMG, you look awesome!"
       tags:
-        wasnt_that_interesting: "OK, I suppose #{{tagName}} wasn't all that interesting..."
+        wasnt_that_interesting: "OK, I suppose #<%= tagName %> wasn't all that interesting..."
+
+      stream:
+        hide: "Hide"
+        public: "Public"
+        limited: "Limited"
+        like: "Like"
+        unlike: "Unlike"
+        reshare: "Reshare"
+        comment: "Comment"
+        original_post_deleted: "Original post deleted by author."
+        nsfw: "This post has been flagged NSFW by its author."
+        show: "Show"
+
+        likes:
+          zero: "<%= count %> Likes"
+          one: "<%= count %> Like"
+          few: "<%= count %> Likes"
+          many: "<%= count %> Likes"
+          other: "<%= count %> Likes"
+
+        reshares:
+          zero: "<%= count %> Reshares"
+          one: "<%= count %> Reshare"
+          few: "<%= count %> Reshares"
+          many: "<%= count %> Reshares"
+          other: "<%= count %> Reshares"
+
+        more_comments:
+          zero: "Show <%= count %> more comments"
+          one: "Show <%= count %> more comment"
+          few: "Show <%= count %> more comments"
+          many: "Show <%= count %> more comments"
+          other: "Show <%= count %> more comments"
+
+      header:
+        home: "Home"
+        profile: "Profile"
+        contacts: "Contacts"
+        settings: "Settings"
+        log_out: "Log out"
+
+        notifications: "Notifications"
+        messages: "Messages"
+
+        search: "Find people or #tags"
+
+        recent_notifications: "Recent Notifications"
+        mark_all_as_read: "Mark all as read"
+        view_all: "View all"
+

config/locales/javascript/javascript.en_1337.yml

@@ -10,11 +10,11 @@ en_1337:
       add_to_aspect: "4DD N00B"
       all_aspects: "4LL 45P3C75"
       toggle:
-        few: "1N {{count}} 45P3C75"
-        many: "1N {{count}} 45P3C75"
-        one: "1N {{count}} 45P3C7"
-        other: "1N {{count}} 45P3C75"
-        two: "1N {{count}} 45P3C75"
+        few: "1N <%= count %> 45P3C75"
+        many: "1N <%= count %> 45P3C75"
+        one: "1N <%= count %> 45P3C7"
+        other: "1N <%= count %> 45P3C75"
+        two: "1N <%= count %> 45P3C75"
         zero: "4DD N00B"
     aspect_navigation:
       deselect_all: "D353L3C7 4LL"
@@ -36,7 +36,7 @@ en_1337:
       public: "PUBL1C - Y0UR 5P4M W1LL B3 V151BL3 2 3V3RY0N3 4ND F0UND BY S34RCH 3NG1N35!"
     reshares:
       duplicate: "U H4V3 4LR34DY R35P4MM3D 7HI5!"
-    search_for: "S34RCH F0R {{name}}"
+    search_for: "S34RCH F0R <%= name %>"
     show_more: "5H0W M0R3!"
     timeago:
       day: "4 D4Y"
@@ -54,6 +54,6 @@ en_1337:
       years: "%d Y34R5"
     videos:
       unknown: "UNK0WN V1D30 7YP3"
-      watch: "W47CH 7H15 V1D30 0N {{provider}}"
+      watch: "W47CH 7H15 V1D30 0N <%= provider %>"
     web_sockets:
       disconnected: D15C0NN3C73D!

config/locales/javascript/javascript.en_pirate.yml

@@ -9,11 +9,11 @@ en_pirate:
     aspect_dropdown:
       add_to_aspect: "Add to aspect"
       toggle:
-        few: "In {{count}} aspects"
-        many: "In {{count}} aspects"
-        one: "In {{count}} aspect"
-        other: "In {{count}} aspects"
-        two: "In {{count}} aspects"
+        few: "In <%= count %> aspects"
+        many: "In <%= count %> aspects"
+        one: "In <%= count %> aspect"
+        other: "In <%= count %> aspects"
+        two: "In <%= count %> aspects"
         zero: "Add to aspect"
     getting_started:
       preparing_your_stream: "Preparing your personialized stream..."

config/locales/javascript/javascript.en_shaw.yml

@@ -9,11 +9,11 @@ en_shaw:
     aspect_dropdown:
       add_to_aspect: "𐑨𐑛 𐑑 𐑨𐑕𐑐𐑧𐑒𐑑"
       toggle:
-        few: "𐑦𐑯 {{count}} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
-        many: "𐑦𐑯 {{count}} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
-        one: "𐑦𐑯 {{count}} 𐑨𐑕𐑐𐑧𐑒𐑑"
-        other: "𐑦𐑯 {{count}} 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
-        two: "In {{count}} aspects"
+        few: "𐑦𐑯 <%= count %> 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
+        many: "𐑦𐑯 <%= count %> 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
+        one: "𐑦𐑯 <%= count %> 𐑨𐑕𐑐𐑧𐑒𐑑"
+        other: "𐑦𐑯 <%= count %> 𐑨𐑕𐑐𐑧𐑒𐑑𐑕"
+        two: "In <%= count %> aspects"
         zero: "𐑨𐑛 𐑑 𐑨𐑕𐑐𐑧𐑒𐑑"
     comments:
       hide: "𐑣𐑲𐑛 𐑒𐑪𐑥𐑩𐑯𐑑𐑕"
@@ -29,7 +29,7 @@ en_shaw:
       at_least_one_aspect: "𐑿 𐑥𐑳𐑕𐑑 𐑐𐑳𐑚𐑤𐑦𐑖 𐑑 𐑨𐑑 𐑤𐑰𐑕𐑑 𐑢𐑳𐑯 𐑨𐑕𐑐𐑧𐑒𐑑"
     reshares:
       duplicate: "𐑿𐑝 𐑷𐑤𐑮𐑧𐑛𐑦 𐑮𐑦𐑖𐑺𐑛 𐑞𐑨𐑑 𐑐𐑴𐑕𐑑!"
-    search_for: "𐑕𐑻𐑗 𐑓𐑹 {{name}}"
+    search_for: "𐑕𐑻𐑗 𐑓𐑹 <%= name %>"
     show_more: "𐑖𐑴 𐑥𐑹"
     timeago:
       day: "𐑩 𐑛𐑱"
@@ -49,6 +49,6 @@ en_shaw:
       years: "%d 𐑘𐑽𐑟"
     videos:
       unknown: "𐑩𐑯𐑯𐑴𐑯 𐑝𐑦𐑛𐑦𐑴 𐑑𐑲𐑐"
-      watch: "𐑢𐑷𐑗 𐑞𐑦𐑕 𐑝𐑦𐑛𐑦𐑴 𐑪𐑯 {{provider}}"
+      watch: "𐑢𐑷𐑗 𐑞𐑦𐑕 𐑝𐑦𐑛𐑦𐑴 𐑪𐑯 <%= provider %>"
     web_sockets:
       disconnected: "𐑞 𐑢𐑧𐑚𐑕𐑪𐑒𐑩𐑑 𐑦𐑟 𐑒𐑤𐑴𐑟𐑛; 𐑐𐑴𐑕𐑑𐑕 𐑢𐑦𐑤 𐑯𐑴 𐑤𐑪𐑙𐑜𐑼 𐑚𐑰 𐑕𐑑𐑮𐑰𐑥𐑛 𐑤𐑲𐑝."

config/locales/javascript/javascript.eo.yml

@@ -9,16 +9,16 @@ eo:
     aspect_dropdown:
       add_to_aspect: "Aldoni kontakton"
       all_aspects: "Ĉiuj aspektoj"
-      error: "Ne estis eble komunigi kun {{name}}. Ĉu vi ignoras ilin?"
+      error: "Ne estis eble komunigi kun <%= name %>. Ĉu vi ignoras ilin?"
       select_aspects: "Elekti aspektojn"
-      started_sharing_with: "Vi komencis komunigi kun {{name}}!"
-      stopped_sharing_with: "Vi ĉesis komunigi kun {{name}}."
+      started_sharing_with: "Vi komencis komunigi kun <%= name %>!"
+      stopped_sharing_with: "Vi ĉesis komunigi kun <%= name %>."
       toggle:
-        few: "En {{count}} aspektoj"
-        many: "En {{count}} aspektoj"
-        one: "En {{count}} aspekto"
-        other: "En {{count}} aspektoj"
-        two: "En {{count}} aspektoj"
+        few: "En <%= count %> aspektoj"
+        many: "En <%= count %> aspektoj"
+        one: "En <%= count %> aspekto"
+        other: "En <%= count %> aspektoj"
+        two: "En <%= count %> aspektoj"
         zero: "Elekti aspektojn"
     aspect_navigation:
       deselect_all: "Malselekti ĉiujn"
@@ -32,7 +32,7 @@ eo:
     failed_to_post_message: "Ne povis afiŝi mesaĝon!"
     getting_started:
       alright_ill_wait: "En ordo, mi atendos."
-      hey: "Hej, {{name}}!"
+      hey: "Hej, <%= name %>!"
       no_tags: "Hej, vi ne sekvas iun etikedon! Ĉu tamen daŭrigi?"
       preparing_your_stream: "Preparante vian personan torenton..."
     infinite_scroll:
@@ -45,10 +45,10 @@ eo:
       public: "Publika - via afiŝo vidoteblos de ĉiuj kaj trovotos de retserĉaplikaĵoj."
     reshares:
       duplicate: "Nu, ĉu tiel bone? Vi jam rekonigis tiun afiŝon!"
-    search_for: "Serĉi por {{name}}"
+    search_for: "Serĉi por <%= name %>"
     show_more: "vidi plu"
     tags:
-      wasnt_that_interesting: "Nu, mi supozas, ke #{{tagName}} ne estis tiel interese..."
+      wasnt_that_interesting: "Nu, mi supozas, ke #<%= tagName %> ne estis tiel interese..."
     timeago:
       day: "unu tago"
       days: "%d tagoj"
@@ -67,6 +67,6 @@ eo:
       years: "%d jaroj"
     videos:
       unknown: "nekonata tipo de videaĵo"
-      watch: "Vidi tiun ĉi videon je {{provider}}"
+      watch: "Vidi tiun ĉi videon je <%= provider %>"
     web_sockets:
       disconnected: "La reta kontaktoskatolo estas fermita; afiŝoj ne plu rekte fluos."

config/locales/javascript/javascript.es-AR.yml

@@ -9,16 +9,16 @@ es-AR:
     aspect_dropdown:
       add_to_aspect: "Agregar contacto"
       all_aspects: "Todos los aspectos"
-      error: "No se pudo empezar a compartir con {{name}}.  ¿Será que lo/a estás ignorando?"
+      error: "No se pudo empezar a compartir con <%= name %>.  ¿Será que lo/a estás ignorando?"
       select_aspects: "Selecciona aspectos"
-      started_sharing_with: "Empezaste a compartir con {{name}}!"
-      stopped_sharing_with: "Dejaste de compartir con {{name}}."
+      started_sharing_with: "Empezaste a compartir con <%= name %>!"
+      stopped_sharing_with: "Dejaste de compartir con <%= name %>."
       toggle:
-        few: "En {{count}} aspectos"
-        many: "En {{count}} aspectos"
-        one: "En {{count}} aspecto"
-        other: "En {{count}} aspectos"
-        two: "En {{count}} aspectos"
+        few: "En <%= count %> aspectos"
+        many: "En <%= count %> aspectos"
+        one: "En <%= count %> aspecto"
+        other: "En <%= count %> aspectos"
+        two: "En <%= count %> aspectos"
         zero: "Seleccionar aspectos"
     aspect_navigation:
       deselect_all: "De-seleccionar todo"
@@ -32,7 +32,7 @@ es-AR:
     failed_to_post_message: "¡No pudo publicarse el mensaje!"
     getting_started:
       alright_ill_wait: "Todo bien, voy a esperar."
-      hey: "Che, {{name}}!"
+      hey: "Che, <%= name %>!"
       no_tags: "¡Che, no estás siguiendo ningún tag! ¿Continuar de todos modos?"
       preparing_your_stream: "Preparando tu stream personalizado..."
     infinite_scroll:
@@ -45,10 +45,10 @@ es-AR:
       public: "Publica - tu publicación sera visible para cualquiera y los buscadores podrán encontrarla"
     reshares:
       duplicate: "¿Te gustó eh? ¡Ya habías compartido esa publicación!"
-    search_for: "Buscar a {{name}}"
+    search_for: "Buscar a <%= name %>"
     show_more: "mostrar más"
     tags:
-      wasnt_that_interesting: "OK, supongamos que #{{tagName}} no era tan interesante..."
+      wasnt_that_interesting: "OK, supongamos que #<%= tagName %> no era tan interesante..."
     timeago:
       day: "un día"
       days: "%d días"
@@ -67,6 +67,6 @@ es-AR:
       years: "%d años"
     videos:
       unknown: "Tipo de video desconocido"
-      watch: "Ver este video en {{provider}}"
+      watch: "Ver este video en <%= provider %>"
     web_sockets:
       disconnected: "La conexión WebSocket está cerrada; las publicaciones ya no serán transmitidas en vivo."

config/locales/javascript/javascript.es.yml

@@ -9,16 +9,16 @@ es:
     aspect_dropdown:
       add_to_aspect: "Añadir contacto"
       all_aspects: "Todos los aspectos"
-      error: "No podría empezar a compartir con {{name}}.  ¿Vas a ignonarl@?"
+      error: "No podría empezar a compartir con <%= name %>.  ¿Vas a ignonarl@?"
       select_aspects: "Elige los aspectos"
-      started_sharing_with: "¡Ahora sigues los mensajes públicos de {{name}}!"
-      stopped_sharing_with: "Ya no compartes más con {{name}}."
+      started_sharing_with: "¡Ahora sigues los mensajes públicos de <%= name %>!"
+      stopped_sharing_with: "Ya no compartes más con <%= name %>."
       toggle:
-        few: "En {{count}} aspectos"
-        many: "En {{count}} aspectos"
-        one: "En {{count}} aspecto"
-        other: "En {{count}} aspectos"
-        two: "En {{count}} aspectos"
+        few: "En <%= count %> aspectos"
+        many: "En <%= count %> aspectos"
+        one: "En <%= count %> aspecto"
+        other: "En <%= count %> aspectos"
+        two: "En <%= count %> aspectos"
         zero: "Elige los aspectos"
     aspect_navigation:
       deselect_all: "Desmarcar todos"
@@ -32,7 +32,7 @@ es:
     failed_to_post_message: "¡Fallo al publicar el mensaje!"
     getting_started:
       alright_ill_wait: "Está bien, esperaré."
-      hey: "¡Hola, {{name}}!"
+      hey: "¡Hola, <%= name %>!"
       no_tags: "¡Eih, aún no sigues ninguna etiqueta! ¿Quieres continuar de todas formas?"
       preparing_your_stream: "Preparando tus novedades personalizadas..."
     infinite_scroll:
@@ -45,10 +45,10 @@ es:
       public: "Público - tu publicación es visible para todos, incluyendo buscadores"
     reshares:
       duplicate: "Que bien, ¿eh? ¡Has compartido esa publicación!"
-    search_for: "Buscar a {{name}}"
+    search_for: "Buscar a <%= name %>"
     show_more: "mostrar más"
     tags:
-      wasnt_that_interesting: "OK, supongo que #{{tagName}} no era tan interesante..."
+      wasnt_that_interesting: "OK, supongo que #<%= tagName %> no era tan interesante..."
     timeago:
       day: "1 día"
       days: "%d días"
@@ -67,6 +67,6 @@ es:
       years: "%d años"
     videos:
       unknown: "Tipo de video desconocido"
-      watch: "Ver este video con {{provider}}"
+      watch: "Ver este video con <%= provider %>"
     web_sockets:
       disconnected: "El canal está cerrado; las publicaciones no serán actualizadas al momento."

config/locales/javascript/javascript.eu.yml

@@ -10,14 +10,14 @@ eu:
       add_to_aspect: "Adiskidea gehitu"
       all_aspects: "Alderdi guztiak"
       select_aspects: "Alderdiak aukeratu"
-      started_sharing_with: "{{name}}(r)ekin harremanetan hasi zara!"
-      stopped_sharing_with: "Jada ez zaude {{name}}(r)ekin harremanetan."
+      started_sharing_with: "<%= name %>(r)ekin harremanetan hasi zara!"
+      stopped_sharing_with: "Jada ez zaude <%= name %>(r)ekin harremanetan."
       toggle:
-        few: "{{count}} alderdietan"
-        many: "{{count}} alderdietan"
-        one: "Alderdi {{count}}ean"
-        other: "{{count}} alderdietan"
-        two: "{{count}} alderditan"
+        few: "<%= count %> alderdietan"
+        many: "<%= count %> alderdietan"
+        one: "Alderdi <%= count %>ean"
+        other: "<%= count %> alderdietan"
+        two: "<%= count %> alderditan"
         zero: "Alderdial hautatu"
     aspect_navigation:
       deselect_all: "Guztiak deshautatu"
@@ -31,7 +31,7 @@ eu:
     failed_to_post_message: "Huts egin du mezuaren bidalketak!"
     getting_started:
       alright_ill_wait: "Beno, itxarongo dut."
-      hey: "Aizu, {{name}}!"
+      hey: "Aizu, <%= name %>!"
       no_tags: "Aizu, ez duzu etiketarik jarraitzen! Jarraitu hala ere?"
       preparing_your_stream: "Zure kronologia pertsonalizatua prestatzen..."
     infinite_scroll:
@@ -44,10 +44,10 @@ eu:
       public: "Publikoa - zure mezua edonork ikusi ahalko du, bai eta bilaketa zerbitzuetan agertu ere"
     reshares:
       duplicate: "Oso ona, e? Dagoeneko birpartekatu duzu mezu hori!"
-    search_for: "Bilatu {{name}}"
+    search_for: "Bilatu <%= name %>"
     show_more: "erakutsi gehiago"
     tags:
-      wasnt_that_interesting: "Beno, suposatzen dut #{{tagName}} ez zela oso interesgarria..."
+      wasnt_that_interesting: "Beno, suposatzen dut #<%= tagName %> ez zela oso interesgarria..."
     timeago:
       day: "egun bat"
       days: "%d egun"
@@ -65,6 +65,6 @@ eu:
       years: "%d urte"
     videos:
       unknown: "Bideo mota ezezaguna"
-      watch: "Ikusi bideo hau {{provider}}(e)n"
+      watch: "Ikusi bideo hau <%= provider %>(e)n"
     web_sockets:
       disconnected: "Websocketa itxita dago; mezuak ez dira denbora errealean azalduko."

config/locales/javascript/javascript.fi.yml

@@ -9,16 +9,16 @@ fi:
     aspect_dropdown:
       add_to_aspect: "Lisää kontakti"
       all_aspects: "Kaikki näkymät"
-      error: "Ei voitu aloittaa jakamaan käyttäjän {{name}} kanssa. Oletko sivuuttanut hänet?"
+      error: "Ei voitu aloittaa jakamaan käyttäjän <%= name %> kanssa. Oletko sivuuttanut hänet?"
       select_aspects: "Valitse näkymät"
-      started_sharing_with: "Olet alkanut jakaa käyttäjän {{name}} kanssa!"
-      stopped_sharing_with: "Olet lopettanut jakamisen käyttäjän {{name}} kanssa."
+      started_sharing_with: "Olet alkanut jakaa käyttäjän <%= name %> kanssa!"
+      stopped_sharing_with: "Olet lopettanut jakamisen käyttäjän <%= name %> kanssa."
       toggle:
-        few: "{{count}} näkymässä"
-        many: "{{count}} näkymässä"
-        one: "{{count}} näkymässä"
-        other: "{{count}} näkymässä"
-        two: "{{count}} näkymässä"
+        few: "<%= count %> näkymässä"
+        many: "<%= count %> näkymässä"
+        one: "<%= count %> näkymässä"
+        other: "<%= count %> näkymässä"
+        two: "<%= count %> näkymässä"
         zero: "Valitse näkymät"
     aspect_navigation:
       deselect_all: "Poista valinnat"
@@ -32,7 +32,7 @@ fi:
     failed_to_post_message: "Viestin lähetys epäonnistui!"
     getting_started:
       alright_ill_wait: "Okei, minä odotan."
-      hey: "Hei {{name}}!"
+      hey: "Hei <%= name %>!"
       no_tags: "Hei, et seuraa yhtäkään tagia!  Jatketaanko silti?"
       preparing_your_stream: "Yksilöllistä virtaasi valmistellaan..."
     infinite_scroll:
@@ -45,10 +45,10 @@ fi:
       public: "Julkinen - viestisi näkyvät kaikille mukaan lukien hakukoneet ja niiden tulokset"
     reshares:
       duplicate: "Olet jo uudelleenjakanut viesti!"
-    search_for: "Etsi nimellä {{name}}"
+    search_for: "Etsi nimellä <%= name %>"
     show_more: "näytä lisää"
     tags:
-      wasnt_that_interesting: "OK, #{{tagName}} ei tainnut ollakaan kovin kiinnostava aihe..."
+      wasnt_that_interesting: "OK, #<%= tagName %> ei tainnut ollakaan kovin kiinnostava aihe..."
     timeago:
       day: päivä
       days: "%d päivää"
@@ -65,6 +65,6 @@ fi:
       years: "%d vuotta"
     videos:
       unknown: "Tuntematon videomuoto"
-      watch: "Katso video {{provider}} :ssa"
+      watch: "Katso video <%= provider %> :ssa"
     web_sockets:
       disconnected: "Yhteys on suljettu; viestejä ei enää esitetä reaaliaikaisesti."

config/locales/javascript/javascript.fr.yml

@@ -9,16 +9,16 @@ fr:
     aspect_dropdown:
       add_to_aspect: "Ajouter le contact"
       all_aspects: "Tous les aspects"
-      error: "Impossible de partager avec {{name}}. Ignorez-vous cette personne ?"
+      error: "Impossible de partager avec <%= name %>. Ignorez-vous cette personne ?"
       select_aspects: "Choisir les aspects"
-      started_sharing_with: "Vous avez commencé à partager avec {{name}} !"
-      stopped_sharing_with: "Vous avez arrêté de partager avec {{name}}."
+      started_sharing_with: "Vous avez commencé à partager avec <%= name %> !"
+      stopped_sharing_with: "Vous avez arrêté de partager avec <%= name %>."
       toggle:
-        few: "Dans {{count}} aspects"
-        many: "Dans {{count}} aspects"
-        one: "Dans {{count}} aspect"
-        other: "Dans {{count}} aspects"
-        two: "Dans {{count}} aspects"
+        few: "Dans <%= count %> aspects"
+        many: "Dans <%= count %> aspects"
+        one: "Dans <%= count %> aspect"
+        other: "Dans <%= count %> aspects"
+        two: "Dans <%= count %> aspects"
         zero: "Sélectionnez les aspects"
     aspect_navigation:
       deselect_all: "Désélectionner tout"
@@ -32,7 +32,7 @@ fr:
     failed_to_post_message: "Impossible de partager le message !"
     getting_started:
       alright_ill_wait: "Bon, je vais attendre."
-      hey: "Hey, {{name}} !"
+      hey: "Hey, <%= name %> !"
       no_tags: "Hey, vous ne suivez aucun tag ! Continuer quand même ?"
       preparing_your_stream: "Préparation de votre flux personnalisé..."
     infinite_scroll:
@@ -45,10 +45,10 @@ fr:
       public: "Public - votre message sera visible de tous et trouvé par les moteurs de recherche"
     reshares:
       duplicate: "C'est si bien que ça ? Vous avez déjà repartagé ce message !"
-    search_for: "Chercher {{name}}"
+    search_for: "Chercher <%= name %>"
     show_more: "Voir plus"
     tags:
-      wasnt_that_interesting: "Ok, je suppose que #{{tagName}} n'est pas la seule chose qui vous intéresse..."
+      wasnt_that_interesting: "Ok, je suppose que #<%= tagName %> n'est pas la seule chose qui vous intéresse..."
     timeago:
       day: "environ un jour"
       days: "environ %d jours"
@@ -67,6 +67,6 @@ fr:
       years: "%d ans"
     videos:
       unknown: "Type de vidéo inconnu"
-      watch: "Voir cette vidéo sur {{provider}}"
+      watch: "Voir cette vidéo sur <%= provider %>"
     web_sockets:
       disconnected: "Le WebSocket est fermé, les messages ne seront plus diffusés en direct."

config/locales/javascript/javascript.gl.yml

@@ -9,10 +9,10 @@ gl:
     aspect_dropdown:
       add_to_aspect: "Engadir a un aspecto"
       toggle:
-        few: "En {{count}} aspectos"
-        many: "En {{count}} aspectos"
+        few: "En <%= count %> aspectos"
+        many: "En <%= count %> aspectos"
         one: "Nun aspecto"
-        other: "En {{count}} aspectos"
+        other: "En <%= count %> aspectos"
         zero: "Engadir a un aspecto"
     comments:
       hide: "Agochar os comentarios"
@@ -24,7 +24,7 @@ gl:
       no_more: "Non hai máis publicacións."
     publisher:
       at_least_one_aspect: "Ten que publicalo polo menos nun aspecto."
-    search_for: "Buscar por «{{name}}»"
+    search_for: "Buscar por «<%= name %>»"
     show_more: "Amosar máis"
     timeago:
       day: "un día."
@@ -44,6 +44,6 @@ gl:
       years: "%d anos."
     videos:
       unknown: "Tipo de vídeo descoñecido"
-      watch: "Ver o vídeo en {{provider}}"
+      watch: "Ver o vídeo en <%= provider %>"
     web_sockets:
       disconnected: "Pechouse o conector web, as publicacións deixarán de aparecer en canto se publiquen."

config/locales/javascript/javascript.he.yml

@@ -14,11 +14,11 @@ he:
       started_sharing_with: "{{name}}! התחלת לשתף עם"
       stopped_sharing_with: "{{name}} הפסקת לשתף עם"
       toggle:
-        few: "{{count}} תחומי עניין ב"
-        many: "{{count}} תחומי עניין ב"
-        one: "{{count}}בתחום עניין "
-        other: "ב־{{count}} היבטים"
-        two: "ב־{{count}} היבטים"
+        few: "<%= count %> תחומי עניין ב"
+        many: "<%= count %> תחומי עניין ב"
+        one: "<%= count %> בתחום עניין "
+        other: "ב־<%= count %> היבטים"
+        two: "ב־<%= count %> היבטים"
         zero: "בחר תחום עניין"
     aspect_navigation:
       deselect_all: "בטל את הסימון"
@@ -32,7 +32,7 @@ he:
     failed_to_post_message: "פרסום ההודעה נכשל!"
     getting_started:
       alright_ill_wait: "בסדר, אני אמתין."
-      hey: "שלום, {{name}}!"
+      hey: "שלום, <%= name %>!"
       no_tags: "?היי, לא עקבת אחרי אף תגית! לאן אתה רוצה להמשיך"
       preparing_your_stream: "החדשות האישיות שלך בשלבי הכנה"
     infinite_scroll:
@@ -45,10 +45,10 @@ he:
       public: "ציבורי - הרשומה שלך תהיה גלויה לכולם וניתן יהיה למצוא אותה במנועי חיפוש"
     reshares:
       duplicate: "כבר שיתפת רשומה זו בעבר "
-    search_for: " {{name}}חיפוש אחר"
+    search_for: " <%= name %>חיפוש אחר"
     show_more: "הצגת עוד"
     tags:
-      wasnt_that_interesting: "...זה לא היה כל כך מעניין#{{tagName}} אוקיי, אני מניח "
+      wasnt_that_interesting: "...זה לא היה כל כך מעניין#<%= tagName %> אוקיי, אני מניח "
     timeago:
       day: יום
       days: "%d ימים"
@@ -67,6 +67,6 @@ he:
       years: "%d שנים"
     videos:
       unknown: "סוג הווידאו אינו ידוע"
-      watch: " {{provider}}צפייה בסרטון וידאו זה באתר"
+      watch: " <%= provider %>צפייה בסרטון וידאו זה באתר"
     web_sockets:
-      disconnected: "צינור ההודעות סגור; הודעות לא יוצגו בזמן אמת"
+      disconnected: "צינור ההודעות סגור; הודעות לא יוצגו בזמן אמת"

config/locales/javascript/javascript.hu.yml

@@ -9,16 +9,16 @@ hu:
     aspect_dropdown:
       add_to_aspect: "Hozzáadás a csoporthoz"
       all_aspects: "Összes csoport"
-      error: "Nem indult el a megosztás vele: {{name}}. Visszavonod?"
+      error: "Nem indult el a megosztás vele: <%= name %>. Visszavonod?"
       select_aspects: "Csoportok kiválasztása"
-      started_sharing_with: "Mostantól megosztassz vele: {{name}}!"
-      stopped_sharing_with: "Nem osztassz meg többé vele: {{name}}."
+      started_sharing_with: "Mostantól megosztassz vele: <%= name %>!"
+      stopped_sharing_with: "Nem osztassz meg többé vele: <%= name %>."
       toggle:
-        few: "{{count}} csoportban"
-        many: "{{count}} csoportban"
-        one: "{{count}} csoportban"
-        other: "{{count}} csoportban"
-        two: "{{count}} csoportban"
+        few: "<%= count %> csoportban"
+        many: "<%= count %> csoportban"
+        one: "<%= count %> csoportban"
+        other: "<%= count %> csoportban"
+        two: "<%= count %> csoportban"
         zero: "Csoportok kiválasztása"
     aspect_navigation:
       deselect_all: "Összes kijelölés megszüntetése"
@@ -32,7 +32,7 @@ hu:
     failed_to_post_message: "Üzenet elküldése sikertelen!"
     getting_started:
       alright_ill_wait: "Rendben, várok!"
-      hey: "Szia {{name}}!"
+      hey: "Szia <%= name %>!"
       no_tags: "Hékás, nem követtél egy #címkét sem! Így is folytatod?"
       preparing_your_stream: "Személyre szabott hírfolyamod előkészítése..."
     infinite_scroll:
@@ -45,10 +45,10 @@ hu:
       public: "Nyilvános - ezt a bejegyzést bárki láthatja az interneten."
     reshares:
       duplicate: "Jó mi? De már egyszer megosztottad ezt a bejegyzést!"
-    search_for: "{{name}} keresése."
+    search_for: "<%= name %> keresése."
     show_more: tovább
     tags:
-      wasnt_that_interesting: "Oké, azt hiszem a #{{tagName}} nem volt annyira érdekes."
+      wasnt_that_interesting: "Oké, azt hiszem a #<%= tagName %> nem volt annyira érdekes."
     timeago:
       day: "egy nappal"
       days: "%d nappal"
@@ -65,6 +65,6 @@ hu:
       years: "%d évvel"
     videos:
       unknown: "Ismeretlen videó tipus"
-      watch: "Videó megtekintése itt: {{provider}}"
+      watch: "Videó megtekintése itt: <%= provider %>"
     web_sockets:
       disconnected: "A websocket zárolva van. A bejegyzések nem lesznek előben stream-elve."

config/locales/javascript/javascript.id.yml

@@ -9,11 +9,11 @@ id:
     aspect_dropdown:
       add_to_aspect: "Add to aspect"
       toggle:
-        few: "In {{count}} aspects"
-        many: "In {{count}} aspects"
-        one: "In {{count}} aspect"
-        other: "In {{count}} aspects"
-        two: "In {{count}} aspects"
+        few: "In <%= count %> aspects"
+        many: "In <%= count %> aspects"
+        one: "In <%= count %> aspect"
+        other: "In <%= count %> aspects"
+        two: "In <%= count %> aspects"
         zero: "Add to aspect"
     getting_started:
       preparing_your_stream: "Preparing your personialized stream..."

config/locales/javascript/javascript.is.yml

@@ -9,11 +9,11 @@ is:
     aspect_dropdown:
       add_to_aspect: "Add to aspect"
       toggle:
-        few: "In {{count}} aspects"
-        many: "In {{count}} aspects"
-        one: "In {{count}} aspect"
-        other: "In {{count}} aspects"
-        two: "In {{count}} aspects"
+        few: "In <%= count %> aspects"
+        many: "In <%= count %> aspects"
+        one: "In <%= count %> aspect"
+        other: "In <%= count %> aspects"
+        two: "In <%= count %> aspects"
         zero: "Add to aspect"
     confirm_dialog: "Ertu viss?"
     getting_started:
@@ -35,4 +35,4 @@ is:
       years: "%d ára"
     videos:
       unknown: "Óþekkt vídeó tegund"
-      watch: "Horfa á þetta vídeó á {{provider}}"
+      watch: "Horfa á þetta vídeó á <%= provider %>"

config/locales/javascript/javascript.it.yml

@@ -9,16 +9,16 @@ it:
     aspect_dropdown:
       add_to_aspect: Aggiungi
       all_aspects: "Tutti gli aspetti"
-      error: "Non è possibile condividere con {{name}}. E' tra gli utenti ignorati?"
+      error: "Non è possibile condividere con <%= name %>. E' tra gli utenti ignorati?"
       select_aspects: "Scegli gli aspetti"
-      started_sharing_with: "Hai iniziato a condividere con {{name}}!"
-      stopped_sharing_with: "Hai smesso di condividere con {{name}}."
+      started_sharing_with: "Hai iniziato a condividere con <%= name %>!"
+      stopped_sharing_with: "Hai smesso di condividere con <%= name %>."
       toggle:
-        few: "In {{count}} aspetti"
-        many: "In {{count}} aspetti"
-        one: "In {{count}} aspetto"
-        other: "In {{count}} aspetti"
-        two: "In {{count}} aspetti"
+        few: "In <%= count %> aspetti"
+        many: "In <%= count %> aspetti"
+        one: "In <%= count %> aspetto"
+        other: "In <%= count %> aspetti"
+        two: "In <%= count %> aspetti"
         zero: "Scegli gli aspetti"
     aspect_navigation:
       deselect_all: "Deseleziona tutti"
@@ -32,7 +32,7 @@ it:
     failed_to_post_message: "Invio messaggio fallito!"
     getting_started:
       alright_ill_wait: "Perfetto, aspetterò."
-      hey: "Ciao, {{name}}!"
+      hey: "Ciao, <%= name %>!"
       no_tags: "Non hai scelto di seguire alcun tag, vuoi continuare comunque?"
       preparing_your_stream: "Sto preparando il tuo stream personalizzato..."
     infinite_scroll:
@@ -45,10 +45,10 @@ it:
       public: "Pubblico - il tuo post sarà visibile a tutti, inclusi i motori di ricerca"
     reshares:
       duplicate: "Bello eh? Ma hai già condiviso quel post!"
-    search_for: "Ricerca per {{name}}"
+    search_for: "Ricerca per <%= name %>"
     show_more: continua...
     tags:
-      wasnt_that_interesting: "OK, immagino che #{{tagName}} non fosse così interessante..."
+      wasnt_that_interesting: "OK, immagino che #<%= tagName %> non fosse così interessante..."
     timeago:
       day: "un giorno"
       days: "%d giorni"
@@ -66,6 +66,6 @@ it:
       years: "%d anni"
     videos:
       unknown: "Tipo di video sconosciuto"
-      watch: "Guarda questo video su {{provider}}"
+      watch: "Guarda questo video su <%= provider %>"
     web_sockets:
       disconnected: "Il websocket è chiuso; i post non saranno più aggiornati in tempo reale."

config/locales/javascript/javascript.ja.yml

@@ -9,11 +9,11 @@ ja:
     aspect_dropdown:
       add_to_aspect: "Add to aspect"
       toggle:
-        few: "In {{count}} aspects"
-        many: "In {{count}} aspects"
-        one: "In {{count}} aspect"
-        other: "In {{count}} aspects"
-        two: "In {{count}} aspects"
+        few: "In <%= count %> aspects"
+        many: "In <%= count %> aspects"
+        one: "In <%= count %> aspect"
+        other: "In <%= count %> aspects"
+        two: "In <%= count %> aspects"
         zero: "Add to aspect"
     confirm_dialog: 本当にいいですか。
     getting_started:
@@ -24,7 +24,7 @@ ja:
       at_least_one_aspect: アスペクトを選択してから投稿してください。
     reshares:
       duplicate: "You've already reshared that post!"
-    search_for: "{{name}}を検索する"
+    search_for: "<%= name %>を検索する"
     timeago:
       day: 1日
       days: "%d日"
@@ -42,6 +42,6 @@ ja:
       years: "%d年"
     videos:
       unknown: 動画の種類が不明です
-      watch: "{{provider}}で動画を視聴する"
+      watch: "<%= provider %>で動画を視聴する"
     web_sockets:
       disconnected: 接続が解除されました。投稿のリアルタイム更新を中断します。

config/locales/javascript/javascript.ka.yml

@@ -9,16 +9,16 @@ ka:
     aspect_dropdown:
       add_to_aspect: "კონტაქტის დამატება"
       all_aspects: "ყველა ასპექტი"
-      error: "{{name}}-თან გაზიარების დაწყება ვერ მოხერხდა. იგნორირება ხომ არ გაუკეთეთ მას?"
+      error: "<%= name %>-თან გაზიარების დაწყება ვერ მოხერხდა. იგნორირება ხომ არ გაუკეთეთ მას?"
       select_aspects: "აირჩიეთ ასპექტები"
-      started_sharing_with: "თქვნ დაიწყეთ {{name}}-თან გაზიარება!"
-      stopped_sharing_with: "თქვენ შეწყვიტეთ {{name}}-თან გაზიარება."
+      started_sharing_with: "თქვნ დაიწყეთ <%= name %>-თან გაზიარება!"
+      stopped_sharing_with: "თქვენ შეწყვიტეთ <%= name %>-თან გაზიარება."
       toggle:
-        few: "{{count}} ასპექტში"
-        many: "{{count}} ასპექტში"
-        one: "{{count}} ასპექტში"
-        other: "{{count}} ასპექტში"
-        two: "{{count}} ასპექტში"
+        few: "<%= count %> ასპექტში"
+        many: "<%= count %> ასპექტში"
+        one: "<%= count %> ასპექტში"
+        other: "<%= count %> ასპექტში"
+        two: "<%= count %> ასპექტში"
         zero: "აირჩიეთ ასპექტები"
     aspect_navigation:
       deselect_all: "მონიშვნის მოხსნა"
@@ -32,7 +32,7 @@ ka:
     failed_to_post_message: "შეტყობინების გამოცხადება ჩაიშალა!"
     getting_started:
       alright_ill_wait: "კარგი, მოვიცდი."
-      hey: "ჰეი, {{name}}!"
+      hey: "ჰეი, <%= name %>!"
       no_tags: "ჰეი, თქვენ არ მიყვებით არცერთ ტეგს! მაინც გსურთ გაგრძელება?"
       preparing_your_stream: "თქვენი პერსონალიზებული ნაკადი მზადდება..."
     infinite_scroll:
@@ -45,10 +45,10 @@ ka:
       public: "საჯარო - თქვენს პოსტს დაინახავს ყველა და მას მოძებნილი იქნებიან საძიბო სისტემებით"
     reshares:
       duplicate: "ასეთი მაგარია?  თქვენ უკვე გააზიარეთ ეს პოსტი!"
-    search_for: "ძებნა {{name}}"
+    search_for: "ძებნა <%= name %>"
     show_more: "მეტის ჩვენება"
     tags:
-      wasnt_that_interesting: "კარგი, მე ვფიქრობ რომ #{{tagName}} არც ისე საინტერესო იყო..."
+      wasnt_that_interesting: "კარგი, მე ვფიქრობ რომ #<%= tagName %> არც ისე საინტერესო იყო..."
     timeago:
       day: დღე
       days: "%d დღე"
@@ -67,6 +67,6 @@ ka:
       years: "%d წელი"
     videos:
       unknown: "ვიდეოს ტიპი უცნობია"
-      watch: "ვიდეოს ნახვა საიტზე {{provider}}"
+      watch: "ვიდეოს ნახვა საიტზე <%= provider %>"
     web_sockets:
       disconnected: "ვებ-სოკეტი დახურულია; განხადებების ნაკადი აღარ მოედინება პირდაპირ."

config/locales/javascript/javascript.ko.yml

@@ -9,16 +9,16 @@ ko:
     aspect_dropdown:
       add_to_aspect: "애스펙에 넣기"
       all_aspects: "모든 에스팩"
-      error: "{{name}}님과 공유를 시작할 수 없습니다. 혹시 무시하고 있습니까?"
+      error: "<%= name %>님과 공유를 시작할 수 없습니다. 혹시 무시하고 있습니까?"
       select_aspects: "에스팩 선택"
-      started_sharing_with: "{{name}}님과의 공유를 시작합니다!"
-      stopped_sharing_with: "{{name}}님과의 공유를 멈췄습니다."
+      started_sharing_with: "<%= name %>님과의 공유를 시작합니다!"
+      stopped_sharing_with: "<%= name %>님과의 공유를 멈췄습니다."
       toggle:
-        few: "애스펙 {{count}}개 안에 있습니다"
-        many: "애스펙 {{count}}개 안에 있습니다"
+        few: "애스펙 <%= count %>개 안에 있습니다"
+        many: "애스펙 <%= count %>개 안에 있습니다"
         one: "애스펙 한 개 안에 있습니다"
-        other: "애스펙 {{count}}개 안에 있습니다"
-        two: "{{count}}개의 에스팩에서"
+        other: "애스펙 <%= count %>개 안에 있습니다"
+        two: "<%= count %>개의 에스팩에서"
         zero: "애스펙에 넣기"
     aspect_navigation:
       deselect_all: "선택 해제"
@@ -31,7 +31,7 @@ ko:
     failed_to_like: "좋아요를 실패했습니다!"
     failed_to_post_message: "메시지 게시를 실패하였습니다!"
     getting_started:
-      hey: "{{name}}님 안녕하세요?"
+      hey: "<%= name %>님 안녕하세요?"
       no_tags: "태그를 팔로우하지 않았습니다. 그래도 계속하시겠습니까?"
       preparing_your_stream: "개인화 스트림 준비중···"
     infinite_scroll:
@@ -44,10 +44,10 @@ ko:
       public: "공개 - 내 게시물을 누구나 볼 수 있고 검색 엔진으로 찾을 수 있습니다"
     reshares:
       duplicate: "이미 재공유된 게시물입니다!"
-    search_for: "{{name}} 검색"
+    search_for: "<%= name %> 검색"
     show_more: "더 보기"
     tags:
-      wasnt_that_interesting: "처리했습니다. #{{tagName}} 태그는 흥미롭지 않았군요?"
+      wasnt_that_interesting: "처리했습니다. #<%= tagName %> 태그는 흥미롭지 않았군요?"
     timeago:
       day: 하루
       days: "%d일"
@@ -65,6 +65,6 @@ ko:
       years: "%d년"
     videos:
       unknown: "알 수 없는 동영상 형식"
-      watch: "동영상을 {{provider}}에서 보기"
+      watch: "동영상을 <%= provider %>에서 보기"
     web_sockets:
       disconnected: "웹소켓이 닫혔습니다. 앞으로는 게시물이 실시간으로 제공되지 않습니다."

config/locales/javascript/javascript.ml.yml

@@ -24,8 +24,8 @@ ml:
       years: "%d വര്‍ഷങ്ങള്‍ക്ക്"
     videos: 
       unknown: "അജ്ഞാതമായ തരം വീഡിയോ"
-      watch: "ഈ വീഡിയോ {{provider}}ല്‍ കാണുക"
-    search_for: "{{name}}നായി തിരയുക"
+      watch: "ഈ വീഡിയോ <%= provider %>ല്‍ കാണുക"
+    search_for: "<%= name %>നായി തിരയുക"
     infinite_scroll: 
       no_more: "കൂടുതല്‍ പോസ്റ്റുകളൊന്നുമില്ല."
     publisher: 
@@ -40,10 +40,10 @@ ml:
       add_to_aspect: "Add to aspect"
       toggle:
         zero: "Add to aspect"
-        one: "In {{count}} aspect"
-        few: "In {{count}} aspects"
-        many: "In {{count}} aspects"
-        other: "In {{count}} aspects"
+        one: "In <%= count %> aspect"
+        few: "In <%= count %> aspects"
+        many: "In <%= count %> aspects"
+        other: "In <%= count %> aspects"
     show_more: "show more"
     failed_to_like: "Failed to like!"
     failed_to_post_message: "Failed to post message!"

config/locales/javascript/javascript.ms.yml

@@ -9,16 +9,16 @@ ms:
     aspect_dropdown:
       add_to_aspect: "Tambah kenalan"
       all_aspects: "Semua aspek"
-      error: "Tidak dapat berkongsi dengan {{name}}.  Adakah anda mengabaikan mereka?"
+      error: "Tidak dapat berkongsi dengan <%= name %>.  Adakah anda mengabaikan mereka?"
       select_aspects: "Pilih kenalan"
-      started_sharing_with: "Anda telah mula berkongsi dengan {{name}}!"
-      stopped_sharing_with: "Anda telah berhenti berkongsi dengan {{name}}."
+      started_sharing_with: "Anda telah mula berkongsi dengan <%= name %>!"
+      stopped_sharing_with: "Anda telah berhenti berkongsi dengan <%= name %>."
       toggle:
-        few: "Dalam {{count}} aspek"
-        many: "Dalam {{count}} aspek"
-        one: "Dalam {{count}} aspek"
-        other: "dalam {{count}} aspek"
-        two: "Dalam {{count}} aspek"
+        few: "Dalam <%= count %> aspek"
+        many: "Dalam <%= count %> aspek"
+        one: "Dalam <%= count %> aspek"
+        other: "dalam <%= count %> aspek"
+        two: "Dalam <%= count %> aspek"
         zero: "Pilih aspek"
     aspect_navigation:
       deselect_all: "menyahpilih semua"
@@ -32,7 +32,7 @@ ms:
     failed_to_post_message: "Gagal untuk pos mesej!"
     getting_started:
       alright_ill_wait: "Baiklah, saya akan tunggu."
-      hey: "Hei, {{name}}!"
+      hey: "Hei, <%= name %>!"
       no_tags: "Hei, anda tidak mengikuti mana-mana tag! Teruskan juga?"
       preparing_your_stream: "Menyediakan strim peribadi anda..."
     infinite_scroll:
@@ -45,10 +45,10 @@ ms:
       public: "Awam - Pos anda akan dilihat oleh semua orang dan dijumpai oleh enjin carian"
     reshares:
       duplicate: "Yang baik, kan? Anda telah berkongsi semula pos itu!"
-    search_for: "Mencari {{name}}"
+    search_for: "Mencari <%= name %>"
     show_more: "tunjuk lagi"
     tags:
-      wasnt_that_interesting: "OK, saya mengandaikan # {{tagName}} tidak semua yang menarik..."
+      wasnt_that_interesting: "OK, saya mengandaikan # <%= tagName %> tidak semua yang menarik..."
     timeago:
       day: sehari
       days: "%d hari"
@@ -67,6 +67,6 @@ ms:
       years: "%d tahun"
     videos:
       unknown: "Jenis video tidak diketahui"
-      watch: "Tonton video ini di {{provider}}"
+      watch: "Tonton video ini di <%= provider %>"
     web_sockets:
       disconnected: "Websocket ditutup; pos tidak lagi akan distrim secara langsung."

config/locales/javascript/javascript.nb.yml

@@ -9,16 +9,16 @@ nb:
     aspect_dropdown:
       add_to_aspect: "Legg til kategori"
       all_aspects: "Alle kategorier"
-      error: "Kunne ikke begynne å dele med {{name}}.  Ignorerer du dem?"
+      error: "Kunne ikke begynne å dele med <%= name %>.  Ignorerer du dem?"
       select_aspects: "Velg kategori"
-      started_sharing_with: "Du har begynt å dele med {{name}}!"
-      stopped_sharing_with: "Du har sluttet å dele med {{name}}."
+      started_sharing_with: "Du har begynt å dele med <%= name %>!"
+      stopped_sharing_with: "Du har sluttet å dele med <%= name %>."
       toggle:
-        few: "I {{count}} kategorier"
-        many: "I {{count}} kategorier"
-        one: "I {{count}} kategori"
-        other: "I {{count}} kategorier"
-        two: "I {{count}} kategorier"
+        few: "I <%= count %> kategorier"
+        many: "I <%= count %> kategorier"
+        one: "I <%= count %> kategori"
+        other: "I <%= count %> kategorier"
+        two: "I <%= count %> kategorier"
         zero: "Legg til kategori"
     aspect_navigation:
       deselect_all: "Avmerk alle"
@@ -32,7 +32,7 @@ nb:
     failed_to_post_message: "Klarte ikke å publisere post!"
     getting_started:
       alright_ill_wait: "Greit, jeg venter."
-      hey: "Hei, {{name}}!"
+      hey: "Hei, <%= name %>!"
       no_tags: "Hei, du har ikke fulgt noen tagger! Fortsett likevel?"
       preparing_your_stream: "Preparing your personialized stream..."
     infinite_scroll:
@@ -45,10 +45,10 @@ nb:
       public: "Offentlig - posten din vil være synlig for alle og kan bli funnet av søkemotorer"
     reshares:
       duplicate: "du har allerede delt denne posten!"
-    search_for: "Søk etter {{name}}"
+    search_for: "Søk etter <%= name %>"
     show_more: "vis mer"
     tags:
-      wasnt_that_interesting: "OK, jeg skjønner at #{{tagName}} ikke var så spennende likevel..."
+      wasnt_that_interesting: "OK, jeg skjønner at #<%= tagName %> ikke var så spennende likevel..."
     timeago:
       day: "en dag"
       days: "%d dager"
@@ -67,4 +67,4 @@ nb:
       years: "%d år"
     videos:
       unknown: "Ukjent videotype"
-      watch: "Se denne videoen på {{provider}}"
+      watch: "Se denne videoen på <%= provider %>"

config/locales/javascript/javascript.nl.yml

@@ -11,11 +11,11 @@ nl:
       all_aspects: "Alle aspecten"
       select_aspects: "Selecteer aspecten"
       toggle:
-        few: "In {{count}} aspecten"
-        many: "In {{count}} aspecten"
-        one: "In {{count}} aspect"
-        other: "In {{count}} aspecten"
-        two: "In {{count}} aspecten"
+        few: "In <%= count %> aspecten"
+        many: "In <%= count %> aspecten"
+        one: "In <%= count %> aspect"
+        other: "In <%= count %> aspecten"
+        two: "In <%= count %> aspecten"
         zero: "Voeg toe aan aspect"
     aspect_navigation:
       deselect_all: "Alles deselecteren"
@@ -38,7 +38,7 @@ nl:
       public: "Openbaar - je post is zichtbaar voor iedereen en kan gevonden worden door zoekmachines"
     reshares:
       duplicate: "Je hebt deze post al doorgegeven!"
-    search_for: "Zoek naar {{name}}"
+    search_for: "Zoek naar <%= name %>"
     show_more: "laat meer zien"
     timeago:
       day: "een dag"
@@ -56,6 +56,6 @@ nl:
       years: "%d jaar"
     videos:
       unknown: "Onbekend video type"
-      watch: "Bekijk deze video op {{provider}}"
+      watch: "Bekijk deze video op <%= provider %>"
     web_sockets:
       disconnected: "De websocket is gesloten; posts worden niet langer live gestreamd."

config/locales/javascript/javascript.nn.yml

@@ -9,16 +9,16 @@ nn:
     aspect_dropdown:
       add_to_aspect: "Legg til kontakt"
       all_aspects: "Alle aspekta"
-      error: "Klarte ikkje å byrja å dela med {{name}}.  Ignorerer du dei?"
+      error: "Klarte ikkje å byrja å dela med <%= name %>.  Ignorerer du dei?"
       select_aspects: "Vel aspekt"
-      started_sharing_with: "Du har byrja å dela med {{name}}."
-      stopped_sharing_with: "Du deler ikkje lenger med {{name}}."
+      started_sharing_with: "Du har byrja å dela med <%= name %>."
+      stopped_sharing_with: "Du deler ikkje lenger med <%= name %>."
       toggle:
-        few: "I {{count}} aspekt"
-        many: "I {{count}} aspekt"
-        one: "I {{count}} aspekt"
-        other: "I {{count}} aspekt"
-        two: "I {{count}} aspekt"
+        few: "I <%= count %> aspekt"
+        many: "I <%= count %> aspekt"
+        one: "I <%= count %> aspekt"
+        other: "I <%= count %> aspekt"
+        two: "I <%= count %> aspekt"
         zero: "Vel aspekt"
     aspect_navigation:
       deselect_all: "Vel vekk alle"
@@ -32,7 +32,7 @@ nn:
     failed_to_post_message: "Klarte ikkje å senda meldinga."
     getting_started:
       alright_ill_wait: "Greitt, eg ventar."
-      hey: "Hei, {{name}}!"
+      hey: "Hei, <%= name %>!"
       no_tags: "Du har ikkje følgt nokon etikett. Vil du likevel halda fram?"
       preparing_your_stream: "Lagar den tilpassa straumen din …"
     infinite_scroll:
@@ -45,10 +45,10 @@ nn:
       public: "Offentleg - alle kan sjå meldinga di og ho kan bli funnen av søkjemotorar"
     reshares:
       duplicate: "Så bra, altså? Men du har allereie delt meldinga :-)"
-    search_for: "Leit etter {{name}}"
+    search_for: "Leit etter <%= name %>"
     show_more: "syn meir"
     tags:
-      wasnt_that_interesting: "Greitt, #{{tagName}} var vel kanskje ikkje så interessant …"
+      wasnt_that_interesting: "Greitt, #<%= tagName %> var vel kanskje ikkje så interessant …"
     timeago:
       day: "om dagen"
       days: "%d dagar"
@@ -65,6 +65,6 @@ nn:
       years: "%d år"
     videos:
       unknown: "Ukjend videotype"
-      watch: "Sjå denne videoen hos {{provider}}"
+      watch: "Sjå denne videoen hos <%= provider %>"
     web_sockets:
       disconnected: "Nettendepunktet er lukka - meldingane vil ikkje lenger kunna strøymast direkte."

config/locales/javascript/javascript.pl.yml

@@ -9,16 +9,16 @@ pl:
     aspect_dropdown:
       add_to_aspect: "Dodaj kontakt"
       all_aspects: "Wszystkie aspekty"
-      error: "Nie można zacząć dzielić się z {{name}}. Może ich ignorujesz?"
+      error: "Nie można zacząć dzielić się z <%= name %>. Może ich ignorujesz?"
       select_aspects: "Wybierz aspekty"
-      started_sharing_with: "Od teraz dzielisz się z {{name}}!"
-      stopped_sharing_with: "Nie dzielisz się już z {{name}}."
+      started_sharing_with: "Od teraz dzielisz się z <%= name %>!"
+      stopped_sharing_with: "Nie dzielisz się już z <%= name %>."
       toggle:
-        few: "W {{count}} aspektach"
-        many: "W {{count}} aspektach"
-        one: "W {{count}} aspekcie"
-        other: "W {{count}} aspektach"
-        two: "W {{count}} aspektach"
+        few: "W <%= count %> aspektach"
+        many: "W <%= count %> aspektach"
+        one: "W <%= count %> aspekcie"
+        other: "W <%= count %> aspektach"
+        two: "W <%= count %> aspektach"
         zero: "Wybierz aspekty"
     aspect_navigation:
       deselect_all: "Odznacz wszystkie"
@@ -32,7 +32,7 @@ pl:
     failed_to_post_message: "Nie można wysłać wiadomości!"
     getting_started:
       alright_ill_wait: "Dobrze, poczekam."
-      hey: "Hej, {{name}}!"
+      hey: "Hej, <%= name %>!"
       no_tags: "Hej, nie obserwujesz żadnych znaczników! Kontynuować mimo to?"
       preparing_your_stream: "Przygotowanie spersonalizowanego strumienia..."
     infinite_scroll:
@@ -45,10 +45,10 @@ pl:
       public: "Publiczny - wpis będzie widoczny dla wszystkich i można go znaleźć przez wyszukiwarki"
     reshares:
       duplicate: "Już przekaza@{m:łeś|f:łaś|n:no} dalej ten wpis!"
-    search_for: "Znajdź: {{name}}"
+    search_for: "Znajdź: <%= name %>"
     show_more: "wyświetl więcej"
     tags:
-      wasnt_that_interesting: "OK, przypuszczam, że #{{tagName}} nie był, aż tak interesujący..."
+      wasnt_that_interesting: "OK, przypuszczam, że #<%= tagName %> nie był, aż tak interesujący..."
     timeago:
       day: dzień
       days: "%d dni"
@@ -67,6 +67,6 @@ pl:
       years: "%d lat"
     videos:
       unknown: "Nieznany typ wideo"
-      watch: "Zobacz ten film na {{provider}}"
+      watch: "Zobacz ten film na <%= provider %>"
     web_sockets:
       disconnected: "Kanał komunikacji jest zamknięty; wpisy nie będą publikowane online."

config/locales/javascript/javascript.pt-BR.yml

@@ -9,16 +9,16 @@ pt-BR:
     aspect_dropdown:
       add_to_aspect: "Adicionar contato"
       all_aspects: "Todos aspectos"
-      error: "Não foi possível compartilhar com {{name}}.  Deseja ignorar isto?"
+      error: "Não foi possível compartilhar com <%= name %>.  Deseja ignorar isto?"
       select_aspects: "Selecione os aspectos"
-      started_sharing_with: "Você começou a compartilhar com {{name}}!"
-      stopped_sharing_with: "Você parou de compartilhar com {{name}}."
+      started_sharing_with: "Você começou a compartilhar com <%= name %>!"
+      stopped_sharing_with: "Você parou de compartilhar com <%= name %>."
       toggle:
-        few: "Em {{count}} aspectos"
-        many: "Em {{count}} aspectos"
-        one: "Em {{count}} aspecto"
-        other: "Em {{count}} aspectos"
-        two: "Em {{count}} aspectos"
+        few: "Em <%= count %> aspectos"
+        many: "Em <%= count %> aspectos"
+        one: "Em <%= count %> aspecto"
+        other: "Em <%= count %> aspectos"
+        two: "Em <%= count %> aspectos"
         zero: "Adicione para aspecto"
     aspect_navigation:
       deselect_all: "Desmarcar tudo"
@@ -32,7 +32,7 @@ pt-BR:
     failed_to_post_message: "Falha em postar a mensagem!"
     getting_started:
       alright_ill_wait: "Tudo bem, eu esperarei."
-      hey: "Ei, {{name}}!"
+      hey: "Ei, <%= name %>!"
       no_tags: "Ei, você não está seguindo todas as tags! Continuar assim mesmo?"
       preparing_your_stream: "Preparando seu fluxo personalizado..."
     infinite_scroll:
@@ -45,10 +45,10 @@ pt-BR:
       public: "Pública - a sua postagem será totalmente visível na web e poderá ser encontrada pelos mecanismos de buscas, Google, Bing e etc..."
     reshares:
       duplicate: "Você já compartilhou essa postagem."
-    search_for: "Procurar por {{name}}"
+    search_for: "Procurar por <%= name %>"
     show_more: "mostrar mais"
     tags:
-      wasnt_that_interesting: "Ok, eu acho que #{{tagName}} não era tão interessante..."
+      wasnt_that_interesting: "Ok, eu acho que #<%= tagName %> não era tão interessante..."
     timeago:
       day: "um dia"
       days: "%d dias"
@@ -65,6 +65,6 @@ pt-BR:
       years: "%d anos"
     videos:
       unknown: "Tipo de vídeo desconhecido"
-      watch: "Assista este vídeo no {{provider}}"
+      watch: "Assista este vídeo no <%= provider %>"
     web_sockets:
       disconnected: "A conexão foi encerrada, não é mais possível transmitir novas postagens."

config/locales/javascript/javascript.pt-PT.yml

@@ -9,16 +9,16 @@ pt-PT:
     aspect_dropdown:
       add_to_aspect: "Adicionar contacto"
       all_aspects: "Todos os aspectos"
-      error: "Não foi possível começar a partilhar com {{name}}. Você está a ignorá-los?"
+      error: "Não foi possível começar a partilhar com <%= name %>. Você está a ignorá-los?"
       select_aspects: "Seleccionar aspectos"
-      started_sharing_with: "Começou a partilhar com {{name}}!"
-      stopped_sharing_with: "Deixou de partilhar com {{name}}."
+      started_sharing_with: "Começou a partilhar com <%= name %>!"
+      stopped_sharing_with: "Deixou de partilhar com <%= name %>."
       toggle:
-        few: "Em {{count}} aspectos"
-        many: "Em {{count}} aspectos"
-        one: "Em {{count}} aspecto"
-        other: "Em {{count}} aspectos"
-        two: "Em {{count}} aspectos"
+        few: "Em <%= count %> aspectos"
+        many: "Em <%= count %> aspectos"
+        one: "Em <%= count %> aspecto"
+        other: "Em <%= count %> aspectos"
+        two: "Em <%= count %> aspectos"
         zero: "Seleccione os aspectos"
     aspect_navigation:
       deselect_all: "Desmarcar todos"
@@ -32,7 +32,7 @@ pt-PT:
     failed_to_post_message: "Falhou ao publicar a mensagem!"
     getting_started:
       alright_ill_wait: "Tudo bem, eu esperarei."
-      hey: "Ei, {{name}}!"
+      hey: "Ei, <%= name %>!"
       no_tags: "Ei, não está a seguir nenhuma etiqueta! Continuar mesmo assim?"
       preparing_your_stream: "A preparar o seu Stream personalizado..."
     infinite_scroll:
@@ -45,10 +45,10 @@ pt-PT:
       public: "Público - A sua publicação será visível para todos e encontrada por motores de busca"
     reshares:
       duplicate: "Que bom, hein? Você já republicou essa mensagem!"
-    search_for: "Procurar por {{name}}"
+    search_for: "Procurar por <%= name %>"
     show_more: "mostrar mais"
     tags:
-      wasnt_that_interesting: "OK, suponho que #{{tagName}} não era assim tão interessante..."
+      wasnt_that_interesting: "OK, suponho que #<%= tagName %> não era assim tão interessante..."
     timeago:
       day: "um dia"
       days: "%d dias"
@@ -67,6 +67,6 @@ pt-PT:
       years: "%d anos"
     videos:
       unknown: "Formato de vídeo desconhecido"
-      watch: "Visualize este vídeo no {{provider}}"
+      watch: "Visualize este vídeo no <%= provider %>"
     web_sockets:
       disconnected: "A websocket está fechada; as publicações não serão distribuídas em directo."

config/locales/javascript/javascript.ro.yml

@@ -9,16 +9,16 @@ ro:
     aspect_dropdown:
       add_to_aspect: "Adaugă la contacte"
       all_aspects: "Toate aspectele"
-      error: "Nu sa putut incepe impartirea de publicatii cu {{name}}. Ii ignorati cumva ?"
+      error: "Nu sa putut incepe impartirea de publicatii cu <%= name %>. Ii ignorati cumva ?"
       select_aspects: "Selectează aspecte"
-      started_sharing_with: "Ati inceput sa impartiti publicatii cu {{name}}!"
-      stopped_sharing_with: "Nu mai imparti publicatii cu {{name}}."
+      started_sharing_with: "Ati inceput sa impartiti publicatii cu <%= name %>!"
+      stopped_sharing_with: "Nu mai imparti publicatii cu <%= name %>."
       toggle:
-        few: "În {{count}} aspecte"
-        many: "În {{count}} aspecte"
-        one: "În {{count}} aspect"
-        other: "În {{count}} aspecte"
-        two: "In {{count}} aspecte"
+        few: "În <%= count %> aspecte"
+        many: "În <%= count %> aspecte"
+        one: "În <%= count %> aspect"
+        other: "În <%= count %> aspecte"
+        two: "In <%= count %> aspecte"
         zero: "Selectati aspecte"
     aspect_navigation:
       deselect_all: "Deselectează tot"
@@ -32,7 +32,7 @@ ro:
     failed_to_post_message: "Nu sa reusit trimiterea mesajului!"
     getting_started:
       alright_ill_wait: "In regulă, o să aștept."
-      hey: "Salutare, {{name}}!"
+      hey: "Salutare, <%= name %>!"
       no_tags: "Hopa, nu urmati nicio eticheta! Continuati si asa ?"
       preparing_your_stream: "Se pregateste fluxul personalizat pentru dvs..."
     infinite_scroll:
@@ -44,10 +44,10 @@ ro:
       limited: "Limitat - publicatia va fi vazuta doar de catre persoanele cu care imparti publicatii"
     reshares:
       duplicate: "E chiar asa de tare, hmm?  Ati mai raspandit o data aceasta publicatie!"
-    search_for: "Caută {{name}}"
+    search_for: "Caută <%= name %>"
     show_more: "arată mai mult"
     tags:
-      wasnt_that_interesting: "Bine, presupun ca #{{tagName}} nu a fost chiar atat de interesant..."
+      wasnt_that_interesting: "Bine, presupun ca #<%= tagName %> nu a fost chiar atat de interesant..."
     timeago:
       day: "o zi"
       days: "%d zile"
@@ -66,6 +66,6 @@ ro:
       years: "%d ani"
     videos:
       unknown: "Format de video necunoscut"
-      watch: "Vizualizează acest video pe {{provider}}"
+      watch: "Vizualizează acest video pe <%= provider %>"
     web_sockets:
       disconnected: "Websocket-ul e închis; posturile nu vor mai fi transmise în direct."

config/locales/javascript/javascript.ru.yml

@@ -9,16 +9,16 @@ ru:
     aspect_dropdown:
       add_to_aspect: "Добавить контакт"
       all_aspects: "Все аспекты"
-      error: "Невозможно начать делиться с пользователем {{name}}.  Возможно, вы его заблокировали?"
+      error: "Невозможно начать делиться с пользователем <%= name %>.  Возможно, вы его заблокировали?"
       select_aspects: "Выбрать аспекты"
-      started_sharing_with: "Вы начали делиться с {{name}}!"
-      stopped_sharing_with: "Вы перестали делиться с {{name}}."
+      started_sharing_with: "Вы начали делиться с <%= name %>!"
+      stopped_sharing_with: "Вы перестали делиться с <%= name %>."
       toggle:
-        few: "В {{count}} аспектах"
-        many: "В {{count}} аспектах"
-        one: "В {{count}} аспекте"
-        other: "В {{count}} аспектах"
-        two: "В {{count}} аспектах"
+        few: "В <%= count %> аспектах"
+        many: "В <%= count %> аспектах"
+        one: "В <%= count %> аспекте"
+        other: "В <%= count %> аспектах"
+        two: "В <%= count %> аспектах"
         zero: "Выбрать аспекты"
     aspect_navigation:
       deselect_all: "Выключить все"
@@ -32,7 +32,7 @@ ru:
     failed_to_post_message: "Не удалось отправить сообщение!"
     getting_started:
       alright_ill_wait: "Хорошо, я подожду."
-      hey: "Привет, {{name}}!"
+      hey: "Привет, <%= name %>!"
       no_tags: "Вы не следите ни за одной меткой! Все равно продолжить?"
       preparing_your_stream: "Подготовка вашего личного потока..."
     infinite_scroll:
@@ -45,10 +45,10 @@ ru:
       public: "Публичная - ваша запись будет видна всем, включая поисковые системы"
     reshares:
       duplicate: "Настолько круто, да? Вы уже поделились этой записью!"
-    search_for: "Искать {{name}}"
+    search_for: "Искать <%= name %>"
     show_more: "показать больше"
     tags:
-      wasnt_that_interesting: "Что ж, видимо, метка #{{tagName}} была не такой уж интересной..."
+      wasnt_that_interesting: "Что ж, видимо, метка #<%= tagName %> была не такой уж интересной..."
     timeago:
       day: день
       days: "%d дней[-я]"
@@ -66,6 +66,6 @@ ru:
       years: "%d лет"
     videos:
       unknown: "Неизвестный видеоформат"
-      watch: "Смотреть это видео на {{provider}}"
+      watch: "Смотреть это видео на <%= provider %>"
     web_sockets:
       disconnected: "WebSocket закрыт; сообщения больше не будут транслироваться в прямом эфире."