tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'spoiler' of git://github.com/kagucho/mastodon into kagucho-spoiler

Browse Source
This commit is contained in:
Eugen Rochko
2018-03-13 09:18:11 +01:00
parent 9e3a6d6784 0dccb398bd
commit f0ae6b4cc5
39 changed files with 92 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/javascript/mastodon/locales/defaultMessages.json
View File

@ -319,6 +319,15 @@
],
"path": "app/javascript/mastodon/containers/status_container.json"
},
{
"descriptors": [
{
"defaultMessage": "Media",
"id": "account.media"
}
],
"path": "app/javascript/mastodon/features/account_gallery/index.json"
},
{
"descriptors": [
{
@ -781,8 +790,12 @@
{
"descriptors": [
{
"defaultMessage": "Hide text behind warning",
"id": "compose_form.spoiler"
"defaultMessage": "Text is hidden behind warning",
"id": "compose_form.spoiler.marked"
},
{
"defaultMessage": "Text is not hidden",
"id": "compose_form.spoiler.unmarked"
}
],
"path": "app/javascript/mastodon/features/compose/containers/spoiler_button_container.json"