/mastodon

Add french translations for emails sent #1148

Merged
merged 1 commit into from Apr 8, 2017
+56 −6

Conversation

Reviewers

@j0k3r j0k3r

@paulloz paulloz

@SansPseudoFix SansPseudoFix

@Gargron Gargron

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
9 participants
@tcitworld @Cryptogirl @Nautigsam @paulloz @mkody @gfaivre @j0k3r @Gargron @SansPseudoFix
@tcitworld
Contributor

tcitworld commented Apr 7, 2017

Please don't merge this right away, as I have more changes to bring.
@ghost

ghost reviewed Apr 7, 2017 • edited
View changes

Votre mot de passe ne sera pas modifié tant que vous n'accédez pas au lien ci-dessus et que vous en choisissiez un nouveau.

would be better like that :

Votre mot de passe ne sera pas modifié tant que vous n'accédez pas au lien ci-dessus et en choisissiez un nouveau.

@Cryptogirl

This comment has been minimized.

Show comment
Hide comment
@Cryptogirl

Cryptogirl Apr 7, 2017

I would say
"Votre mot de passe ne sera pas modifié tant que vous n'accéderez pas au lien ci-dessus et n'en choisirez pas un nouveau."

Cryptogirl commented Apr 7, 2017

I would say
"Votre mot de passe ne sera pas modifié tant que vous n'accéderez pas au lien ci-dessus et n'en choisirez pas un nouveau."
@Nautigsam

This comment has been minimized.

Show comment
Hide comment
@Nautigsam

Nautigsam Apr 7, 2017

I would rather say
"Votre mot de passe ne sera pas modifié sans que vous n'ayez accédé au lien ci-dessus et créé un nouveau."

Nautigsam commented Apr 7, 2017

I would rather say
"Votre mot de passe ne sera pas modifié sans que vous n'ayez accédé au lien ci-dessus et créé un nouveau."
@ghost

This comment has been minimized.

Show comment
Hide comment
@ghost

ghost Apr 7, 2017

@Cryptogirl
EN : Hum you are right for the sequence of tenses, but there is a problem with the double negation.
FR : Tu as raison pour la concordance des temps, cependant "en choisirez" dépend de l'action "accéder", donc la négation reste valable pour cette partie. Je mettrai donc plutôt :
"Votre mot de passe ne sera pas modifié tant que vous n'accéderez pas au lien ci-dessus en choisirez un nouveau."

ghost commented Apr 7, 2017 •
edited by ghost
Edited 1 time
  • @ghost ghost edited Apr 7, 2017 (most recent)

@Cryptogirl
EN : Hum you are right for the sequence of tenses, but there is a problem with the double negation.
FR : Tu as raison pour la concordance des temps, cependant "en choisirez" dépend de l'action "accéder", donc la négation reste valable pour cette partie. Je mettrai donc plutôt :
"Votre mot de passe ne sera pas modifié tant que vous n'accéderez pas au lien ci-dessus en choisirez un nouveau."
@tcitworld

This comment has been minimized.

Show comment
Hide comment
@tcitworld

tcitworld Apr 7, 2017

Contributor

