Aprèp vòstra primièra connexion, poiretz accedir a la documentacion de l’aisina.
-Pensatz tanben de gaitar nòstras <%= link_to 'conditions d\'utilisation', terms_url %>.
+Pensatz tanben de gaitar nòstres <%= link_to 'tèrmes e condicions d\'utilizacion', terms_url %>.
Amistosament,
diff --git a/app/views/user_mailer/confirmation_instructions.oc.text.erb b/app/views/user_mailer/confirmation_instructions.oc.text.erb index bf2acfec164..fe04fe3d05f 100644 --- a/app/views/user_mailer/confirmation_instructions.oc.text.erb +++ b/app/views/user_mailer/confirmation_instructions.oc.text.erb @@ -7,7 +7,7 @@ er confirmar vòstra inscripcion, mercés de clicar sul ligam seguent : Aprèp vòstra primièra connexion, poiretz accedir a la documentacion de l’aisina. -Pensatz tanben de gaitar nòstras <%= link_to 'conditions d\'utilisation', terms_url %>. +Pensatz tanben de gaitar nòstres <%= link_to 'tèrmes e condicions d\'utilizacion', terms_url %>. Amistosament, diff --git a/app/views/user_mailer/email_changed.oc.html.erb b/app/views/user_mailer/email_changed.oc.html.erb new file mode 100644 index 00000000000..0f4c891dcd2 --- /dev/null +++ b/app/views/user_mailer/email_changed.oc.html.erb @@ -0,0 +1,15 @@ +Bonjorn <%= @resource.email %> !
+ +<% if @resource&.unconfirmed_email? %> +Vos contactem per vos senhalar que l’adreça qu’utilizatz per <%= @instance %> es cambiada per aquesta d’aquí <%= @resource.unconfirmed_email %>.
+<% else %> +Vos contactem per vos senhalar que l’adreça qu’utilizatz per <%= @instance %> es cambiada per aquesta d’aquí <%= @resource.email %>.
+<% end %> + ++ S’avètz pas demandat aqueste cambiament d’adreça, poiriá arribar que qualqu’un mai aguèsse agut accès a vòstre compte. Mercés de cambiar sulpic vòstre senhal o de contactar vòstre administrator d’instància se l’accès a vòstre compte vos es barrat. +
+ +Amistosament,
+ +
La còla <%= @instance %>
diff --git a/app/views/user_mailer/email_changed.oc.text.erb b/app/views/user_mailer/email_changed.oc.text.erb new file mode 100644 index 00000000000..2305ef83451 --- /dev/null +++ b/app/views/user_mailer/email_changed.oc.text.erb @@ -0,0 +1,13 @@ +Bonjorn <%= @resource.email %> ! + +<% if @resource&.unconfirmed_email? %> +Vos contactem per vos senhalar que l’adreça qu’utilizatz per <%= @instance %> es cambiada per aquesta d’aquí <%= @resource.unconfirmed_email %>. +<% else %> +Vos contactem per vos senhalar que l’adreça qu’utilizatz per <%= @instance %> es cambiada per aquesta d’aquí <%= @resource.email %>. +<% end %> + +S’avètz pas demandat aqueste cambiament d’adreça, poiriá arribar que qualqu’un mai aguèsse agut accès a vòstre compte. Mercés de cambiar sulpic vòstre senhal o de contactar vòstre administrator d’instància se l’accès a vòstre compte vos es barrat. + +Amistosament, + +La còla <%= @instance %> diff --git a/app/views/user_mailer/reconfirmation_instructions.oc.html.erb b/app/views/user_mailer/reconfirmation_instructions.oc.html.erb new file mode 100644 index 00000000000..d5404e49c67 --- /dev/null +++ b/app/views/user_mailer/reconfirmation_instructions.oc.html.erb @@ -0,0 +1,15 @@ +Bonjorn <%= @resource.unconfirmed_email %> !
+ +Avètz demandat a cambiar vòstra adreça de corrièl qu’utilizatz per <%= @instance %>.
+ +Per confirmar vòstra novèla adreça, mercés de clicar lo ligam seguent :
+<%= link_to 'Confirmar mon adreça', confirmation_url(@resource, confirmation_token: @token) %>
Se lo ligam al dessús fonciona pas, copiatz e pegatz aquesta URL a la barra d’adreça :
+<%= confirmation_url(@resource, confirmation_token: @token) %>
+
+
Mercés de gaitar tanben nòstres <%= link_to 'terms and conditions', terms_url %>.
+ +Amistosament,
+ +
La còla <%= @instance %>
diff --git a/app/views/user_mailer/reconfirmation_instructions.oc.text.erb b/app/views/user_mailer/reconfirmation_instructions.oc.text.erb new file mode 100644 index 00000000000..6f174bb3e1a --- /dev/null +++ b/app/views/user_mailer/reconfirmation_instructions.oc.text.erb @@ -0,0 +1,12 @@ +Bonjorn <%= @resource.unconfirmed_email %> ! + +Avètz demandat a cambiar vòstra adreça de corrièl qu’utilizatz per <%= @instance %>. + +Per confirmar vòstra novèla adreça, mercés de clicar lo ligam seguent : +<%= confirmation_url(@resource, confirmation_token: @token) %> + +Mercés tanben de gaitar nòstres <%= link_to 'terms and conditions', terms_url %>. + +Amistosament, + +La còla <%= @instance %> diff --git a/app/workers/pubsubhubbub/subscribe_worker.rb b/app/workers/pubsubhubbub/subscribe_worker.rb index e350973e1e9..2e176d1c106 100644 --- a/app/workers/pubsubhubbub/subscribe_worker.rb +++ b/app/workers/pubsubhubbub/subscribe_worker.rb @@ -20,7 +20,7 @@ class Pubsubhubbub::SubscribeWorker sidekiq_retries_exhausted do |msg, _e| account = Account.find(msg['args'].first) - logger.error "PuSH subscription attempts for #{account.acct} exhausted. Unsubscribing" + Sidekiq.logger.error "PuSH subscription attempts for #{account.acct} exhausted. Unsubscribing" ::UnsubscribeService.new.call(account) end diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index ef61543a87e..3dc0edd6fd2 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,3 +1,3 @@ # Be sure to restart your server when you modify this file. -Rails.application.config.session_store :cookie_store, key: '_mastodon_session', secure: (ENV['LOCAL_HTTPS'] == 'true') +Rails.application.config.session_store :cookie_store, key: '_mastodon_session', secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true') diff --git a/config/webpack/translationRunner.js b/config/webpack/translationRunner.js index d616c78391e..e6543fbb7f7 100644 --- a/config/webpack/translationRunner.js +++ b/config/webpack/translationRunner.js @@ -2,7 +2,7 @@ const fs = require('fs'); const path = require('path'); const { default: manageTranslations } = require('react-intl-translations-manager'); -const RFC5646_REGEXP = /^[a-z]{2,3}(?:|-[A-Z]+)$/; +const RFC5646_REGEXP = /^[a-z]{2,3}(?:-(?:x|[A-Za-z]{2,4}))*$/; const rootDirectory = path.resolve(__dirname, '..', '..'); const translationsDirectory = path.resolve(rootDirectory, 'app', 'javascript', 'mastodon', 'locales'); diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index 0077687694b..bd23ab1d114 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 1 + 2 end def pre diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 4f7399505c4..67c6b920540 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -46,7 +46,7 @@ RSpec.configure do |config| config.include ActiveSupport::Testing::TimeHelpers config.before :each, type: :feature do - https = ENV['LOCAL_HTTPS'] == 'true' + https = Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true' Capybara.app_host = "http#{https ? 's' : ''}://#{ENV.fetch('LOCAL_DOMAIN')}" end