Skip to content

D
diaspora
Unverified Commit 7aadadce authored by Benjamin Neff's avatar Benjamin Neff
Browse files
Options

Merge branch 'release/0.6.6.0'

parents 91a9549c f5905586
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 977 additions and 1376 deletions
.rubocop.yml
View file @ 7aadadce
......@@ -164,6 +164,16 @@ Lint/Debugger:
Style/NumericPredicate:
EnforcedStyle: comparison
# Old defaults from rubocop < 0.48.1
Style/PercentLiteralDelimiters:
PreferredDelimiters:
default: '()'
'%i': '()'
'%I': '()'
'%r': '{}'
'%w': '()'
'%W': '()'
# Reset some HoundCI changes back to Rubocop defaults
Style/DotPosition:
EnforcedStyle: leading
......
Changelog.md
View file @ 7aadadce
# 0.6.6.0
## Refactor
* Remove rails\_admin [#7440](https://github.com/diaspora/diaspora/pull/7440)
* Use guid instead of id at permalink and in SPV [#7453](https://github.com/diaspora/diaspora/pull/7453)
## Bug fixes
* Make photo upload button hover text translatable [#7429](https://github.com/diaspora/diaspora/pull/7429)
* Fix first comment in mobile view with french locale [#7441](https://github.com/diaspora/diaspora/pull/7441)
* Use post page title and post author in atom feed [#7420](https://github.com/diaspora/diaspora/pull/7420)
* Handle broken public keys when receiving posts [#7448](https://github.com/diaspora/diaspora/pull/7448)
* Fix welcome message when podmin is set to an invalid username [#7452](https://github.com/diaspora/diaspora/pull/7452)
## Features
* Add support for Nodeinfo 2.0 [#7447](https://github.com/diaspora/diaspora/pull/7447)
# 0.6.5.0
## Refactor
......
Gemfile
View file @ 7aadadce
......@@ -13,7 +13,7 @@ gem "unicorn-worker-killer", "0.4.4"
# Federation
gem "diaspora_federation-rails", "0.1.8"
gem "diaspora_federation-rails", "0.1.9"
# API and JSON
......@@ -132,7 +132,7 @@ gem "leaflet-rails", "0.7.7"
# Parsing
gem "nokogiri", "1.7.1"
gem "nokogiri", "1.7.2"
gem "open_graph_reader", "0.6.2" # also update User-Agent in features/support/webmock.rb
gem "redcarpet", "3.4.0"
gem "ruby-oembed", "0.10.1"
......@@ -183,8 +183,8 @@ gem "typhoeus", "1.1.2"
gem "gon", "6.1.0"
gem "hamlit", "2.8.0"
gem "mobile-fu", "1.3.1"
gem "rails-timeago", "2.16.0"
gem "will_paginate", "3.1.5"
gem "rails-timeago", "2.11.0"
# Logging
......@@ -217,10 +217,6 @@ gem "thor", "0.19.1"
# gem "therubyracer", :platform => :ruby
group :production do # we don"t install these on travis to speed up test runs
# Administration
gem "rails_admin", "0.8.1"
# Analytics
gem "rack-google-analytics", "1.2.0"
......@@ -250,13 +246,13 @@ group :development do
gem "rb-inotify", "0.9.8", require: false
# Linters
gem "haml_lint", "0.21.0"
gem "pronto", "0.8.2"
gem "pronto-eslint", "0.8.0"
gem "pronto-haml", "0.8.0"
gem "pronto-rubocop", "0.8.0"
gem "pronto-scss", "0.8.0", require: false
gem "rubocop", "0.47.1"
gem "haml_lint", "0.24.0", require: false
gem "pronto", "0.9.3", require: false
gem "pronto-eslint", "0.9.1", require: false
gem "pronto-haml", "0.9.0", require: false
gem "pronto-rubocop", "0.9.0", require: false
gem "pronto-scss", "0.9.1", require: false
gem "rubocop", "0.48.1", require: false
# Preloading environment
......@@ -296,7 +292,7 @@ group :test do
gem "webmock", "2.3.2", require: false
gem "shoulda-matchers", "3.1.1"
gem "diaspora_federation-test", "0.1.8"
gem "diaspora_federation-test", "0.1.9"
# Coverage
gem 'coveralls', require: false
......
Gemfile.lock
View file @ 7aadadce
......@@ -104,13 +104,6 @@ GEM
chunky_png (1.3.8)
cliver (0.3.2)
coderay (1.1.1)
coffee-rails (4.2.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.2.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.12.2)
compass (1.0.3)
chunky_png (~> 1.2)
compass-core (~> 1.0.2)
......@@ -170,17 +163,17 @@ GEM
devise
rails (>= 3.0.4)
diaspora-prosody-config (0.0.7)
diaspora_federation (0.1.8)
diaspora_federation (0.1.9)
faraday (>= 0.9.0, < 0.12.0)
faraday_middleware (>= 0.10.0, < 0.12.0)
nokogiri (~> 1.6, >= 1.6.8)
typhoeus (~> 1.0)
valid (~> 1.0)
diaspora_federation-rails (0.1.8)
diaspora_federation (= 0.1.8)
diaspora_federation-rails (0.1.9)
diaspora_federation (= 0.1.9)
rails (>= 4.2, < 6)
diaspora_federation-test (0.1.8)
diaspora_federation (= 0.1.8)
diaspora_federation-test (0.1.9)
diaspora_federation (= 0.1.9)
factory_girl (~> 4.7)
uuid (~> 2.3.8)
diff-lcs (1.3)
......@@ -217,7 +210,7 @@ GEM
http-cookie (~> 1.0.0)
faraday_middleware (0.11.0.1)
faraday (>= 0.7.4, < 1.0)
ffi (1.9.17)
ffi (1.9.18)
fixture_builder (0.4.1)
activerecord (>= 2)
activesupport (>= 2)
......@@ -236,17 +229,15 @@ GEM
fog-xml (0.1.2)
fog-core
nokogiri (~> 1.5, >= 1.5.11)
font-awesome-rails (4.7.0.1)
railties (>= 3.2, < 5.1)
formatador (0.2.5)
fuubar (2.2.0)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
get_process_mem (0.2.1)
gherkin (4.0.0)
gitlab (3.7.0)
httparty (~> 0.13.0)
terminal-table
gitlab (4.0.0)
httparty
terminal-table (= 1.7.1)
globalid (0.3.7)
activesupport (>= 4.1.0)
gon (6.1.0)
......@@ -277,8 +268,9 @@ GEM
rubocop (~> 0.20)
haml (4.0.7)
tilt
haml_lint (0.21.0)
haml (~> 4.0)
haml_lint (0.24.0)
haml (>= 4.0, < 5.1)
rainbow
rake (>= 10, < 13)
rubocop (>= 0.47.0)
sysexits (~> 1.1)
......@@ -305,8 +297,7 @@ GEM
http-form_data (1.0.1)
http_accept_language (2.1.0)
http_parser.rb (0.6.0)
httparty (0.13.7)
json (~> 1.8)
httparty (0.14.0)
multi_xml (>= 0.5.2)
httpclient (2.8.3)
i18n (0.8.1)
......@@ -347,9 +338,6 @@ GEM
jsonpath (0.5.8)
multi_json
jwt (1.5.6)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.11.0)
leaflet-rails (0.7.7)
listen (3.1.5)
......@@ -390,9 +378,8 @@ GEM
mysql2 (0.4.5)
naught (1.1.0)
nenv (0.3.0)
nested_form (0.3.2)
nio4r (2.0.0)
nokogiri (1.7.1)
nokogiri (1.7.2)
mini_portile2 (~> 2.1.0)
notiffany (0.1.1)
nenv (~> 0.1)
......@@ -404,7 +391,7 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
octokit (4.6.2)
octokit (4.7.0)
sawyer (~> 0.8.0, >= 0.5.3)
omniauth (1.4.2)
hashie (>= 1.2, < 4)
......@@ -449,24 +436,24 @@ GEM
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
powerpack (0.1.1)
pronto (0.8.2)
gitlab (~> 3.6, >= 3.4.0)
pronto (0.9.3)
gitlab (~> 4.0, >= 4.0.0)
httparty (>= 0.13.7, < 0.15)
octokit (~> 4.3, >= 4.1.0)
octokit (~> 4.7, >= 4.7.0)
rainbow (~> 2.1)
rugged (~> 0.24, >= 0.23.0)
thor (~> 0.19.0)
pronto-eslint (0.8.0)
pronto-eslint (0.9.1)
eslintrb (~> 2.0, >= 2.0.0)
pronto (~> 0.8.0)
pronto-haml (0.8.0)
haml_lint (~> 0.16, >= 0.15.0)
pronto (~> 0.8.0)
pronto-rubocop (0.8.0)
pronto (~> 0.8.0)
pronto (~> 0.9.0)
pronto-haml (0.9.0)
haml_lint (~> 0.23)
pronto (~> 0.9.0)
pronto-rubocop (0.9.0)
pronto (~> 0.9.0)
rubocop (~> 0.38, >= 0.35.0)
pronto-scss (0.8.0)
pronto (~> 0.8.0)
pronto-scss (0.9.1)
pronto (~> 0.9.0)
scss_lint (~> 0.43, >= 0.43.0)
pry (0.10.4)
coderay (~> 1.1.0)
......@@ -492,9 +479,6 @@ GEM
multi_json (>= 1.3.6)
rack (>= 1.1)
rack-piwik (0.3.0)
rack-pjax (0.8.0)
nokogiri (~> 1.5)
rack (~> 1.1)
rack-protection (1.5.3)
rack
rack-rewrite (1.5.1)
......@@ -568,29 +552,16 @@ GEM
rails-i18n (4.0.8)
i18n (~> 0.7)
railties (~> 4.0)
rails-timeago (2.11.0)
rails-timeago (2.16.0)
actionpack (>= 3.1)
activesupport (>= 3.1)
rails_admin (0.8.1)
builder (~> 3.1)
coffee-rails (~> 4.0)
font-awesome-rails (>= 3.0, < 5)
haml (~> 4.0)
jquery-rails (>= 3.0, < 5)
jquery-ui-rails (~> 5.0)
kaminari (~> 0.14)
nested_form (~> 0.3)
rack-pjax (~> 0.7)
rails (~> 4.0)
remotipart (~> 1.0)
safe_yaml (~> 1.0)
sass-rails (>= 4.0, < 6)
railties (4.2.8)
actionpack (= 4.2.8)
activesupport (= 4.2.8)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.2.1)
rainbow (2.2.2)
rake
raindrops (0.17.0)
rake (12.0.0)
rb-fsevent (0.9.8)
......@@ -600,7 +571,6 @@ GEM
redis (3.3.3)
redis-namespace (1.5.3)
redis (~> 3.0, >= 3.0.4)
remotipart (1.3.1)
request_store (1.3.2)
responders (2.3.0)
railties (>= 4.2.0, < 5.1)
......@@ -625,7 +595,7 @@ GEM
rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
rubocop (0.47.1)
rubocop (0.48.1)
parser (>= 2.3.3.1, < 3.0)
powerpack (~> 0.1)
rainbow (>= 1.99.1, < 3.0)
......@@ -649,7 +619,7 @@ GEM
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
scss_lint (0.52.0)
scss_lint (0.53.0)
rake (>= 0.9, < 13)
sass (~> 3.4.20)
secure_headers (3.6.1)
......@@ -708,7 +678,7 @@ GEM
temple (0.8.0)
term-ansicolor (1.4.0)
tins (~> 1.0)
terminal-table (1.7.3)
terminal-table (1.7.1)
unicode-display_width (~> 1.1.1)
test_after_commit (1.1.0)
activerecord (>= 3.2)
......@@ -734,7 +704,7 @@ GEM
unf (~> 0.1.0)
typhoeus (1.1.2)
ethon (>= 0.9.0)
tzinfo (1.2.2)
tzinfo (1.2.3)
thread_safe (~> 0.1)
uglifier (3.1.2)
execjs (>= 0.3.0, < 3)
......@@ -805,8 +775,8 @@ DEPENDENCIES
devise (= 4.2.0)
devise_lastseenable (= 0.0.6)
diaspora-prosody-config (= 0.0.7)
diaspora_federation-rails (= 0.1.8)
diaspora_federation-test (= 0.1.8)
diaspora_federation-rails (= 0.1.9)
diaspora_federation-test (= 0.1.9)
entypo-rails (= 3.0.0)
eye (= 0.9.1)
factory_girl_rails (= 4.8.0)
......@@ -821,7 +791,7 @@ DEPENDENCIES
guard-cucumber (= 2.1.2)
guard-rspec (= 4.7.3)
guard-rubocop (= 1.2.0)
haml_lint (= 0.21.0)
haml_lint (= 0.24.0)
hamlit (= 2.8.0)
handlebars_assets (= 0.23.1)
http_accept_language (= 2.1.0)
......@@ -841,7 +811,7 @@ DEPENDENCIES
minitest
mobile-fu (= 1.3.1)
mysql2 (= 0.4.5)
nokogiri (= 1.7.1)
nokogiri (= 1.7.2)
omniauth (= 1.4.2)
omniauth-facebook (= 4.0.0)
omniauth-tumblr (= 1.2)
......@@ -851,11 +821,11 @@ DEPENDENCIES
openid_connect (= 0.12.0)
pg (= 0.19.0)
poltergeist (= 1.13.0)
pronto (= 0.8.2)
pronto-eslint (= 0.8.0)
pronto-haml (= 0.8.0)
pronto-rubocop (= 0.8.0)
pronto-scss (= 0.8.0)
pronto (= 0.9.3)
pronto-eslint (= 0.9.1)
pronto-haml (= 0.9.0)
pronto-rubocop (= 0.9.0)
pronto-scss (= 0.9.1)
pry
pry-byebug
quiet_assets (= 1.1.0)
......@@ -886,14 +856,13 @@ DEPENDENCIES
rails-assets-markdown-it-sup (= 1.0.0)!
rails-assets-perfect-scrollbar (= 0.6.16)!
rails-i18n (= 4.0.8)
rails-timeago (= 2.11.0)
rails_admin (= 0.8.1)
rails-timeago (= 2.16.0)
rb-fsevent (= 0.9.8)
rb-inotify (= 0.9.8)
redcarpet (= 3.4.0)
responders (= 2.3.0)
rspec-rails (= 3.5.2)
rubocop (= 0.47.1)
rubocop (= 0.48.1)
ruby-oembed (= 0.10.1)
rubyzip (= 1.2.1)
sass-rails (= 5.0.6)
......
app/assets/javascripts/app/views/publisher/uploader_view.js
View file @ 7aadadce
......@@ -14,6 +14,9 @@ app.views.PublisherUploader = Backbone.View.extend({
element: this.el,
button: this.el,
text: {
fileInputTitle: Diaspora.I18n.t("photo_uploader.upload_photos")
},
request: {
endpoint: Routes.photos(),
params: {
......
app/assets/javascripts/main.js
View file @ 7aadadce
......@@ -9,7 +9,7 @@
//= require autosize
//= require charcount
//= require jquery-placeholder
//= require rails-timeago
//= require jquery.timeago
//= require jquery-ui/core
//= require jquery-ui/widget
//= require jquery-ui/mouse
......
app/assets/javascripts/mobile/mobile.js
View file @ 7aadadce
......@@ -11,7 +11,7 @@
//= require keycodes
//= require jquery.autoSuggest.custom
//= require fine-uploader/fine-uploader.core
//= require rails-timeago
//= require jquery.timeago
//= require underscore
//= require bootstrap
//= require diaspora
......
app/assets/javascripts/mobile/mobile_comments.js
View file @ 7aadadce
......@@ -201,7 +201,7 @@
increaseReactionCount: function(bottomBar) {
var toggleReactionsLink = bottomBar.find(".show-comments").first();
var count = toggleReactionsLink.text().match(/.*(\d+).*/);
count = parseInt(count, 10);
count = parseInt(count, 10) || 0;
var text = Diaspora.I18n.t("stream.comments", {count: count + 1});
// No previous comment
......
app/assets/javascripts/mobile/mobile_file_uploader.js
View file @ 7aadadce
......@@ -23,6 +23,9 @@ function createUploader(){
sizeLimit: 4194304
},
button: document.getElementById("file-upload-publisher"),
text: {
fileInputTitle: Diaspora.I18n.t("photo_uploader.upload_photos")
},
callbacks: {
onProgress: function(id, fileName, loaded, total) {
......
app/assets/javascripts/widgets/timeago.js
View file @ 7aadadce
......@@ -26,6 +26,12 @@
}
});
}
$.timeago.settings.autoDispose = false;
$(function() {
$("time[data-time-ago]").timeago();
});
});
};
})();
......
app/assets/templates/single-post-viewer/single-post-content_tpl.jst.hbs
View file @ 7aadadce
......@@ -39,11 +39,11 @@
{{/if}}
<span class="post-time">
{{#if root}}
<a href="/posts/{{root.id}}">
<a href="/posts/{{root.guid}}">
<time datetime="{{root.created_at}}" title="{{localTime root.created_at}}" />
</a>
{{else}}
<a href="/posts/{{id}}">
<a href="/posts/{{guid}}">
<time datetime="{{created_at}}" title="{{localTime created_at}}" />
</a>
{{/if}}
......@@ -91,7 +91,7 @@
</span>
<div class="post-context">
<span class="post-time">
<a href="/posts/{{id}}">
<a href="/posts/{{guid}}">
<time datetime="{{created_at}}" title="{{localTime created_at}}" />
</a>
</span>
......
app/assets/templates/stream-element_tpl.jst.hbs
View file @ 7aadadce
......@@ -24,7 +24,7 @@
<time class="timeago" data-original-title="{{{localTime created_at}}}" datetime="{{created_at}}" />
</a>
<a href="/posts/{{id}}" class="permalink" title="{{t "stream.permalink"}}">
<a href="/posts/{{guid}}" class="permalink" title="{{t "stream.permalink"}}">
<i class="entypo-link"></i>
</a>
{{/if}}
......
app/helpers/activity_streams_helper.rb 0 → 100644
View file @ 7aadadce
module ActivityStreamsHelper
def add_activitystreams_author(target, person)
target.author do |author|
author.name person.name
author.uri local_or_remote_person_path(person, absolute: true)
author.tag! "activity:object-type", "http://activitystrea.ms/schema/1.0/person"
author.tag! "poco:preferredUsername", person.username
author.tag! "poco:displayName", person.name
end
end
end
app/models/person.rb
View file @ 7aadadce
......@@ -229,6 +229,8 @@ class Person < ActiveRecord::Base
def public_key
OpenSSL::PKey::RSA.new(serialized_public_key)
rescue OpenSSL::PKey::RSAError
nil
end
def exported_key
......
app/models/user.rb
View file @ 7aadadce
......@@ -431,6 +431,7 @@ class User < ActiveRecord::Base
return unless AppConfig.settings.welcome_message.enabled? && AppConfig.admins.account?
sender_username = AppConfig.admins.account.get
sender = User.find_by(username: sender_username)
return if sender.nil?
conversation = sender.build_conversation(
participant_ids: [sender.person.id, person.id],
subject: AppConfig.settings.welcome_message.subject.get,
......
app/presenters/node_info_presenter.rb
View file @ 7aadadce
......@@ -17,17 +17,17 @@ class NodeInfoPresenter
end
def add_configuration(doc)
doc.software.version = version
doc.services.outbound = available_services
doc.open_registrations = open_registrations?
doc.metadata["nodeName"] = name
doc.metadata["xmppChat"] = chat_enabled?
doc.software.version = version
doc.services.outbound = available_services
doc.open_registrations = open_registrations?
doc.metadata["nodeName"] = name
doc.metadata["xmppChat"] = chat_enabled?
doc.metadata["adminAccount"] = admin_account
end
def add_static_data(doc)
doc.software.name = "diaspora"
doc.protocols.inbound << "diaspora"
doc.protocols.outbound << "diaspora"
doc.protocols.protocols << "diaspora"
end
def add_user_counts(doc)
......@@ -71,6 +71,10 @@ class NodeInfoPresenter
AppConfig.chat.enabled?
end
def admin_account
AppConfig.admins.account if AppConfig.admins.account?
end
def available_services
Configuration::KNOWN_SERVICES.select {|service|
AppConfig.show_service?(service, nil)
......
app/views/publisher/_publisher.html.haml
View file @ 7aadadce
......@@ -30,7 +30,7 @@
.publisher-buttonbar#publisher-images
.btn.btn-link.poll-creator#poll_creator{title: t("shared.publisher.poll.add_a_poll")}
%i.entypo-bar-graph
.btn.btn-link.file-upload#file-upload{title: t("shared.publisher.upload_photos")}
.btn.btn-link.file-upload#file-upload
%i.entypo-camera.publisher_image
.btn.btn-link.locator#locator{title: t("shared.publisher.get_location")}
%i.entypo-location.publisher_image
......
app/views/publisher/_publisher.mobile.haml
View file @ 7aadadce
......@@ -31,7 +31,7 @@
%ul#photodropzone
#fileInfo-publisher
#file-upload-publisher{title: t('shared.publisher.upload_photos'), class: 'btn btn-default'}
#file-upload-publisher{class: "btn btn-default"}
%i.entypo-camera.middle
#publisher_mobile
= submit_tag t("shared.publisher.share"),
......
app/views/users/public.atom.builder
View file @ 7aadadce
......@@ -17,21 +17,16 @@ atom_feed("xmlns:thr" => "http://purl.org/syndication/thread/1.0",
'media:height' => '100', :href => "#{@user.image_url}"
feed.tag! :link, :href => "#{AppConfig.environment.pubsub_server}", :rel => 'hub'
feed.author do |author|
author.name @user.name
author.uri local_or_remote_person_path(@user.person, :absolute => true)
author.tag! 'activity:object-type', 'http://activitystrea.ms/schema/1.0/person'
author.tag! 'poco:preferredUsername', @user.username
author.tag! 'poco:displayName', @user.name
end
add_activitystreams_author(feed, @user.person)
@posts.each do |post|
feed.entry post, :url => "#{@user.url}p/#{post.id}",
:id => "#{@user.url}p/#{post.id}" do |entry|
entry.title post.message.title
entry.title post_page_title(post)
entry.content post.message.markdownified(disable_hovercards: true), :type => 'html'
add_activitystreams_author(entry, post.author)
entry.tag! 'activity:verb', 'http://activitystrea.ms/schema/1.0/post'
entry.tag! 'activity:object-type', 'http://activitystrea.ms/schema/1.0/note'
end
......
config/defaults.yml
View file @ 7aadadce
......@@ -4,7 +4,7 @@
defaults:
version:
number: "0.6.5.0" # Do not touch unless doing a release, do not backport the version number that's in master
number: "0.6.6.0" # Do not touch unless doing a release, do not backport the version number that's in master
heroku: false
environment:
url: "http://localhost:3000/"
......
config/diaspora.yml.example
View file @ 7aadadce
......@@ -82,7 +82,7 @@ configuration: ## Section
## Number of times a job is retried (default=10).
## There's an exponential effect to this: if you set this too high you
## might get too many jobs building up in the queue.
## Set it to false to disable it completely.
## Set it to 0 to disable it completely.
#retry: 10
## Lines of backtrace that are stored on failure (default=15).
......
config/initializers/diaspora_federation.rb
View file @ 7aadadce
......@@ -72,8 +72,7 @@ DiasporaFederation.configure do |config|
end
on :fetch_public_key do |diaspora_id|
key = Person.find_or_fetch_by_identifier(diaspora_id).serialized_public_key
OpenSSL::PKey::RSA.new(key) unless key.nil?
Person.find_or_fetch_by_identifier(diaspora_id).public_key
end
on :fetch_related_entity do |entity_type, guid|
......
config/initializers/rails_admin.rb deleted 100644 → 0
View file @ 91a9549c
This diff is collapsed.
config/locales/devise/devise.pl.yml
View file @ 7aadadce
......@@ -11,7 +11,9 @@ pl:
new:
resend_confirmation: "Wyślij ponownie instrukcję aktywacji"
send_instructions: "W ciągu kilku minut otrzymasz wiadomość zawierającą instrukcję aktywacji konta."
send_paranoid_instructions: "Jeśli Twój adres email istnieje w naszej bazie w ciągu kilku minut otrzymasz wiadomość email z instrukcją potwierdzenia adresu."
failure:
already_authenticated: "Już jesteś zalogowany."
inactive: "Twoje konto nie zostało jeszcze aktywowane."
invalid: "Nieprawidłowa nazwa użytkownika lub hasło."
invalid_token: "Nieprawidłowy token uwierzytelnienia."
......@@ -34,6 +36,8 @@ pl:
accept_at: "na %{url}, możesz je zaakceptować używając poniższego łącza."
has_invited_you: "%{name}"
have_invited_you: "%{names} zaprasza Cię do diaspory*"
password_change:
subject: "Hasło zmienione"
reset_password_instructions:
change: "Zmiana hasła"
ignore: "Jeśli nie chcesz zmienić hasła, zignoruj tę wiadomość."
......@@ -58,12 +62,19 @@ pl:
reset_password: "Resetuj hasło"
send_password_instructions: "Wyślij mi instrukcję resetowania hasła"
send_instructions: "W ciągu kilku minut otrzymasz wiadomość zawierającą instrukcję resetowania hasła."
send_paranoid_instructions: "Jeśli Twój email istnieje w naszej bazie w ciągu kilku minut otrzymasz email z łączem po kliknięciu którego będziesz mógł ustawić nowe hasło."
updated: "Hasło zostało zmienione. Zalogowano pomyślnie."
updated_not_active: "Twoje hasło zostało pomyślnie zmienione."
registrations:
destroyed: "Do widzenia! Konto zostało pomyślnie zamknięte. Mamy nadzieję, że wkrótce zobaczymy Cię ponownie."
signed_up: "Rejestracja przebiegła pomyślnie. Jeśli aktywowano odpowiednią opcję, wyślemy do Ciebie e-mail potwierdzający ten fakt."
signed_up_but_inactive: "Rejestracja przebiegła pomyślnie. Jednakże, nie możemy Cię zalogować, ponieważ Twoje konto nie zostało jeszcze aktywowane."
signed_up_but_locked: "Rejestracja przebiegła pomyślnie. Jednakże, nie możemy Cię zalogować, ponieważ Twoje konto zostało zablokowane."
signed_up_but_unconfirmed: "Wiadomość z linkiem aktywacyjnym została wysłana na Twój adres email. Proszę kliknij łącze w celu aktywowania swojego konta."
update_needs_confirmation: "Twoje konto zostało zaktualizowane, ale musimy zweryfikować Twój nowy adres email. Sprawdź swoją skrzynkę i kliknij na przesłane łącze, aby potwierdzić Twój nowy adres."
updated: "Pomyślnie zaktualizowano konto."
sessions:
already_signed_out: "Wylogowano pomyślnie."
new:
login: "Zaloguj się"
modern_browsers: "obsługuje wyłącznie współczesne przeglądarki."
......@@ -85,6 +96,7 @@ pl:
new:
resend_unlock: "Wyślij ponownie instrukcję odblokowywania"
send_instructions: "W ciągu kilku minut otrzymasz wiadomość z instrukcją odblokowania konta."
send_paranoid_instructions: "Jeśli Twoje konto istnieje w ciągu kilku minut otrzymasz email z instrukcją jak je odblokować."
unlocked: "Konto zostało pomyślnie odblokowane. Pomyślnie zalogowano."
errors:
messages:
......
config/locales/diaspora/ar.yml
View file @ 7aadadce
......@@ -164,7 +164,7 @@ ar:
subject: "موضوع"
to: "إلى"
show:
delete: "احْذِف واحْظُر المحادثة"
delete: "احْذِف المحادثة"
reply: "رُدَّ"
replying: "يُجيب..."
date:
......@@ -242,7 +242,7 @@ ar:
other: "و %{count} آخرون"
two: "و %{count} آخران"
zero: "و لا أحد"
mark_all_as_read: "وضع الجميع كمقروء"
mark_all_as_read: "تحديد الكل كمقروء"
mark_unread: "غير مقروء"
no_notifications: "ليس هناك أيّ إخطار بعد."