Les titres des colonnes sont traduits ainsi pour le moment (column.public est d'ailleurs dupliqué). Des idées , car « Fil public global » est peut-être trop long ?

 "column.home": "Accueil",
  "column.community": "Fil public local",
  "column.public": "Fil public global",
  "column.notifications": "Notifications",
  "column.public": "Fil public",
Contributor

tcitworld commented Apr 7, 2017 •
edited
Edited 1 time
  • @tcitworld tcitworld edited Apr 7, 2017 (most recent)

Les titres des colonnes sont traduits ainsi pour le moment (column.public est d'ailleurs dupliqué). Des idées , car « Fil public global » est peut-être trop long ?

 "column.home": "Accueil",
  "column.community": "Fil public local",
  "column.public": "Fil public global",
  "column.notifications": "Notifications",
  "column.public": "Fil public",
@ghost

This comment has been minimized.

Show comment
Hide comment
@ghost

ghost Apr 7, 2017

@tcitworld

Je remplacerait "Accueil" par "Fil perso" où un terme ayant plus de sens qu'accueil

ghost commented Apr 7, 2017

@tcitworld

Je remplacerait "Accueil" par "Fil perso" où un terme ayant plus de sens qu'accueil
@tcitworld

This comment has been minimized.

Show comment
Hide comment
@tcitworld

tcitworld Apr 7, 2017

Contributor

Ça fait du « Fil » partout. :/
Contributor

tcitworld commented Apr 7, 2017

Ça fait du « Fil » partout. :/
@paulloz

This comment has been minimized.

Show comment
Hide comment
@paulloz

paulloz Apr 7, 2017

Très bizarre l'incohérence d'avoir une colonne titrée «Fil public» après avoir cliqué sur «Fil public global» (ce n'est pas présent en version anglaise).
Sinon je trouve les titres compréhensibles en l'état.

paulloz commented Apr 7, 2017 •
edited
Edited 1 time
  • @paulloz paulloz edited Apr 7, 2017 (most recent)

Très bizarre l'incohérence d'avoir une colonne titrée «Fil public» après avoir cliqué sur «Fil public global» (ce n'est pas présent en version anglaise).
Sinon je trouve les titres compréhensibles en l'état.
@ghost

This comment has been minimized.

Show comment
Hide comment
@ghost

ghost Apr 7, 2017 

 "column.home": "Réseau direct",
  "column.community": "Fil local",
  "column.public": "Fil public",
  "column.notifications": "Notifications",
  "column.public": "Fil public",

Pas convaincu par "Réseau direct", juste une idée pour l'instant

ghost commented Apr 7, 2017 •
edited by ghost
Edited 1 time
  • @ghost ghost edited Apr 7, 2017 (most recent) 

 "column.home": "Réseau direct",
  "column.community": "Fil local",
  "column.public": "Fil public",
  "column.notifications": "Notifications",
  "column.public": "Fil public",

Pas convaincu par "Réseau direct", juste une idée pour l'instant
@tcitworld
Update french translation 
Add french translation for emails sent

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Add non-breaking spaces

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

changes and fixes to the nbsps

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

French update

a few fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
Loading status checks…
6b34b08
@tcitworld

This comment has been minimized.

Show comment
Hide comment
@tcitworld

tcitworld Apr 7, 2017

Contributor

Cleaned and RFR.
Contributor

tcitworld commented Apr 7, 2017

Cleaned and RFR.
@ghost

This comment has been minimized.

Show comment
Hide comment
@ghost

ghost Apr 7, 2017

@tcitworld Autre remarque le bouton "CW" content warning ne marche pas vraiment en français. On peut le remplacer par un font-awesome comme les deux autres boutons peut-être ?
<i class="fa fa-fw fa-plus-square" aria-hidden="true"></i>

Ça donnerait ça :
cw

ghost commented Apr 7, 2017

@tcitworld Autre remarque le bouton "CW" content warning ne marche pas vraiment en français. On peut le remplacer par un font-awesome comme les deux autres boutons peut-être ?
<i class="fa fa-fw fa-plus-square" aria-hidden="true"></i>

Ça donnerait ça :
cw
@mkody

This comment has been minimized.

Show comment
Hide comment
@mkody

mkody Apr 7, 2017

Contributor

I guess it would be better if it was an icon for any language, and not "CW".
Contributor

mkody commented Apr 7, 2017

I guess it would be better if it was an icon for any language, and not "CW".
@tcitworld

This comment has been minimized.

Show comment
Hide comment
@tcitworld

tcitworld Apr 7, 2017

Contributor

Yup, please open an new issue @Khogniak. And your icon doesn't really fits.
Contributor

tcitworld commented Apr 7, 2017

Yup, please open an new issue @Khogniak. And your icon doesn't really fits.
@gfaivre

This comment has been minimized.

Show comment
Hide comment
@gfaivre

gfaivre Apr 7, 2017

Contributor

Quid de «fil unifié» voir même «fédéré» qui existe en français aussi, pour se rapprocher du «Federated» Anglo-Saxon ?
Contributor

gfaivre commented Apr 7, 2017

Quid de «fil unifié» voir même «fédéré» qui existe en français aussi, pour se rapprocher du «Federated» Anglo-Saxon ?
config/locales/fr.yml
@@ -93,6 +110,9 @@ fr:
follow:
body: "%{name} vous suit !"
subject: "%{name} vous suit"
+ follow_request:
+ body: "%{name} a demandé à vous suivre"
+ subject: 'Abonné⋅es en attente : %{name}'

This comment has been minimized.

Show comment
Hide comment
@j0k3r

j0k3r Apr 7, 2017

Contributor

attente&nbsp;:?
If yes, you can make it available on each : in that file ✌️
@j0k3r

j0k3r Apr 7, 2017

Contributor

attente&nbsp;:?
If yes, you can make it available on each : in that file ✌️

This comment has been minimized.

Show comment
Hide comment
@paulloz

paulloz Apr 7, 2017

If we're going there with :, then it should be done for :;!?.
@paulloz

paulloz Apr 7, 2017

If we're going there with :, then it should be done for :;!?.

This comment has been minimized.

Show comment
Hide comment
@SansPseudoFix

SansPseudoFix Apr 7, 2017

Contributor

If we're going there with :, then it should be done for :;!?.

Actually, if we're talking about french from France, yes, we should.
@SansPseudoFix

SansPseudoFix Apr 7, 2017

Contributor

If we're going there with :, then it should be done for :;!?.

Actually, if we're talking about french from France, yes, we should.
config/locales/fr.yml
+ x_days: "%{count}d"
+ x_minutes: "%{count}m"
+ x_months: "%{count}mo"
+ x_seconds: "%{count}s"

This comment has been minimized.

Show comment
Hide comment
@SansPseudoFix

SansPseudoFix Apr 7, 2017

Contributor

Sorry about missing translations… Will do soon.
@SansPseudoFix

SansPseudoFix Apr 7, 2017

Contributor

Sorry about missing translations… Will do soon.
@Gargron

Gargron approved these changes Apr 8, 2017
View changes

@Gargron Gargron merged commit 41f8fde into tootsuite:master Apr 8, 2017
2 checks passed

2 checks passed

codeclimate no new or fixed issues
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@SansPseudoFix SansPseudoFix referenced this pull request Apr 8, 2017

Merged

French typo #1257

nolanlawson added a commit to tootcafe/mastodon that referenced this pull request Apr 11, 2017

@nolanlawson
Merge Mastodon v1.1.1 (#3) 
* added Esperanto (eo)

* Added Esperanto translation inside the javascripts folder

* add persistance to Postresql container

* add volume for redis container

* add mastodon.cloud to List of instances

* Update List-of-Mastodon-instances.md

* Add niu.moe, cuz it's kawaii

* Added im-in.space

* Fix wrong url in scalingo.json

* Make scalingo doc clearer

* Add social.bytestemplar.com to instances list

* Update Production-guide.md

Corrected spelling error for "install"

* Added digitalhumanities.club instance

* added instance

* Update components.scss

Use nicer scrollbars in MS edge

* Adding masto.raildecake.fr, french instance 🌻🐘

* Add good-dragon.com

* Update description on good-dragon.com

* Add Rich.GOP

* Update List-of-Mastodon-instances.md

* Adds mtndevelopment

* Update List-of-Mastodon-instances.md

* Add mastodon.nuzgo.net

* Description in instance list for mastodon.ninetailed.uk

* Added off-the-clock.us to the list of instances

* Catch more errors in process_follows so it doesn't fail

* Fix notifications delivered to wrong pubsub channel, optimized RemoveStatusService,
slightly optimized FanOutOnWriteService again

* Add Northeastern University Mastodon

* Fix wrong pubsub channel on public timelines

* Add infinimatix.net to instance list

* Add mastodon.elao.com instance

* Update List-of-Mastodon-instances.md

* Optimize Dockerfile

Optimize Dockerfile, reduce build time.

* Update List-of-Mastodon-instances.md

Add mastodon.land instance

* Added an instance to the list

Just launched https://hackertribe.io/, added it to the list.

* Updates slugignore.

* add my instance

* Add meow.social

* Update List-of-Mastodon-instances.md

* Linux users must enable NFS for Vagrant

* Add an instance.

* Update List-of-Mastodon-instances.md

* Update List-of-Mastodon-instances.md

* Add manx.social instance

* add metadata to Dockerfile

* add Docker microbadger to README.md

* Added pericles.world in the list of instances

* Reduce size of background-photo.jpeg

Reduced by running through `guetzli` image optimizer.

* Add a couple of network performance tweaks to Vagrantfile.

* Added masto.razrnet.fr

* Low-hanging fruit of query optimization, these indices were missing

* Update Production-guide.md

Under ## General dependencies:
apt-get needs sudo and install was typed wrongly.

* updated instance hostname

* Email service options :P

Small addition in case people want email service options, sparkpost.com gives you 100k/mo free

* Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124)

* Rewrite Atom generation from stream entries to use Ox instead of Nokogiri::Builder

StreamEntry is now limited to only statuses, which allows some optimization. Removed
extra queries on AccountsController#show. AtomSerializer instead of AtomBuilderHelper
used in AccountsController#show, StreamEntriesController#show, StreamEntryRenderer
and PubSubHubbub::DistributionWorker

PubSubHubbub::DistributionWorker moves n+1 DomainBlock query to PubSubHubbub::DeliveryWorker
instead.

All Salmon slaps that aren't based on StreamEntry still use AtomBuilderHelper and Nokogiri

* All Salmon slaps now use Ox instead of Nokogiri. No touch from status on account

* Update List-of-Mastodon-instances.md

* Force UTF8 encoding on generated XML (#1140)

* Re-add forgotten <author> element on standalone <entry>

* Allow setting of default language through config

Setting of locale in controller extracted to Localized concern,
the doorkeeper authorized applications controller moved under
custom namespace with inclusion of Localized, which resolves the
"it sometimes appears in a different random language" bug

* Update Finnish translations, add sample Minio config (#954)

* Fix nil#object_type error

* Moved into a comment per feedback

* Update heroku instructions

* Add specs for media attachment validations

There are currently not specs for the two media validations that are performed
by `PostStatusService`. This adds specs for the validations that ensure that you
cannot attach more than four files, and that a status cannot have both image and
video attachments.

* DRY up reblog vs original status check

Checking reblog vs original status was happening in multiple places
across the app. For views, this logic was encapsulated in a helper
method named `proper_status` but in the other layers of the app, the
logic was duplicated.

Because the logic is used at all layers of the app, we extracted it into
a `Status#proper` method on the model and changed all uses of the logic
to use this method. There is now a single source of truth for this
condition.

We added test coverage to untested methods that got refactored.

* Add specs for PostStatusService

This implements all pending specs, and adds additional coverage for the
following functionality:

* Normal status creation
* Creating a reply status
* Creating a sensitive status
* Creating a status with spoiler text
* A status with no spoiler text gets an empty string for spoiler text
* Creating a status with custom visibility
* Creating a status for an application
* Processing mentions
* Processing Hashtags
* Pinging PuSH hubs
* Crawling links
* Attaching media

* Use I18n for media attachment validation errors

These are currently user facing errors, but are not localized. This adds the
ability for these messages to be localized.

* Add mastodon.fun

* change suggested cipher for nginx

* typo

* Implement pending specs on Status

Implement the two pending specs on `Status`: `reblogs_count` and
`favourites_count`.

* Fix npm/yarn cache cleaning

* Adds Oulipo.social to Mastodons list

This is a Mastodon with a particular constraint about
what symbols you can post.

* Add indigo.zone to list of instances

* Update Heroku-guide.md

Removing some of the confusion around what format S3 bucket names and regions should be entered as well as providing an example of an S3 policy that follows best security practices for this sort of thing.

* Update Heroku-guide.md

Cleaning up the heroku admin command bit to match the form used in Administration-guide.md and clarify the wording a bit.

* Update Administration-guide.md

the syntax for running the rake task wasn't correct.

* Add HackerNewsBot

I have created a bot that will post Hacker News stories with 100+ points. Adding it to the list.

* Fix #801 - Respect webfinger's canonical response of username/domain

* Fix #1165 - before_action was called before protect_from_forgery

* #1141 on remote follow

The async action is send before persist, account.id not yet generated

Pull queue receive 'nil' so no profile update.

* fixed a sentence in readme

* Add SVG version of logo to repo

* Close instance list to additions

* Fix my URL

Update my URL since toot.zone was shut down.

* Add reference to Elixir client for Mastodon API

* Use Setting.site_title value for `og:site_name` occurrences (#1194)

* Add helper method to return Setting.site_title

* Use site_title helper in application layout

* Use site_title value for og:site_name

* Add some missing strings to prevent some React warning in the console (#1230)

* French translation update (#1188)

* Update fr.yml

one typo fix

* Update simple_form.fr.yml

one translation consistency

* Updated about page in Finnish language (#1170)

* update faq with default language

* update translation for about page

* update Minio config

Thanks to @Gargon for helping me. I hope this will help others as well

* update import and export translation

* translate emails to finnish

* add finnish translation for emails

* add finnish translation for emails

* add finnish translation

* add missing dot

* update finnish language to emails

* add finnish translation for emails

* add dot and fix typo

* updated some minor typos

* remove language change due breaking emails

And by dev request

* updated minio config by dev request

* updated about page translation

* Revert "add persistance to Postresql container" (#1251)

* Add OTP_SECRET to Heroku app.json (#1246)

* Update mastodon.nuzgo.net (#1242)

Add ipv6 support

* Update simple_form.de.yml (#971)

* Fixed two translation errors (#1139)

Changed followers from Follower to Folger and following from Gefolgt to Folgt, to make it identical with the translation in de.jsx

* Updated German translation (#1248)

Fixed various spelling and grammar mistakes.
Used more gender-neutral language.

* Update mastodon.brussels instance name on List of Instances

Correct mastodon.brussels.fr to mastodon.brussels

* Add titles to more icons, and change clear notifications icon. (#1101)

* Update french translation (#1148)

Add french translation for emails sent

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Add non-breaking spaces

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

changes and fixes to the nbsps

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

French update

a few fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

* Fix #1141, fix #1126 - Avatar/profile info fetching (#1215)

* Fix #1141, fix #1126 - Work through UpdateRemoteProfileService for both <feed> and <entry> top-level tags

* Improve code quality, remove line unrelated to fix

* Add mst3k.interlinked.me to list of instances (#1235)

* Improve about page responsiveness (#1252)

* Improve responsiveness of registration form and closed banner (#1265)

* Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)

* Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled
TOTP secret is not shown again after 2FA is enabled

* Clean up

* Make public timelines API not require user context/app credentials (#1291)

* Make /api/v1/timelines/public and /api/v1/timelines/tag/:id public
Fix #1156 - respect query params when generating pagination links in API

* Apply pagination fix to more APIs

* Adds user confirmation rake task (#1300)

* Adds task to confirm user by email.

* Adds documentation for manual confirmation.

* Allows setting log level in env variable (#1290)

* Allows setting log level in env variable.

* Made changes based on feedback in #1290.

* Add env variable to disable prepared statements (#1293)

* Fix nonworking clear notices button (#1316)

* Ignore implied formats for catch all route requests (#1340)

A request to `/test` would show the custom 404 page, but a request to
`/test.test` would return a 404 with an empty body.

This change ignores the format on incoming catch all route requests, so that the
html 404 page is returned on these requests.

* Search cleanup (#1333)

* Clean up SQL output in Tag and Account search methods

* Add basic coverage for Tag.search_for

* Add coverage for Account.search_for

* Add coverage for Account.advanced_search_for

* Fixes #1311 margin shouldn't stay fixed (#1312)

* Clean up about page (#1282)

* Add InstancePresenter to expose site details

* Clean up about controller, use instance presenter

* add empty notifications french translation (#1111)

* French typo (#1257)

* French typo

* Datetime french translation

* French translation update (#1271)

* Update confirmation_instructions.fr.html.erb

consistency across the French translation

* Update 

consistency across the French translation

* Update fr.yml

a bunch of consistency across the French translation + a few typos

* Update doorkeeper.fr.yml

consistency across the French translation (punctuation)

* Update fr.jsx (#1329)

* Update fr.jsx

* Remove duplicate translation

* Helper cleanup (#1348)

* Remove unused helper files

* Add coverage for application helper

* Add coverage for StreamEntriesHelper #display_name

* Allow users to update their Account in the API (#1179)

* Allow users to update their Account in the API

It would be nice for API clients to be able to allow users to update
their accounts without having to wrap Mastodon in a web view. This patch
adds an API endpoint to let users submit a PATCH for their account.

Signed-off-by: David Celis <me@davidcel.is>

* Add /api/v1/accounts/update_credentials to the API docs

Signed-off-by: David Celis <me@davidcel.is>

* Add comment to settings.yml to nudge admins towards editing values via Web UI (#1289)

* Put a useful message for new admins on /about/more

I totally failed to realize this file was just defaults.  I think
this message would be a good default for people like me.

* Revert default site description, expand comment

This will keep setup-related stuff from leaking into public views,
while still hopefully keeping over-eager admins from editing this
file unnecessarily before RTFMing.  (e.g., me)

* Minor change on API.md (#1352)

* Minor API.md changes (#1351)

* Use HTTP Accept-Language to detect locale (#1166)

* Use HTTP Accept-Language to detect locale

* Fix gem order to comply with codeclimate

* Sort gem to comply with rubocop

* I18n.default_locale fallback when there is no accept-language header

* Get handle from atom feed's author/email field instead of guessing from URL (#1344)

The goal of this change is to enhance Mastodon's handling of remote domains
for which the APIs reside on a different host (see issue #1032).

Indeed, when a remote user unknown to Mastodon is mentionned, only its profile
URL (e.g. https://social.example.org/users/User) is known, and Mastodon has to
build a @username@domain handle for it. To do so, Mastodon fetches the user's
atom feed (e.g., https://social.example.org/users/User.atom) and uses its
content to get the username part of the handle, and the URL's host part to
build the domain (e.g., @user@social.example.org). This handle is then used
for a Webfinger request.

In the case where example.org serves the Webfinger info for @user@example.org
and all feeds and APIs are hosted at social.example.org, Mastodon will still
build @user@social.example.org and fail at resolving the account's details
through Webfinger.

This patch changes this behaviour by using the author's email address from
the atom feed to build the handle. In Mastodon-generated atom feeds, the
email address is always the handle it expects for federation.

* update portuguese translation (#1280)

added the missing fields and improved the translation

* Minor change to Entity on API.md (Relationship) (#1356)

* Fix /api/v1/accounts/update_credentials tests (#1357)

* Fix #1339 - better Atom titles (#1343)

* Do not store last visited URL from API controllers (#1330)

Sign-in redirects you back to last visited URL, but in case of API requests,
this sometimes redirected users to an API URL that, of course, greeted them
with an {"error":"The access token is invalid"}
b692453

nolanlawson added a commit to tootcafe/mastodon that referenced this pull request Apr 11, 2017

@nolanlawson
Merge Mastodon v.1.1.1 into the tootcafe branch (#4) 
* added Esperanto (eo)

* Added Esperanto translation inside the javascripts folder

* add persistance to Postresql container

* add volume for redis container

* add mastodon.cloud to List of instances

* Update List-of-Mastodon-instances.md

* Add niu.moe, cuz it's kawaii

* Added im-in.space

* Fix wrong url in scalingo.json

* Make scalingo doc clearer

* Add social.bytestemplar.com to instances list

* Update Production-guide.md

Corrected spelling error for "install"

* Added digitalhumanities.club instance

* added instance

* Update components.scss

Use nicer scrollbars in MS edge

* Adding masto.raildecake.fr, french instance 🌻🐘

* Add good-dragon.com

* Update description on good-dragon.com

* Add Rich.GOP

* Update List-of-Mastodon-instances.md

* Adds mtndevelopment

* Update List-of-Mastodon-instances.md

* Add mastodon.nuzgo.net

* Description in instance list for mastodon.ninetailed.uk

* Added off-the-clock.us to the list of instances

* Add Northeastern University Mastodon

* Add infinimatix.net to instance list

* Add mastodon.elao.com instance

* Update List-of-Mastodon-instances.md

* Optimize Dockerfile

Optimize Dockerfile, reduce build time.

* Update List-of-Mastodon-instances.md

Add mastodon.land instance

* Added an instance to the list

Just launched https://hackertribe.io/, added it to the list.

* Updates slugignore.

* add my instance

* Add meow.social

* Update List-of-Mastodon-instances.md

* Linux users must enable NFS for Vagrant

* Add an instance.

* Update List-of-Mastodon-instances.md

* Update List-of-Mastodon-instances.md

* Add manx.social instance

* add metadata to Dockerfile

* add Docker microbadger to README.md

* Added pericles.world in the list of instances

* Reduce size of background-photo.jpeg

Reduced by running through `guetzli` image optimizer.

* Add a couple of network performance tweaks to Vagrantfile.

* Added masto.razrnet.fr

* Low-hanging fruit of query optimization, these indices were missing

* Update Production-guide.md

Under ## General dependencies:
apt-get needs sudo and install was typed wrongly.

* updated instance hostname

* Email service options :P

Small addition in case people want email service options, sparkpost.com gives you 100k/mo free

* Rewrite Atom generation from stream entries to use Ox instead of Nokogiri (#1124)

* Rewrite Atom generation from stream entries to use Ox instead of Nokogiri::Builder

StreamEntry is now limited to only statuses, which allows some optimization. Removed
extra queries on AccountsController#show. AtomSerializer instead of AtomBuilderHelper
used in AccountsController#show, StreamEntriesController#show, StreamEntryRenderer
and PubSubHubbub::DistributionWorker

PubSubHubbub::DistributionWorker moves n+1 DomainBlock query to PubSubHubbub::DeliveryWorker
instead.

All Salmon slaps that aren't based on StreamEntry still use AtomBuilderHelper and Nokogiri

* All Salmon slaps now use Ox instead of Nokogiri. No touch from status on account

* Update List-of-Mastodon-instances.md

* Force UTF8 encoding on generated XML (#1140)

* Re-add forgotten <author> element on standalone <entry>

* Allow setting of default language through config

Setting of locale in controller extracted to Localized concern,
the doorkeeper authorized applications controller moved under
custom namespace with inclusion of Localized, which resolves the
"it sometimes appears in a different random language" bug

* Update Finnish translations, add sample Minio config (#954)

* Fix nil#object_type error

* Moved into a comment per feedback

* Update heroku instructions

* Add specs for media attachment validations

There are currently not specs for the two media validations that are performed
by `PostStatusService`. This adds specs for the validations that ensure that you
cannot attach more than four files, and that a status cannot have both image and
video attachments.

* DRY up reblog vs original status check

Checking reblog vs original status was happening in multiple places
across the app. For views, this logic was encapsulated in a helper
method named `proper_status` but in the other layers of the app, the
logic was duplicated.

Because the logic is used at all layers of the app, we extracted it into
a `Status#proper` method on the model and changed all uses of the logic
to use this method. There is now a single source of truth for this
condition.

We added test coverage to untested methods that got refactored.

* Add specs for PostStatusService

This implements all pending specs, and adds additional coverage for the
following functionality:

* Normal status creation
* Creating a reply status
* Creating a sensitive status
* Creating a status with spoiler text
* A status with no spoiler text gets an empty string for spoiler text
* Creating a status with custom visibility
* Creating a status for an application
* Processing mentions
* Processing Hashtags
* Pinging PuSH hubs
* Crawling links
* Attaching media

* Use I18n for media attachment validation errors

These are currently user facing errors, but are not localized. This adds the
ability for these messages to be localized.

* Add mastodon.fun

* change suggested cipher for nginx

* typo

* Implement pending specs on Status

Implement the two pending specs on `Status`: `reblogs_count` and
`favourites_count`.

* Fix npm/yarn cache cleaning

* Adds Oulipo.social to Mastodons list

This is a Mastodon with a particular constraint about
what symbols you can post.

* Add indigo.zone to list of instances

* Update Heroku-guide.md

Removing some of the confusion around what format S3 bucket names and regions should be entered as well as providing an example of an S3 policy that follows best security practices for this sort of thing.

* Update Heroku-guide.md

Cleaning up the heroku admin command bit to match the form used in Administration-guide.md and clarify the wording a bit.

* Update Administration-guide.md

the syntax for running the rake task wasn't correct.

* Add HackerNewsBot

I have created a bot that will post Hacker News stories with 100+ points. Adding it to the list.

* Fix #801 - Respect webfinger's canonical response of username/domain

* Fix #1165 - before_action was called before protect_from_forgery

* #1141 on remote follow

The async action is send before persist, account.id not yet generated

Pull queue receive 'nil' so no profile update.

* fixed a sentence in readme

* Add SVG version of logo to repo

* Close instance list to additions

* Fix my URL

Update my URL since toot.zone was shut down.

* Add reference to Elixir client for Mastodon API

* Use Setting.site_title value for `og:site_name` occurrences (#1194)

* Add helper method to return Setting.site_title

* Use site_title helper in application layout

* Use site_title value for og:site_name

* Add some missing strings to prevent some React warning in the console (#1230)

* French translation update (#1188)

* Update fr.yml

one typo fix

* Update simple_form.fr.yml

one translation consistency

* Updated about page in Finnish language (#1170)

* update faq with default language

* update translation for about page

* update Minio config

Thanks to @Gargon for helping me. I hope this will help others as well

* update import and export translation

* translate emails to finnish

* add finnish translation for emails

* add finnish translation for emails

* add finnish translation

* add missing dot

* update finnish language to emails

* add finnish translation for emails

* add dot and fix typo

* updated some minor typos

* remove language change due breaking emails

And by dev request

* updated minio config by dev request

* updated about page translation

* Revert "add persistance to Postresql container" (#1251)

* Add OTP_SECRET to Heroku app.json (#1246)

* Update mastodon.nuzgo.net (#1242)

Add ipv6 support

* Update simple_form.de.yml (#971)

* Fixed two translation errors (#1139)

Changed followers from Follower to Folger and following from Gefolgt to Folgt, to make it identical with the translation in de.jsx

* Updated German translation (#1248)

Fixed various spelling and grammar mistakes.
Used more gender-neutral language.

* Update mastodon.brussels instance name on List of Instances

Correct mastodon.brussels.fr to mastodon.brussels

* Add titles to more icons, and change clear notifications icon. (#1101)

* Update french translation (#1148)

Add french translation for emails sent

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Add non-breaking spaces

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

changes and fixes to the nbsps

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

French update

a few fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

* Fix #1141, fix #1126 - Avatar/profile info fetching (#1215)

* Fix #1141, fix #1126 - Work through UpdateRemoteProfileService for both <feed> and <entry> top-level tags

* Improve code quality, remove line unrelated to fix

* Add mst3k.interlinked.me to list of instances (#1235)

* Improve about page responsiveness (#1252)

* Improve responsiveness of registration form and closed banner (#1265)

* Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled (#1278)

* Fix #795, fix #704, fix #835 - 2FA requires confirmation to be enabled
TOTP secret is not shown again after 2FA is enabled

* Clean up

* Make public timelines API not require user context/app credentials (#1291)

* Make /api/v1/timelines/public and /api/v1/timelines/tag/:id public
Fix #1156 - respect query params when generating pagination links in API

* Apply pagination fix to more APIs

* Adds user confirmation rake task (#1300)

* Adds task to confirm user by email.

* Adds documentation for manual confirmation.

* Allows setting log level in env variable (#1290)

* Allows setting log level in env variable.

* Made changes based on feedback in #1290.

* Add env variable to disable prepared statements (#1293)

* Fix nonworking clear notices button (#1316)

* Ignore implied formats for catch all route requests (#1340)

A request to `/test` would show the custom 404 page, but a request to
`/test.test` would return a 404 with an empty body.

This change ignores the format on incoming catch all route requests, so that the
html 404 page is returned on these requests.

* Search cleanup (#1333)

* Clean up SQL output in Tag and Account search methods

* Add basic coverage for Tag.search_for

* Add coverage for Account.search_for

* Add coverage for Account.advanced_search_for

* Fixes #1311 margin shouldn't stay fixed (#1312)

* Clean up about page (#1282)

* Add InstancePresenter to expose site details

* Clean up about controller, use instance presenter

* add empty notifications french translation (#1111)

* French typo (#1257)

* French typo

* Datetime french translation

* French translation update (#1271)

* Update confirmation_instructions.fr.html.erb

consistency across the French translation

* Update 

consistency across the French translation

* Update fr.yml

a bunch of consistency across the French translation + a few typos

* Update doorkeeper.fr.yml

consistency across the French translation (punctuation)

* Update fr.jsx (#1329)

* Update fr.jsx

* Remove duplicate translation

* Helper cleanup (#1348)

* Remove unused helper files

* Add coverage for application helper

* Add coverage for StreamEntriesHelper #display_name

* Allow users to update their Account in the API (#1179)

* Allow users to update their Account in the API

It would be nice for API clients to be able to allow users to update
their accounts without having to wrap Mastodon in a web view. This patch
adds an API endpoint to let users submit a PATCH for their account.

Signed-off-by: David Celis <me@davidcel.is>

* Add /api/v1/accounts/update_credentials to the API docs

Signed-off-by: David Celis <me@davidcel.is>

* Add comment to settings.yml to nudge admins towards editing values via Web UI (#1289)

* Put a useful message for new admins on /about/more

I totally failed to realize this file was just defaults.  I think
this message would be a good default for people like me.

* Revert default site description, expand comment

This will keep setup-related stuff from leaking into public views,
while still hopefully keeping over-eager admins from editing this
file unnecessarily before RTFMing.  (e.g., me)

* Minor change on API.md (#1352)

* Minor API.md changes (#1351)

* Use HTTP Accept-Language to detect locale (#1166)

* Use HTTP Accept-Language to detect locale

* Fix gem order to comply with codeclimate

* Sort gem to comply with rubocop

* I18n.default_locale fallback when there is no accept-language header

* Get handle from atom feed's author/email field instead of guessing from URL (#1344)

The goal of this change is to enhance Mastodon's handling of remote domains
for which the APIs reside on a different host (see issue #1032).

Indeed, when a remote user unknown to Mastodon is mentionned, only its profile
URL (e.g. https://social.example.org/users/User) is known, and Mastodon has to
build a @username@domain handle for it. To do so, Mastodon fetches the user's
atom feed (e.g., https://social.example.org/users/User.atom) and uses its
content to get the username part of the handle, and the URL's host part to
build the domain (e.g., @user@social.example.org). This handle is then used
for a Webfinger request.

In the case where example.org serves the Webfinger info for @user@example.org
and all feeds and APIs are hosted at social.example.org, Mastodon will still
build @user@social.example.org and fail at resolving the account's details
through Webfinger.

This patch changes this behaviour by using the author's email address from
the atom feed to build the handle. In Mastodon-generated atom feeds, the
email address is always the handle it expects for federation.

* update portuguese translation (#1280)

added the missing fields and improved the translation

* Minor change to Entity on API.md (Relationship) (#1356)

* Fix /api/v1/accounts/update_credentials tests (#1357)

* Fix #1339 - better Atom titles (#1343)

* Do not store last visited URL from API controllers (#1330)

Sign-in redirects you back to last visited URL, but in case of API requests,
this sometimes redirected users to an API URL that, of course, greeted them
with an {"error":"The access token is invalid"}
6137355

Nyoho pushed a commit to Nyoho/mastodon that referenced this pull request Apr 25, 2017

@tcitworld @Gargron
Update french translation (#1148) 
Add french translation for emails sent

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

Add non-breaking spaces

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

changes and fixes to the nbsps

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

French update

a few fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

fixes

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
a586f7a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment