diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-13 16:00:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-13 16:00:20 +0200 |
| commit | 1a5a54eb4b93fd16d9a0d158919b1936abe39227 (patch) | |
| tree | 79c9576e9f164eddb8cce9e585b2e4514ae44d1c | |
| parent | d2c20936f35f140ea4d8600cfac1d452c33acdd2 (diff) | |
| parent | 447b8bc44eb33ae6ffdfbcc7ae52fbe0bba93ece (diff) | |
Merge branch 'master' into master
| -rw-r--r-- | app/assets/javascripts/components/locales/bg.jsx | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/components/locales/de.jsx | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/components/locales/en.jsx | 1 | ||||
| -rw-r--r-- | app/views/stream_entries/show.html.haml | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/app/assets/javascripts/components/locales/bg.jsx b/app/assets/javascripts/components/locales/bg.jsx index cac984aae..a194cdbdd 100644 --- a/app/assets/javascripts/components/locales/bg.jsx +++ b/app/assets/javascripts/components/locales/bg.jsx @@ -65,4 +65,4 @@ const bg = { "notifications.column_settings.reblog": "Споделяния:", }; -export default en; +export default bg; diff --git a/app/assets/javascripts/components/locales/de.jsx b/app/assets/javascripts/components/locales/de.jsx index 92897f549..bd98b7595 100644 --- a/app/assets/javascripts/components/locales/de.jsx +++ b/app/assets/javascripts/components/locales/de.jsx @@ -1,4 +1,4 @@ -const en = { +const de = { "column_back_button.label": "Zurück", "lightbox.close": "Schließen", "loading_indicator.label": "Lade…", @@ -74,4 +74,4 @@ const en = { "missing_indicator.label": "Nicht gefunden" }; -export default en; +export default de; diff --git a/app/assets/javascripts/components/locales/en.jsx b/app/assets/javascripts/components/locales/en.jsx index 1834567f1..740caef9d 100644 --- a/app/assets/javascripts/components/locales/en.jsx +++ b/app/assets/javascripts/components/locales/en.jsx @@ -5,6 +5,7 @@ * 1. to add your new string here; and * 2. to remove old strings that are no longer needed; and * 3. to sort the strings by the key. + # 4. To rename the `en` const name and export default name to match your locale. * Thanks! */ const en = { diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml index f37fb7919..862946750 100644 --- a/app/views/stream_entries/show.html.haml +++ b/app/views/stream_entries/show.html.haml @@ -11,7 +11,7 @@ - else %meta{ property: 'og:description', content: @stream_entry.activity.content }/ - - if @stream_entry.activity.is_a?(Status) && @stream_entry.activity.media_attachments.size > 0 + - if @stream_entry.activity.is_a?(Status) && !@stream_entry.activity.sensitive? && @stream_entry.activity.media_attachments.size > 0 %meta{ property: 'og:image', content: full_asset_url(@stream_entry.activity.media_attachments.first.file.url(:small)) }/ - else %meta{ property: 'og:image', content: full_asset_url(@account.avatar.url(:original)) }/ |