ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into master

rebase/4.0.0rc2
Eugen 2017-04-13 16:00:20 +02:00 committed by GitHub
parent d2c20936f3 447b8bc44e
commit 1a5a54eb4b
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/components/locales/bg.jsx
View File

@ -65,4 +65,4 @@ const bg = {
"notifications.column_settings.reblog": "Споделяния:", "notifications.column_settings.reblog": "Споделяния:",
}; };
export default en; export default bg;

4
app/assets/javascripts/components/locales/de.jsx
View File

@ -1,4 +1,4 @@
const en = { const de = {
"column_back_button.label": "Zurück", "column_back_button.label": "Zurück",
"lightbox.close": "Schließen", "lightbox.close": "Schließen",
"loading_indicator.label": "Lade…", "loading_indicator.label": "Lade…",
@ -74,4 +74,4 @@ const en = {
"missing_indicator.label": "Nicht gefunden" "missing_indicator.label": "Nicht gefunden"
}; };
export default en; export default de;

1
app/assets/javascripts/components/locales/en.jsx
View File

@ -5,6 +5,7 @@
* 1. to add your new string here; and * 1. to add your new string here; and
* 2. to remove old strings that are no longer needed; and * 2. to remove old strings that are no longer needed; and
* 3. to sort the strings by the key. * 3. to sort the strings by the key.
# 4. To rename the `en` const name and export default name to match your locale.
* Thanks! * Thanks!
*/ */
const en = { const en = {

2
app/views/stream_entries/show.html.haml
View File

@ -11,7 +11,7 @@
- else - else
%meta{ property: 'og:description', content: @stream_entry.activity.content }/ %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)) }/ %meta{ property: 'og:image', content: full_asset_url(@stream_entry.activity.media_attachments.first.file.url(:small)) }/
- else - else
%meta{ property: 'og:image', content: full_asset_url(@account.avatar.url(:original)) }/ %meta{ property: 'og:image', content: full_asset_url(@account.avatar.url(:original)) }/