social_stream 2.0.0.beta2 → 2.0.0.beta3

data/oauth2_server/social_stream-oauth2_server.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta2')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta3')
   s.add_runtime_dependency('rack-oauth2', '~> 1.0.0')
 
   s.add_development_dependency('rspec-rails', '~> 2.8.0')

data/ostatus/Rakefile

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require 'bundler/gem_tasks'
 
 require 'rdoc/task'
@@ -16,8 +17,6 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Bundler::GemHelper.install_tasks
-
 # Modify this gem's tags
 class Bundler::GemHelper
   def version_tag

data/ostatus/config/locales/en.yml

@@ -1,34 +1,35 @@
+---
 en:
- activity:
-  verb:
-    follow:
-      RemoteSubject:
-        title: "%{subject} added %{contact} as contact."
-        message: "%{name} added you as contact."
-        notification:
-          subject: "%{name} added you as contact."
-          body: "%{name} added you as contact."
-    like:
-      RemoteSubject:
-        title: "%{subject} is a fan of %{contact}."
-        message: "%{name} is now your fan."
-        notification:
-          subject: "%{name} is now your fan."
-          body: "%{name} is now your fan."
-    make-friend:
-      RemoteSubject:
-        title: "%{subject} and %{contact} are now connected."
-        message: "%{name} also added you as contact."
-        notification:
-          subject: "%{name} also added you as contact."
-          body: "%{name} also added you as contact."
-    post:
-      RemoteSubject:
-        notification:
-          subject: "%{name} has posted something(%{direct_object}) in your wall"
-          body: "%{name} has posted something(%{direct_object}) in your wall"
-    update:
-      RemoteSubject:
-        notification:
-          subject: "%{name} has updated %{direct_object} in your wall"
-          body: "%{name} has updated something(%{direct_object}) in your wall"
+  activity:
+    verb:
+      follow:
+        RemoteSubject:
+          title: '%{subject} added %{contact} as contact.'
+          message: '%{name} added you as contact.'
+          notification:
+            subject: '%{name} added you as contact.'
+            body: '%{name} added you as contact.'
+      like:
+        RemoteSubject:
+          title: '%{subject} is a fan of %{contact}.'
+          message: '%{name} is now your fan.'
+          notification:
+            subject: '%{name} is now your fan.'
+            body: '%{name} is now your fan.'
+      make-friend:
+        RemoteSubject:
+          title: '%{subject} and %{contact} are now connected.'
+          message: '%{name} also added you as contact.'
+          notification:
+            subject: '%{name} also added you as contact.'
+            body: '%{name} also added you as contact.'
+      post:
+        RemoteSubject:
+          notification:
+            subject: '%{name} has posted something(%{direct_object}) in your wall'
+            body: '%{name} has posted something(%{direct_object}) in your wall'
+      update:
+        RemoteSubject:
+          notification:
+            subject: '%{name} has updated %{direct_object} in your wall'
+            body: '%{name} has updated something(%{direct_object}) in your wall'

data/ostatus/config/locales/zh.yml

@@ -0,0 +1,35 @@
+---
+zh:
+  activity:
+    verb:
+      follow:
+        RemoteSubject:
+          title: '%{subject} added %{contact} as contact.'
+          message: '%{name} added you as contact.'
+          notification:
+            subject: '%{name} added you as contact.'
+            body: '%{name} added you as contact.'
+      like:
+        RemoteSubject:
+          title: '%{subject} is a fan of %{contact}.'
+          message: '%{name} is now your fan.'
+          notification:
+            subject: '%{name} is now your fan.'
+            body: '%{name} is now your fan.'
+      make-friend:
+        RemoteSubject:
+          title: '%{subject} and %{contact} are now connected.'
+          message: '%{name} also added you as contact.'
+          notification:
+            subject: '%{name} also added you as contact.'
+            body: '%{name} also added you as contact.'
+      post:
+        RemoteSubject:
+          notification:
+            subject: '%{name} has posted something(%{direct_object}) in your wall'
+            body: '%{name} has posted something(%{direct_object}) in your wall'
+      update:
+        RemoteSubject:
+          notification:
+            subject: '%{name} has updated %{direct_object} in your wall'
+            body: '%{name} has updated something(%{direct_object}) in your wall'

data/ostatus/lib/social_stream/ostatus/version.rb

@@ -1,5 +1,5 @@
 module SocialStream
   module Ostatus
-    VERSION = "2.0.0.beta2".freeze
+    VERSION = "2.0.0.beta3".freeze
   end
 end

data/ostatus/social_stream-ostatus.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
 
   # Gem dependencies
-  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta2')
+  s.add_runtime_dependency('social_stream-base', '~> 2.0.0.beta3')
   s.add_runtime_dependency('proudhon','>= 0.3.6')
   s.add_runtime_dependency('nokogiri','> 1.4.4')
   

data/places/config/locales/en.yml

@@ -1,93 +1,84 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
+---
 en:
   place:
     actions:
-      delete: "Delete"
-      details: "Details"
-      edit: "Edit"
-    all: "All places"
-    confirm_delete: "Delete place?"
+      delete: Delete
+      details: Details
+      edit: Edit
+    all: All places
+    confirm_delete: Delete place?
     details:
-      info: "Info"
+      info: Info
     form:
-      title: "Place"
+      title: Place
     info:
-      author: "Author"
+      author: Author
       date:
-        created_at: "Created at"
-        updated_at: "Updated at"
+        created_at: Created at
+        updated_at: Updated at
       description:
-        description: "Description"
-        update: "Update description"
+        description: Description
+        update: Update description
       file:
-        title: "Upload"
-      size: "Size"
-      tags: "Tags"
+        title: Upload
+      size: Size
+      tags: Tags
       title:
-        title: "Title"
-    mine: "My places"
-    name: "place"
-    name_title: "Place name"
-    phone_title: "Phone number"
+        title: Title
+    mine: My places
+    name: place
+    name_title: Place name
+    phone_title: Phone number
     photo:
-      button: "Upload"
-      update: "Upload photo"
-    url_title: "Website"
+      button: Upload
+      update: Upload photo
+    url_title: Website
     address:
-      street: "Address"
-      locality: "City"
-      region: "Region"
-      postalcode: "Postalcode"
-      country: "Country"
-    not_mine: "Places"
-    one: "a place"
-    simple_all: "All"
-    title: "Places"
+      street: Address
+      locality: City
+      region: Region
+      postalcode: Postalcode
+      country: Country
+    not_mine: Places
+    one: a place
+    simple_all: All
+    title: Places
     like:
-      me: "I like"
-      other: "%{contact} likes"
+      me: I like
+      other: '%{contact} likes'
     search:
-      name: "Search for your fav places"
-      no_match: "Don't find your fav place?"
-      new: "+ Add new place"
+      name: Search for your fav places
+      no_match: Don't find your fav place?
+      new: + Add new place
     comments:
-      contacts: "See only my contacts's comments"
-      all: "See all comments"
+      contacts: See only my contacts's comments
+      all: See all comments
     view:
-      list: "List view"
-      map: "Map view"
+      list: List view
+      map: Map view
     tabs:
-      mine: "My places"
-      friends: "Friends places"
-      recommended: "Recommended"
+      mine: My places
+      friends: Friends places
+      recommended: Recommended
   activity:
     verb:
       like:
         Place:
-          title: "%{subject} likes %{activity_object}."
-          like: "I like too"
-          unlike: "I do not like anymore"
+          title: '%{subject} likes %{activity_object}.'
+          like: I like too
+          unlike: I do not like anymore
     like_construction:
       like_friends:
-        one: "%{friends} contact"
-        other: "%{friends} contacts"
-      like_and: " and "
-#      like_you: "you like this"
+        one: '%{friends} contact'
+        other: '%{friends} contacts'
+      like_and: ' and '
       like_people:
-        one: "%{people} person"
-        other: "%{people} people"
+        one: '%{people} person'
+        other: '%{people} people'
       like_others:
-        one: "%{people} other"
-        other: "%{people} others"
+        one: '%{people} other'
+        other: '%{people} others'
       like_final:
-        one: " likes this"
-        other: " like this"
-        you: "like this"
-
-#  repository:
-#    order:
-#      by: "Order by"
-#      last_modified: "Last modified"
-#      most_popular: "Most popular"
+        one: ' likes this'
+        other: ' like this'
+        you: like this

data/places/config/locales/es.yml

@@ -1,85 +1,84 @@
-# Sample localization file for Spanish. Add more files in this directory for other locales.
-# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
+---
 es:
   place:
     actions:
-      delete: "Borrar"
-      details: "Detalles"
-      edit: "Editar"
-    all: "Todos los lugares"
-    confirm_delete: "¿Borrar lugar?"
+      delete: Borrar
+      details: Detalles
+      edit: Editar
+    all: Todos los lugares
+    confirm_delete: ¿Borrar lugar?
     form:
-      title: "Lugar"
+      title: Lugar
     info:
       date:
-        created_at: "Creado el"
-        updated_at: "Actualizado el"
+        created_at: Creado el
+        updated_at: Actualizado el
       file:
-        title: "Cargar"
+        title: Cargar
       title:
-        title: "Título"
-    mine: "Mis lugares"
-    name: "lugar"
-    name_title: "Nombre del lugar"
-    phone_title: "Teléfono"
+        title: Título
+      author: Author
+      description:
+        description: Description
+        update: Update description
+      size: Size
+      tags: Tags
+    mine: Mis lugares
+    name: lugar
+    name_title: Nombre del lugar
+    phone_title: Teléfono
     photo:
-      button: "Subir"
-      update: "Subir foto"
-    url_title: "Website"
+      button: Subir
+      update: Subir foto
+    url_title: Website
     address:
-      street: "Dirección"
-      locality: "Ciudad"
-      region: "Región"
-      postalcode: "Código postal"
-      country: "País"
-    not_mine: "Lugares"
-    one: "un lugar"
-    simple_all: "Todos"
-    title: "Lugares"
+      street: Dirección
+      locality: Ciudad
+      region: Región
+      postalcode: Código postal
+      country: País
+    not_mine: Lugares
+    one: un lugar
+    simple_all: Todos
+    title: Lugares
     like:
-      me: "que me gustan"
-      other: "que gustan a %{contact}"
+      me: que me gustan
+      other: que gustan a %{contact}
     search:
-      name: "Busca tus lugares favoritos"
-      no_match: "¿No encuentras el lugar?"
-      new: "+ Añade un lugar nuevo"
+      name: Busca tus lugares favoritos
+      no_match: ¿No encuentras el lugar?
+      new: + Añade un lugar nuevo
     comments:
-      contacts: "Ver sólo los comentarios de mis contactos"
-      all: "Ver todos los comentarios"
+      contacts: Ver sólo los comentarios de mis contactos
+      all: Ver todos los comentarios
     view:
-      list: "Lista"
-      map: "Mapa"
+      list: Lista
+      map: Mapa
     tabs:
-      mine: "Mis lugares"
-      friends: "De amigos"
-      recommended: "Recomendados"
+      mine: Mis lugares
+      friends: De amigos
+      recommended: Recomendados
+    details:
+      info: Info
   activity:
     verb:
       like:
         Place:
-          title: "A %{subject} le gusta %{activity_object}."
-          like: "También me gusta"
-          unlike: "Ya no me gusta"
+          title: A %{subject} le gusta %{activity_object}.
+          like: También me gusta
+          unlike: Ya no me gusta
     like_construction:
       like_friends:
-        one: "A %{friends} contacto"
-        other: "A %{friends} contactos"
-      like_and: " y "
-#      like_you: "you like this"
+        one: A %{friends} contacto
+        other: A %{friends} contactos
+      like_and: ' y '
       like_people:
-        one: "a %{people} persona"
-        other: "a %{people} personas"
+        one: a %{people} persona
+        other: a %{people} personas
       like_others:
-        one: "%{people} otro"
-        other: "%{people} otros"
+        one: '%{people} otro'
+        other: '%{people} otros'
       like_final:
-        one: " le gusta esto"
-        other: " les gusta esto"
-        you: "le gusta esto"
-
-#  repository:
-#    order:
-#      by: "Order by"
-#      last_modified: "Last modified"
-#      most_popular: "Most popular"
+        one: ' le gusta esto'
+        other: ' les gusta esto'
+        you: le gusta esto

data/presence/app/assets/stylesheets/social_stream/presence/_toolbar-chat.css.sass

@@ -3,8 +3,8 @@
   .chat_off
     input
       &[type="submit"]
-        @extend .pull-rigth
-        @extend .btn-blue
+        float: right
+        @include btn-primary
   .users_connected
     display: block
     padding-left: 17px