Fix regular expression for RFC 5646 (regression from #3604) (#4133)

This commit is contained in:
Yamagishi Kazutoshi
2017-07-10 21:02:18 +09:00
committed by Eugen Rochko
parent 2b9721d1b3
commit 63baab088d
34 changed files with 221 additions and 62 deletions

View File

@ -928,27 +928,6 @@
],
"path": "app/javascript/mastodon/features/public_timeline/index.json"
},
{
"descriptors": [
{
"defaultMessage": "New report",
"id": "report.heading"
},
{
"defaultMessage": "Additional comments",
"id": "report.placeholder"
},
{
"defaultMessage": "Submit",
"id": "report.submit"
},
{
"defaultMessage": "Reporting",
"id": "report.target"
}
],
"path": "app/javascript/mastodon/features/report/index.json"
},
{
"descriptors": [
{
@ -1008,6 +987,40 @@
],
"path": "app/javascript/mastodon/features/ui/components/boost_modal.json"
},
{
"descriptors": [
{
"defaultMessage": "Network error",
"id": "bundle_column_error.title"
},
{
"defaultMessage": "Something went wrong while loading this component.",
"id": "bundle_column_error.body"
},
{
"defaultMessage": "Try again",
"id": "bundle_column_error.retry"
}
],
"path": "app/javascript/mastodon/features/ui/components/bundle_column_error.json"
},
{
"descriptors": [
{
"defaultMessage": "Something went wrong while loading this component.",
"id": "bundle_modal_error.message"
},
{
"defaultMessage": "Try again",
"id": "bundle_modal_error.retry"
},
{
"defaultMessage": "Close",
"id": "bundle_modal_error.close"
}
],
"path": "app/javascript/mastodon/features/ui/components/bundle_modal_error.json"
},
{
"descriptors": [
{