fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-27 23:55:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
9336 commits 133 branches 266 tags 975 MiB
Commit graph

1278 commits

Author SHA1 Message Date
Thibaut Girka 6badf2d252 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-15 17:11:40 +02:00
manuelviens f4f22391b2 Update simple_form.fr.yml (#10756) 
Remplacement des ' par des ’
 2019-05-15 14:52:11 +09:00
ThibG 14f6ce2885 Record account suspend/silence time and keep track of domain blocks (#10660) 
* Record account suspend/silence time and keep track of domain blocks

* Also unblock users who were suspended/silenced before dates were recorded

* Add tests

* Keep track of suspending date for users suspended through the CLI

* Show accurate number of accounts that would be affected by unsuspending an instance

* Change migration to set silenced_at and suspended_at

* Revert "Also unblock users who were suspended/silenced before dates were recorded"

This reverts commit a015c65d2d.

* Switch from using suspended and silenced to suspended_at and silenced_at

* Add post-deployment migration script to remove `suspended` and `silenced` columns

* Use Account#silence! and Account#suspend! instead of updating the underlying property

* Add silenced_at and suspended_at migration to post-migration

* Change account fabricator to translate suspended and silenced attributes

* Minor fixes

* Make unblocking domains always retroactive
 2019-05-14 19:05:02 +02:00
Marek Ľach 564106c5d6 Update slovak simple_forms (#10763) 2019-05-14 19:55:47 +09:00
Thibaut Girka 2b97d9d780 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-11 18:23:46 +02:00
Alix Rossi 775ee63b71 i18n: Update French translations (#10747) 
* Update French JSON

* i18n: Update fr.yml

* i18n: Update simple_form.fr.yml

* Update simple_form.fr.yml

* Update fr.yml
 2019-05-10 18:09:46 +02:00
Alix Rossi d25e358f9f i18n: Update Corsican translations (#10746) 
* i18n: Update Corsican translations

* Update co.yml

* Fix a translation in co.yml
 2019-05-10 18:09:34 +02:00
Thibaut Girka 68629f2773 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system
 2019-05-10 17:09:12 +02:00
manuelviens 780d99c204 Update simple_form.fr.yml (#10726) 
* Minor modif and add

Modified '' by ’ and added invite_request

* Update simple_form.fr.yml

Modifications suggérées par ThibG

* Update simple_form.fr.yml

Remplacement des ' par des ’.

* Update simple_form.fr.yml

Ajout de deux petits espaces devant sessions:
 2019-05-09 23:16:24 +02:00
Marek Ľach 9962174a1f Add strings for Slovak (#10734) 
* Add strings for Slovak

* Update sk.yml
 2019-05-09 23:16:05 +02:00
manuelviens 9d4e9015a7 Update fr.yml (#10727) 
* Update fr.yml

Added missing lines

* Update fr.yml

Application des modifications de ThibG

* Update fr.yml

Modifications proposées par ThibG
 2019-05-09 23:15:39 +02:00
spla 7562602df8 i18n Update Catalan translation (#10719) 
* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translation

* i18n Update Catalan translation
 2019-05-07 00:55:37 +09:00
mayaeh 1eb14ef774 i18n: Update Japanese translations (#10706) 
* Update Japanese translations.

run yarn manage:translations

This commit includes translations by some users that were done at the transifex.

* Reduce translation text because it becomes two lines.
 2019-05-06 04:34:32 +09:00
Thibaut Girka 832cf92c74 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-05 12:28:10 +02:00
Marek Ľach fc192b882f Minor Slovak locale update (#10705) 2019-05-05 17:25:35 +09:00
Aditoo17 b7741ed732 I18n: Update Czech translation 🇨🇿 (#10704) 
* I18n: Update Czech translation

* Tiny fix
 2019-05-05 15:33:33 +09:00
Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
 2019-05-04 16:37:26 +02:00
Alix Rossi c88d9e524b i18n: Update Corsican translation (#10692) 2019-05-04 20:09:25 +09:00
ThibG 011b032300 Provide a link to existing domain block when trying to block an already-blocked domain (#10663) 
* When trying to block an already-blocked domain, provide a link to the block

* Fix styling for links in flash messages

* Allow blocks to be upgraded but not downgraded
 2019-05-03 20:36:36 +02:00
Thibaut Girka fcbf557bd2 Add site-wide options to show reblogs and replies in local/public timelines 
Fixes #1021
 2019-05-01 22:33:09 +02:00
ThibG 0db269f3dc Minor fixes to the French translation (#10662) 2019-05-01 22:19:55 +09:00
Marek Ľach c008911249 New string added for Slovak translation (#10637) 2019-04-26 18:07:36 +02:00
Thibaut Girka a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
  Upstream cleaned up a bit, including on lines in which
  we replaced the hardcoded 500 character limit with a maxChar
  constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
  Moved upstream's new animated avatar hover handling in
  app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
  Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
  Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
  Upstream made repo URL configurable, did the same, but
  default to glitch-soc
 2019-04-22 20:40:04 +02:00
marcin mikołajczak 46321dc993 i18n: Fix misleading strings in Polish translation (#10615) 2019-04-21 22:30:04 +02:00
jeroenpraat cf5414e5d3 Small fix Dutch translation (#10612) 
* Small fix Dutch translation

* Better descriptive titles

See #10611
 2019-04-21 18:44:51 +02:00
Yamagishi Kazutoshi a430f2a03e i18n: Update Catalan translation (#10559) 
* Updated Catalan strings

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* Update simple_form.ca.yml

* bundle exec i18n-tasks

* Update ca.json

* Update simple_form.ca.yml

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations

* i18n: Update Catalan translations
 2019-04-21 04:53:45 +02:00
jeroenpraat 951f8d5b44 Update NL (Dutch) translation (#10601) 
* Update NL language strings

Have to do it this way, cause this file is locked on Weblate

* fix

* Update simple_form.nl.yml

* Update nl.yml
 2019-04-21 04:46:08 +02:00
Thibaut Girka 268417daf3 Merge branch 'master' into glitch-soc/merge-upstream 2019-04-19 10:44:10 +02:00
Thibaut Girka 546688aa1d Add forgotten text 2019-04-19 00:57:39 +02:00
Thibaut Girka d83068016b Allow turning keybase off instance-wide 2019-04-19 00:57:39 +02:00
Marek Ľach 3d70ec470a Some new strings for Slovak (#10596) 2019-04-18 15:08:59 +09:00
Marek Ľach a8c6feb7ee Update sk.yml translation again (#10589) 
* Update sk.yml

* Update sk.yml

* Update sk.yml
 2019-04-16 21:59:54 +09:00
Marek Ľach 9254bbe875 Important Slovak grammar fixes (#10585) 
* Important grammar fixes for SK Devise translation

* Important Slovak grammar fixes

* Update devise.sk.yml

* Important Slovak grammar fixes

Last batch for today :-)

* Update devise.sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml
 2019-04-16 07:16:12 +09:00
Marek Ľach b2d9dcf5e5 Updates the Slovak translation further (#10584) 2019-04-15 22:18:51 +09:00
Alix Rossi 4ca402ffbd i18n: Update Corsican translation (#10583) 2019-04-15 22:18:27 +09:00
Marek Ľach b4acbd1a30 Small SK locale fixes (#10561) 
* Small SK locale fixes

* Update devise.sk.yml
 2019-04-13 21:24:00 +09:00
Marek Ľach 43a2154575 New strings added into the Slovak translation (#10562) 
* New strings added into the Slovak translation

* Update sk.yml

* Update sk.yml

* Update sk.yml

* Update sk.yml
 2019-04-13 21:23:52 +09:00
Renato "Lond" Cerqueira d305d8747d Add new pt-br translations (#10564) 2019-04-13 21:23:41 +09:00
Thibaut Girka f5b4e9a54a Merge branch 'master' into glitch-soc/merge-upstream 2019-04-11 15:13:52 +02:00
Quentí 21193b0a12 [i18n] Update for Occitan language (#10548) 
* Update activerecord.oc.yml

* Update simple_form.oc.yml

* Fix typo

* Update simple_form.oc.yml

* Remove trailing whitespace
 2019-04-10 22:33:04 +02:00
Thibaut Girka 2f422b708f Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 21:19:21 +02:00
Evgeny Petrov 5dd14dfded i18n: Russian localization update (#10515) 
* i18n: Updated ru.json for Russian language

* i18n: Updated ru.yml

* Normalize ru.yml

* i18n: Updated simple_form.ru.yml

* i18n: Updated activerecord.ru.yml, devise.ru.yml, normalized strings

* Added new strings to ru.json

* Deleted unused (?) string

* i18n: Added recent strings (Settings refactor)
 2019-04-10 20:43:08 +02:00
Eugen Rochko 793b0513eb
Weblate translations (2019-04-10) (#10545) 
* Translated using Weblate (Occitan)

Currently translated at 95.7% (780 of 815 strings)

Translation: Mastodon/Backend
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/oc/

* Translated using Weblate (Greek)

Currently translated at 100,0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (Greek)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/el/

* Translated using Weblate (Greek)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/

* Translated using Weblate (French)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (66 of 66 strings)

Translation: Mastodon/Devise
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/fr/

* Translated using Weblate (Dutch)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/nl/

* Translated using Weblate (Galician)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/gl/

* Translated using Weblate (Dutch)

Currently translated at 100,0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/nl/

* Translated using Weblate (Galician)

Currently translated at 100,0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/gl/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/

* Translated using Weblate (Arabic)

Currently translated at 97.4% (372 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ar/

* Translated using Weblate (French)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fr/

* Translated using Weblate (Thai)

Currently translated at 75.4% (288 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/th/

* Translated using Weblate (Slovak)

Currently translated at 100.0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/

* Translated using Weblate (German)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/de/

* Translated using Weblate (Slovak)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sk/

* Translated using Weblate (Kazakh)

Currently translated at 100,0% (4 of 4 strings)

Translation: Mastodon/Activerecord
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/kk/

* Translated using Weblate (Persian)

Currently translated at 100.0% (382 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/fa/

* Translated using Weblate (Kazakh)

Currently translated at 99.0% (378 of 382 strings)

Translation: Mastodon/React
Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/kk/

* i18n-tasks normalize

* yarn manage:translations

* Fix empty string in Occitan
 2019-04-10 18:17:24 +02:00
mayaeh 9e2a1f1838 i18n: Update Japanese translations (#10536) 
* run i18n-tasks add-missing

* Update Japanese translations.
 2019-04-10 17:36:45 +02:00
Aditoo17 2e01a9b20d I18n: Add one more string (#10543) 2019-04-10 17:17:17 +02:00
Aditoo17 4e59f709aa I18n: Final Czech translation 🇨🇿 (#10542) 
* I18n: Update Czech translation

* I18n: Why do you want to join translation

* I18n: Translating a bunch of more stuff
 2019-04-10 14:52:08 +02:00
koyu 6402701965 Updated German translation (#10539) 
* Updated German locales

* Added account approval locales (German)

* Updated JSON locales (German)

* Updated German translation

* Fixed grammar error (German)

* New strings and adjustments (German)
 2019-04-10 14:50:14 +02:00
Jeong Arm 4595168863 Translation - Korean (#10540) 2019-04-10 14:49:40 +02:00
Alix Rossi a5c60f87b1 i18n: Update Corsican translations (#10538) 2019-04-10 14:49:06 +02:00
Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
 2019-04-10 09:16:08 +02:00