social_stream 2.1.1 → 2.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile +5 -2
- data/LICENSE +1 -1
- data/base/Rakefile +3 -17
- data/base/app/assets/images/flags/de.png +0 -0
- data/base/app/assets/images/flags/fr.png +0 -0
- data/base/app/assets/images/flags/hu.png +0 -0
- data/base/app/assets/images/flags/nl.png +0 -0
- data/base/app/assets/javascripts/social_stream/actor.js +34 -0
- data/base/app/assets/javascripts/social_stream/contact.js +40 -5
- data/base/app/assets/javascripts/social_stream/flash.js +6 -1
- data/base/app/assets/javascripts/social_stream/group.js +6 -5
- data/base/app/assets/javascripts/social_stream/relation_customs.js +0 -1
- data/base/app/assets/stylesheets/social_stream/base/adjust/layout/_adjust.css.sass +3 -0
- data/base/app/assets/stylesheets/social_stream/base/buttons/_buttons.scss.sass +0 -2
- data/base/app/assets/stylesheets/social_stream/base/contacts/_contacts.css.sass +1 -11
- data/base/app/assets/stylesheets/social_stream/base/contacts/layouts/_contacts.css.sass +1 -29
- data/base/app/assets/stylesheets/social_stream/base/layouts/_header.css.sass +0 -1
- data/base/app/assets/stylesheets/social_stream/base/mixins/_buttons.css.sass +5 -0
- data/base/app/assets/stylesheets/social_stream/base/mixins/_layout.css.sass +36 -7
- data/base/app/controllers/actors_controller.rb +25 -0
- data/base/app/controllers/contacts_controller.rb +38 -8
- data/base/app/controllers/groups_controller.rb +2 -21
- data/base/app/controllers/profiles_controller.rb +4 -0
- data/base/app/controllers/settings_controller.rb +12 -2
- data/base/app/controllers/users_controller.rb +0 -8
- data/base/app/helpers/contacts_helper.rb +8 -0
- data/base/app/models/activity.rb +19 -6
- data/base/app/models/actor.rb +49 -11
- data/base/app/models/contact.rb +12 -5
- data/base/app/models/group.rb +13 -11
- data/base/app/models/permission.rb +30 -0
- data/base/app/models/relation.rb +17 -7
- data/base/app/models/relation/custom.rb +2 -40
- data/base/app/models/relation/follow.rb +8 -2
- data/base/app/models/relation/owner.rb +10 -0
- data/base/app/models/relation/single.rb +7 -4
- data/base/app/models/site.rb +1 -1
- data/base/app/models/tie.rb +8 -4
- data/base/app/views/contacts/_add_button.html.erb +9 -0
- data/base/app/views/contacts/_button.html.erb +3 -3
- data/base/app/views/contacts/_button_multiple.html.erb +4 -0
- data/base/app/views/contacts/_button_simple.html.erb +17 -0
- data/base/app/views/contacts/_new_modal.html.erb +22 -0
- data/base/app/views/contacts/destroy.js.erb +5 -4
- data/base/app/views/contacts/update.js.erb +5 -4
- data/base/app/views/devise/confirmations/new.html.erb +14 -9
- data/base/app/views/frontpage/_presentation.html.erb +2 -2
- data/base/app/views/groups/_form.html.erb +20 -20
- data/base/app/views/groups/show.html.erb +5 -5
- data/base/app/views/layouts/_header_dropdown_menu.html.erb +3 -5
- data/base/app/views/layouts/_header_signed_in.erb +3 -3
- data/base/app/views/layouts/_logo_in.html.erb +1 -1
- data/base/app/views/layouts/application.html.erb +2 -0
- data/base/app/views/permissions/_list.html.erb +1 -1
- data/base/app/views/profiles/_avatar.html.erb +1 -5
- data/base/app/views/profiles/_avatar_edit.html.erb +5 -0
- data/base/app/views/profiles/_comunication-info.html.erb +2 -36
- data/base/app/views/profiles/_comunication-info_edit.html.erb +27 -0
- data/base/app/views/profiles/_edit_icon.html.erb +0 -1
- data/base/app/views/profiles/_experience.html.erb +1 -6
- data/base/app/views/profiles/_experience_edit.html.erb +5 -0
- data/base/app/views/profiles/_personal.html.erb +1 -39
- data/base/app/views/profiles/_personal_edit.html.erb +31 -0
- data/base/app/views/profiles/_profile_edit.html.erb +7 -0
- data/base/app/views/profiles/_tags.html.erb +1 -4
- data/base/app/views/profiles/_tags_edit.html.erb +4 -0
- data/base/app/views/profiles/edit.html.erb +24 -0
- data/base/app/views/settings/_notifications.html.erb +12 -4
- data/base/app/views/users/show.html.erb +5 -5
- data/base/config/locales/de.yml +654 -0
- data/base/config/locales/en.yml +20 -9
- data/base/config/locales/es.yml +151 -140
- data/base/config/locales/fr.yml +656 -0
- data/base/config/locales/hu.yml +653 -0
- data/base/config/locales/nl.yml +656 -0
- data/base/config/locales/pt.yml +250 -239
- data/base/config/locales/rails.de.yml +203 -0
- data/base/config/locales/rails.fr.yml +222 -0
- data/base/config/locales/rails.hu.yml +199 -0
- data/base/config/locales/rails.nl.yml +199 -0
- data/base/config/locales/zh.yml +214 -202
- data/base/config/routes.rb +22 -30
- data/base/db/migrate/20130708152633_set_group_owners.rb +19 -0
- data/base/db/migrate/20130723133530_actor_notification_settings.rb +10 -0
- data/base/lib/generators/social_stream/base/templates/initializer.rb +13 -7
- data/base/lib/rails/social_stream.rb +2 -0
- data/base/lib/social_stream/base.rb +27 -7
- data/base/lib/social_stream/base/ability.rb +3 -5
- data/base/lib/social_stream/base/autoload.rb +1 -0
- data/base/lib/social_stream/base/version.rb +1 -1
- data/base/lib/social_stream/controllers/authorship.rb +18 -0
- data/base/lib/social_stream/controllers/helpers.rb +18 -4
- data/base/lib/social_stream/controllers/objects.rb +2 -8
- data/base/lib/social_stream/controllers/subjects.rb +9 -2
- data/base/lib/social_stream/models/supertype.rb +2 -0
- data/base/lib/social_stream/population/activity_object.rb +6 -8
- data/base/lib/social_stream/routing/mapper.rb +52 -0
- data/base/social_stream-base.gemspec +4 -7
- data/base/spec/controllers/groups_controller_spec.rb +19 -8
- data/base/spec/controllers/posts_controller_spec.rb +114 -147
- data/base/spec/models/post_authorization_spec.rb +190 -204
- data/base/spec/models/post_spec.rb +17 -63
- data/base/vendor/assets/javascripts/bootstrap-multiselect.js +434 -127
- data/documents/Rakefile +1 -6
- data/documents/config/locales/de.yml +93 -0
- data/documents/config/locales/es.yml +2 -2
- data/documents/config/locales/fr.yml +93 -0
- data/documents/config/locales/hu.yml +93 -0
- data/documents/config/locales/nl.yml +93 -0
- data/documents/config/locales/zh.yml +4 -4
- data/documents/config/routes.rb +7 -9
- data/documents/lib/social_stream/documents/version.rb +1 -1
- data/documents/social_stream-documents.gemspec +4 -4
- data/events/Rakefile +1 -6
- data/events/config/locales/es.yml +3 -3
- data/events/config/locales/zh.yml +3 -3
- data/events/lib/social_stream/events/models/actor.rb +2 -1
- data/events/lib/social_stream/events/version.rb +1 -1
- data/events/social_stream-events.gemspec +1 -1
- data/lib/generators/social_stream/install_generator.rb +1 -0
- data/lib/social_stream.rb +1 -0
- data/lib/social_stream/version.rb +1 -1
- data/lib/tasks/i18n.rake +22 -2
- data/linkser/Rakefile +1 -6
- data/linkser/config/locales/de.yml +17 -0
- data/linkser/config/locales/es.yml +2 -2
- data/linkser/config/locales/fr.yml +17 -0
- data/linkser/config/locales/hu.yml +17 -0
- data/linkser/config/locales/nl.yml +17 -0
- data/linkser/config/locales/zh.yml +2 -2
- data/linkser/lib/social_stream/linkser/version.rb +1 -1
- data/linkser/social_stream-linkser.gemspec +1 -1
- data/oauth2_server/Rakefile +1 -6
- data/oauth2_server/app/assets/images/step_1.png +0 -0
- data/oauth2_server/app/assets/images/step_2.png +0 -0
- data/oauth2_server/app/assets/images/step_3.png +0 -0
- data/oauth2_server/app/assets/javascripts/social_stream/site_client.js +27 -0
- data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/applications/layout/_applications-oauth2server.css.sass +0 -5
- data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/create/layout/_create-oauth2server.css.sass +3 -5
- data/oauth2_server/app/assets/stylesheets/social_stream/oauth2_server/show/layout/_show-oauth2server.css.sass +8 -6
- data/oauth2_server/app/controllers/site/clients_controller.rb +17 -41
- data/oauth2_server/app/decorators/social_stream/base/relation_decorator.rb +2 -0
- data/oauth2_server/app/decorators/social_stream/base/user_decorator.rb +1 -20
- data/oauth2_server/app/models/relation/manager.rb +1 -10
- data/oauth2_server/app/models/site/client.rb +4 -2
- data/oauth2_server/app/views/site/clients/_destroy.html.erb +11 -0
- data/oauth2_server/app/views/site/clients/_edit.html.erb +9 -2
- data/oauth2_server/app/views/site/clients/_edit_step_2.html.erb +6 -6
- data/oauth2_server/app/views/site/clients/_edit_step_3.html.erb +8 -6
- data/oauth2_server/app/views/site/clients/_form.html.erb +11 -11
- data/oauth2_server/app/views/site/clients/_list.html.erb +23 -11
- data/oauth2_server/app/views/site/clients/edit.html.erb +1 -1
- data/oauth2_server/app/views/site/clients/index.html.erb +9 -40
- data/oauth2_server/app/views/site/clients/show.html.erb +66 -68
- data/oauth2_server/config/locales/en.yml +19 -0
- data/oauth2_server/config/locales/es.yml +23 -4
- data/oauth2_server/config/locales/zh.yml +32 -13
- data/oauth2_server/config/routes.rb +3 -1
- data/oauth2_server/lib/social_stream/oauth2_server.rb +4 -1
- data/oauth2_server/lib/social_stream/oauth2_server/ability.rb +1 -1
- data/oauth2_server/lib/social_stream/oauth2_server/models/user.rb +18 -0
- data/oauth2_server/lib/social_stream/oauth2_server/version.rb +1 -1
- data/oauth2_server/social_stream-oauth2_server.gemspec +1 -1
- data/oauth2_server/spec/controllers/site_clients_controller_authorization_spec.rb +7 -0
- data/ostatus/Rakefile +1 -6
- data/ostatus/config/locales/zh.yml +8 -8
- data/ostatus/lib/social_stream-ostatus.rb +3 -0
- data/ostatus/lib/social_stream/ostatus/version.rb +1 -1
- data/ostatus/social_stream-ostatus.gemspec +1 -1
- data/places/config/locales/es.yml +51 -51
- data/presence/config/locales/es.yml +48 -48
- data/presence/config/locales/zh.yml +48 -48
- data/presence/lib/social_stream/presence/version.rb +1 -1
- data/presence/social_stream-presence.gemspec +1 -1
- data/social_stream.gemspec +8 -7
- metadata +60 -29
- data/base/app/assets/javascripts/social_stream/follow.js +0 -28
- data/base/app/controllers/followers_controller.rb +0 -34
- data/base/app/helpers/followers_helper.rb +0 -5
- data/base/app/views/contacts/_link_follow.html.erb +0 -16
- data/base/app/views/followers/destroy.js.erb +0 -1
- data/base/app/views/followers/index.html.erb +0 -30
- data/base/app/views/followers/update.js.erb +0 -3
- data/base/app/views/frontpage/_characteristics.html.erb +0 -23
- data/base/lib/social_stream/routing/constraints/custom.rb +0 -11
- data/base/lib/social_stream/routing/constraints/follow.rb +0 -11
- data/base/spec/controllers/followers_controller_spec.rb +0 -37
@@ -33,6 +33,9 @@ en:
|
|
33
33
|
relation/custom: Manage roles
|
34
34
|
detailed:
|
35
35
|
manage:
|
36
|
+
contact:
|
37
|
+
negative: They WILL NOT BE ABLE to assign roles to users
|
38
|
+
positive: They WILL BE ABLE to assign roles to users
|
36
39
|
nil:
|
37
40
|
positive: They WILL BE ABLE to update the details of the client site
|
38
41
|
negative: They WILL NOT BE ABLE to update the details of the client
|
@@ -45,11 +48,27 @@ en:
|
|
45
48
|
public_info: Read your public information
|
46
49
|
relation_admin:
|
47
50
|
name: Site Client Admin
|
51
|
+
relation_manager:
|
52
|
+
name: Manager
|
48
53
|
site:
|
49
54
|
client:
|
50
55
|
added: Added sites
|
56
|
+
button:
|
57
|
+
edit: Edit
|
58
|
+
contact:
|
59
|
+
add: Add
|
60
|
+
destroy:
|
61
|
+
confirm: Are you sure? This operation cannot be reverted!
|
62
|
+
link: Remove the site client and all its data
|
63
|
+
title: Destroy site client
|
64
|
+
go_to_other: See your other site clients
|
51
65
|
index:
|
52
66
|
title: Client sites
|
53
67
|
new:
|
54
68
|
link: Add site
|
55
69
|
title: Register new client site
|
70
|
+
oauth:
|
71
|
+
credentials: Credentials
|
72
|
+
secret:
|
73
|
+
refresh: refresh
|
74
|
+
refreshed: OAuth2 client secret regenerated
|
@@ -15,9 +15,9 @@ es:
|
|
15
15
|
accept: Accept
|
16
16
|
cancel: Cancel
|
17
17
|
new:
|
18
|
-
title: Authorize %{client}?
|
19
18
|
permission:
|
20
19
|
title: 'The site %{client} will be able to:'
|
20
|
+
title: Authorize %{client}?
|
21
21
|
helpers:
|
22
22
|
submit:
|
23
23
|
site_client:
|
@@ -28,25 +28,44 @@ es:
|
|
28
28
|
default:
|
29
29
|
brief:
|
30
30
|
manage:
|
31
|
+
contact: Manage authorizations
|
31
32
|
nil: Gestionar el sitio
|
32
33
|
relation/custom: Gestionar los roles
|
33
|
-
contact: Manage authorizations
|
34
34
|
detailed:
|
35
35
|
manage:
|
36
|
+
contact:
|
37
|
+
negative: NO PODRÁN asignar roles a usuarios
|
38
|
+
positive: PODRÁN asignar roles a usuarios
|
36
39
|
nil:
|
37
|
-
positive: PODRÁN actualizar los detalles del sitio
|
38
40
|
negative: NO PODRÁN actualizar los detalles del sitio
|
41
|
+
positive: PODRÁN actualizar los detalles del sitio
|
39
42
|
relation/custom:
|
40
|
-
positive: PODRÁN crear, actualizar y borrar los roles del sitio
|
41
43
|
negative: NO PODRÁN crear, actualizar y borrar los roles del sitio
|
44
|
+
positive: PODRÁN crear, actualizar y borrar los roles del sitio
|
42
45
|
public_info: Acceder a tu información pública
|
43
46
|
relation_admin:
|
44
47
|
name: Administrador de Sitio
|
48
|
+
relation_manager:
|
49
|
+
name: Admin
|
45
50
|
site:
|
46
51
|
client:
|
47
52
|
added: Sitios añadidos
|
53
|
+
button:
|
54
|
+
edit: Editar
|
55
|
+
contact:
|
56
|
+
add: Add
|
57
|
+
destroy:
|
58
|
+
confirm: Are you sure? This operation cannot be reverted!
|
59
|
+
link: Remove the site client and all its data
|
60
|
+
title: Destroy site client
|
61
|
+
go_to_other: Ver tus otros sitios
|
48
62
|
index:
|
49
63
|
title: Sitios
|
50
64
|
new:
|
51
65
|
link: Añadir sitio
|
52
66
|
title: Registrar nuevo sitio
|
67
|
+
oauth:
|
68
|
+
credentials: Credenciales
|
69
|
+
secret:
|
70
|
+
refresh: regenerar
|
71
|
+
refreshed: Token secreto de OAuth2 regenerado
|
@@ -15,41 +15,60 @@ zh:
|
|
15
15
|
accept: Accept
|
16
16
|
cancel: Cancel
|
17
17
|
new:
|
18
|
-
title: Authorize %{client}?
|
19
18
|
permission:
|
20
19
|
title: 'The site %{client} will be able to:'
|
20
|
+
title: Authorize %{client}?
|
21
|
+
helpers:
|
22
|
+
submit:
|
23
|
+
site_client:
|
24
|
+
create: Next
|
25
|
+
update: Save
|
21
26
|
permission:
|
22
|
-
public_info: Read your public information
|
23
27
|
description:
|
24
28
|
default:
|
25
29
|
brief:
|
26
30
|
manage:
|
31
|
+
contact: Manage authorizations
|
27
32
|
nil: Manage the site
|
28
33
|
relation/custom: Manage roles
|
29
|
-
contact: Manage authorizations
|
30
34
|
detailed:
|
31
35
|
manage:
|
36
|
+
contact:
|
37
|
+
negative: They WILL NOT BE ABLE to assign roles to users
|
38
|
+
positive: They WILL BE ABLE to assign roles to users
|
32
39
|
nil:
|
33
|
-
positive: They WILL BE ABLE to update the details of the client site
|
34
40
|
negative: They WILL NOT BE ABLE to update the details of the client
|
35
41
|
site
|
42
|
+
positive: They WILL BE ABLE to update the details of the client site
|
36
43
|
relation/custom:
|
37
|
-
positive: They WILL BE ABLE to create, update and delete the roles of
|
38
|
-
the client site
|
39
44
|
negative: They WILL NOT BE ABLE to create, update and delete the roles
|
40
45
|
of the client site
|
46
|
+
positive: They WILL BE ABLE to create, update and delete the roles of
|
47
|
+
the client site
|
48
|
+
public_info: Read your public information
|
49
|
+
relation_admin:
|
50
|
+
name: Site Client Admin
|
51
|
+
relation_manager:
|
52
|
+
name: Manager
|
41
53
|
site:
|
42
54
|
client:
|
43
55
|
added: Added sites
|
56
|
+
button:
|
57
|
+
edit: Edit
|
58
|
+
contact:
|
59
|
+
add: Add
|
60
|
+
destroy:
|
61
|
+
confirm: Are you sure? This operation cannot be reverted!
|
62
|
+
link: Remove the site client and all its data
|
63
|
+
title: Destroy site client
|
64
|
+
go_to_other: See your other site clients
|
44
65
|
index:
|
45
66
|
title: Client sites
|
46
67
|
new:
|
47
68
|
link: Add site
|
48
69
|
title: Register new client site
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
relation_admin:
|
55
|
-
name: Site Client Admin
|
70
|
+
oauth:
|
71
|
+
credentials: Credentials
|
72
|
+
secret:
|
73
|
+
refresh: refresh
|
74
|
+
refreshed: OAuth2 client secret regenerated
|
@@ -17,11 +17,14 @@ module SocialStream
|
|
17
17
|
autoload :TokenEndpoint, 'social_stream/oauth2_server/token_endpoint'
|
18
18
|
end
|
19
19
|
|
20
|
+
# Include site/client in routes
|
21
|
+
SocialStream.routed_subjects << :"site/client"
|
22
|
+
|
20
23
|
# Define default custom relations for Site::Client
|
21
24
|
SocialStream.custom_relations['site/client'] = {}
|
22
25
|
|
23
26
|
# Relations that appear in the Site::Client list
|
24
|
-
SocialStream.
|
27
|
+
SocialStream.system_relations['site/client'] = [ :manager ]
|
25
28
|
|
26
29
|
SocialStream.available_permissions['site/client'] = [
|
27
30
|
[ 'manage', nil ],
|
@@ -16,6 +16,8 @@ module SocialStream
|
|
16
16
|
|
17
17
|
has_many :refresh_tokens,
|
18
18
|
class_name: 'Oauth2Token::RefreshToken'
|
19
|
+
|
20
|
+
alias_method_chain :as_json, :client
|
19
21
|
end
|
20
22
|
|
21
23
|
# Is {#client} authorized by this {User}
|
@@ -29,6 +31,22 @@ module SocialStream
|
|
29
31
|
contact_to!(client).relation_ids += [ Relation::Auth.instance.id ]
|
30
32
|
end
|
31
33
|
end
|
34
|
+
|
35
|
+
# Include application role information in the json
|
36
|
+
def as_json_with_client options = {}
|
37
|
+
hash = as_json_without_client options
|
38
|
+
|
39
|
+
if options[:client] && !options[:client].is_a?(User)
|
40
|
+
hash['roles'] = options[:client].contact_to!(self).relations.map{ |r|
|
41
|
+
{
|
42
|
+
id: r.id,
|
43
|
+
name: r.name
|
44
|
+
}
|
45
|
+
}
|
46
|
+
end
|
47
|
+
|
48
|
+
hash
|
49
|
+
end
|
32
50
|
end
|
33
51
|
end
|
34
52
|
end
|
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
|
|
12
12
|
s.files = `git ls-files`.split("\n")
|
13
13
|
|
14
14
|
# Gem dependencies
|
15
|
-
s.add_runtime_dependency('social_stream-base', '~> 2.
|
15
|
+
s.add_runtime_dependency('social_stream-base', '~> 2.2.0')
|
16
16
|
s.add_runtime_dependency('rack-oauth2', '~> 1.0.0')
|
17
17
|
|
18
18
|
s.add_development_dependency('rspec-rails', '~> 2.8.0')
|
@@ -38,6 +38,13 @@ describe Site::ClientsController do
|
|
38
38
|
sign_in @user
|
39
39
|
end
|
40
40
|
|
41
|
+
it "should render index" do
|
42
|
+
@client = Factory(:"site/client", author: @user.actor )
|
43
|
+
get :index
|
44
|
+
|
45
|
+
response.should be_success
|
46
|
+
end
|
47
|
+
|
41
48
|
it "should render client" do
|
42
49
|
@client = Factory(:"site/client", author: @user.actor )
|
43
50
|
get :show, :id => @client.to_param
|
data/ostatus/Rakefile
CHANGED
@@ -3,12 +3,7 @@ require 'bundler/gem_tasks'
|
|
3
3
|
|
4
4
|
require 'rdoc/task'
|
5
5
|
|
6
|
-
|
7
|
-
require 'rspec/core/rake_task'
|
8
|
-
|
9
|
-
RSpec::Core::RakeTask.new(:spec)
|
10
|
-
|
11
|
-
task :default => :spec
|
6
|
+
task :default => :rdoc
|
12
7
|
|
13
8
|
Rake::RDocTask.new(:rdoc) do |rdoc|
|
14
9
|
rdoc.rdoc_dir = 'rdoc'
|
@@ -4,32 +4,32 @@ zh:
|
|
4
4
|
verb:
|
5
5
|
follow:
|
6
6
|
RemoteSubject:
|
7
|
-
title: '%{subject} added %{contact} as contact.'
|
8
7
|
message: '%{name} added you as contact.'
|
9
8
|
notification:
|
10
|
-
subject: '%{name} added you as contact.'
|
11
9
|
body: '%{name} added you as contact.'
|
10
|
+
subject: '%{name} added you as contact.'
|
11
|
+
title: '%{subject} added %{contact} as contact.'
|
12
12
|
like:
|
13
13
|
RemoteSubject:
|
14
|
-
title: '%{subject} is a fan of %{contact}.'
|
15
14
|
message: '%{name} is now your fan.'
|
16
15
|
notification:
|
17
|
-
subject: '%{name} is now your fan.'
|
18
16
|
body: '%{name} is now your fan.'
|
17
|
+
subject: '%{name} is now your fan.'
|
18
|
+
title: '%{subject} is a fan of %{contact}.'
|
19
19
|
make-friend:
|
20
20
|
RemoteSubject:
|
21
|
-
title: '%{subject} and %{contact} are now connected.'
|
22
21
|
message: '%{name} also added you as contact.'
|
23
22
|
notification:
|
24
|
-
subject: '%{name} also added you as contact.'
|
25
23
|
body: '%{name} also added you as contact.'
|
24
|
+
subject: '%{name} also added you as contact.'
|
25
|
+
title: '%{subject} and %{contact} are now connected.'
|
26
26
|
post:
|
27
27
|
RemoteSubject:
|
28
28
|
notification:
|
29
|
-
subject: '%{name} has posted something(%{direct_object}) in your wall'
|
30
29
|
body: '%{name} has posted something(%{direct_object}) in your wall'
|
30
|
+
subject: '%{name} has posted something(%{direct_object}) in your wall'
|
31
31
|
update:
|
32
32
|
RemoteSubject:
|
33
33
|
notification:
|
34
|
-
subject: '%{name} has updated %{direct_object} in your wall'
|
35
34
|
body: '%{name} has updated something(%{direct_object}) in your wall'
|
35
|
+
subject: '%{name} has updated %{direct_object} in your wall'
|
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
|
|
12
12
|
s.files = `git ls-files`.split("\n")
|
13
13
|
|
14
14
|
# Gem dependencies
|
15
|
-
s.add_runtime_dependency('social_stream-base', '~> 2.
|
15
|
+
s.add_runtime_dependency('social_stream-base', '~> 2.2.0')
|
16
16
|
s.add_runtime_dependency('proudhon','>= 0.3.6')
|
17
17
|
s.add_runtime_dependency('nokogiri','> 1.4.4')
|
18
18
|
|
@@ -1,85 +1,85 @@
|
|
1
1
|
---
|
2
2
|
es:
|
3
|
+
activity:
|
4
|
+
like_construction:
|
5
|
+
like_and: ' y '
|
6
|
+
like_final:
|
7
|
+
one: ' le gusta esto'
|
8
|
+
other: ' les gusta esto'
|
9
|
+
you: le gusta esto
|
10
|
+
like_friends:
|
11
|
+
one: A %{friends} contacto
|
12
|
+
other: A %{friends} contactos
|
13
|
+
like_others:
|
14
|
+
one: '%{people} otro'
|
15
|
+
other: '%{people} otros'
|
16
|
+
like_people:
|
17
|
+
one: a %{people} persona
|
18
|
+
other: a %{people} personas
|
19
|
+
verb:
|
20
|
+
like:
|
21
|
+
Place:
|
22
|
+
like: También me gusta
|
23
|
+
title: A %{subject} le gusta %{activity_object}.
|
24
|
+
unlike: Ya no me gusta
|
3
25
|
place:
|
4
26
|
actions:
|
5
27
|
delete: Borrar
|
6
28
|
details: Detalles
|
7
29
|
edit: Editar
|
30
|
+
address:
|
31
|
+
country: País
|
32
|
+
locality: Ciudad
|
33
|
+
postalcode: Código postal
|
34
|
+
region: Región
|
35
|
+
street: Dirección
|
8
36
|
all: Todos los lugares
|
37
|
+
comments:
|
38
|
+
all: Ver todos los comentarios
|
39
|
+
contacts: Ver sólo los comentarios de mis contactos
|
9
40
|
confirm_delete: ¿Borrar lugar?
|
41
|
+
details:
|
42
|
+
info: Info
|
10
43
|
form:
|
11
44
|
title: Lugar
|
12
45
|
info:
|
46
|
+
author: Author
|
13
47
|
date:
|
14
48
|
created_at: Creado el
|
15
49
|
updated_at: Actualizado el
|
16
|
-
file:
|
17
|
-
title: Cargar
|
18
|
-
title:
|
19
|
-
title: Título
|
20
|
-
author: Author
|
21
50
|
description:
|
22
51
|
description: Description
|
23
52
|
update: Update description
|
53
|
+
file:
|
54
|
+
title: Cargar
|
24
55
|
size: Size
|
25
56
|
tags: Tags
|
57
|
+
title:
|
58
|
+
title: Título
|
59
|
+
like:
|
60
|
+
me: que me gustan
|
61
|
+
other: que gustan a %{contact}
|
26
62
|
mine: Mis lugares
|
27
63
|
name: lugar
|
28
64
|
name_title: Nombre del lugar
|
65
|
+
not_mine: Lugares
|
29
66
|
one: un lugar
|
67
|
+
other: lugares
|
30
68
|
phone_title: Teléfono
|
31
69
|
photo:
|
32
70
|
button: Subir
|
33
71
|
update: Subir foto
|
34
|
-
url_title: Website
|
35
|
-
address:
|
36
|
-
street: Dirección
|
37
|
-
locality: Ciudad
|
38
|
-
region: Región
|
39
|
-
postalcode: Código postal
|
40
|
-
country: País
|
41
|
-
not_mine: Lugares
|
42
|
-
other: lugares
|
43
|
-
simple_all: Todos
|
44
|
-
title: Lugares
|
45
|
-
like:
|
46
|
-
me: que me gustan
|
47
|
-
other: que gustan a %{contact}
|
48
72
|
search:
|
49
73
|
name: Busca tus lugares favoritos
|
50
|
-
no_match: ¿No encuentras el lugar?
|
51
74
|
new: + Añade un lugar nuevo
|
52
|
-
|
53
|
-
|
54
|
-
all: Ver todos los comentarios
|
55
|
-
view:
|
56
|
-
list: Lista
|
57
|
-
map: Mapa
|
75
|
+
no_match: ¿No encuentras el lugar?
|
76
|
+
simple_all: Todos
|
58
77
|
tabs:
|
59
|
-
mine: Mis lugares
|
60
78
|
friends: De amigos
|
79
|
+
mine: Mis lugares
|
61
80
|
recommended: Recomendados
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
Place:
|
68
|
-
title: A %{subject} le gusta %{activity_object}.
|
69
|
-
like: También me gusta
|
70
|
-
unlike: Ya no me gusta
|
71
|
-
like_construction:
|
72
|
-
like_friends:
|
73
|
-
one: A %{friends} contacto
|
74
|
-
other: A %{friends} contactos
|
75
|
-
like_and: ' y '
|
76
|
-
like_people:
|
77
|
-
one: a %{people} persona
|
78
|
-
other: a %{people} personas
|
79
|
-
like_others:
|
80
|
-
one: '%{people} otro'
|
81
|
-
other: '%{people} otros'
|
82
|
-
like_final:
|
83
|
-
one: ' le gusta esto'
|
84
|
-
other: ' les gusta esto'
|
85
|
-
you: le gusta esto
|
81
|
+
title: Lugares
|
82
|
+
url_title: Website
|
83
|
+
view:
|
84
|
+
list: Lista
|
85
|
+
map: Mapa
|