diff options
| author | Reverite <github@reverite.sh> | 2019-09-18 16:38:31 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-09-18 16:38:31 -0700 |
| commit | 73f4af117fc5b5e4ee3337d634f5e589a9353644 (patch) | |
| tree | 62b0443573ba5038fd45aa14d4243dfc832c060a /app/helpers | |
| parent | 849e2bc4ca11892e701835a4696904d78b1ad325 (diff) | |
| parent | febcdad2e2c98aee62b55ee21bdf0debf7c6fd6b (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/admin/filter_helper.rb | 2 | ||||
| -rw-r--r-- | app/helpers/application_helper.rb | 8 | ||||
| -rw-r--r-- | app/helpers/settings_helper.rb | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/app/helpers/admin/filter_helper.rb b/app/helpers/admin/filter_helper.rb index 506429e10..8af1683e7 100644 --- a/app/helpers/admin/filter_helper.rb +++ b/app/helpers/admin/filter_helper.rb @@ -5,7 +5,7 @@ module Admin::FilterHelper REPORT_FILTERS = %i(resolved account_id target_account_id).freeze INVITE_FILTER = %i(available expired).freeze CUSTOM_EMOJI_FILTERS = %i(local remote by_domain shortcode).freeze - TAGS_FILTERS = %i(context review).freeze + TAGS_FILTERS = %i(directory reviewed unreviewed pending_review popular active name).freeze INSTANCES_FILTERS = %i(limited by_domain).freeze FOLLOWERS_FILTERS = %i(relationship status by_domain activity order).freeze diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 6940c8535..40f914f1e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -77,8 +77,12 @@ module ApplicationHelper content_tag(:i, nil, attributes.merge(class: class_names.join(' '))) end - def custom_emoji_tag(custom_emoji) - image_tag(custom_emoji.image.url, class: 'emojione', alt: ":#{custom_emoji.shortcode}:") + def custom_emoji_tag(custom_emoji, animate = true) + if animate + image_tag(custom_emoji.image.url, class: 'emojione', alt: ":#{custom_emoji.shortcode}:") + else + image_tag(custom_emoji.image.url(:static), class: 'emojione custom-emoji', alt: ":#{custom_emoji.shortcode}", 'data-original' => full_asset_url(custom_emoji.image.url), 'data-static' => full_asset_url(custom_emoji.image.url(:static))) + end end def opengraph(property, content) diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 92bc222ea..2b3fd1263 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -43,7 +43,8 @@ module SettingsHelper oc: 'Occitan', pl: 'Polski', pt: 'Português', - 'pt-BR': 'Português do Brasil', + 'pt-PT': 'Português (Portugal)', + 'pt-BR': 'Português (Brasil)', ro: 'Română', ru: 'Русский', sk: 'Slovenčina', |