diff options
author | pluralcafe-docker <docker@plural.cafe> | 2018-08-20 02:29:25 +0000 |
---|---|---|
committer | pluralcafe-docker <docker@plural.cafe> | 2018-08-20 02:29:25 +0000 |
commit | c339d49d82b3fd2873831029d9c92b3fbf1236e3 (patch) | |
tree | 5a8528475f089f1e592dfbedd37ee91e6f748ffc /app/helpers | |
parent | b6e9537de469a178ce195b75fe8eaf03735e785a (diff) | |
parent | f4d28ccfa3f9fd38a6d219fcde2d1a8bfcf6b306 (diff) |
Merge branch 'glitch'
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/home_helper.rb | 10 | ||||
-rw-r--r-- | app/helpers/settings_helper.rb | 1 | ||||
-rw-r--r-- | app/helpers/stream_entries_helper.rb | 2 |
3 files changed, 12 insertions, 1 deletions
diff --git a/app/helpers/home_helper.rb b/app/helpers/home_helper.rb index 8449f6c8a..f5b501235 100644 --- a/app/helpers/home_helper.rb +++ b/app/helpers/home_helper.rb @@ -38,4 +38,14 @@ module HomeHelper end end end + + def obscured_counter(count) + if count <= 0 + 0 + elsif count == 1 + 1 + else + '1+' + end + end end diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 8528be267..14ca2333e 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -26,6 +26,7 @@ module SettingsHelper io: 'Ido', it: 'Italiano', ja: '日本語', + ka: 'ქართული', ko: '한국어', nl: 'Nederlands', no: 'Norsk', diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index 121644263..9ded69436 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -19,7 +19,7 @@ module StreamEntriesHelper safe_join([render(file: Rails.root.join('app', 'javascript', 'images', 'logo.svg')), t('settings.edit_profile')]) end elsif current_account.following?(account) || current_account.requested?(account) - link_to account_unfollow_path(account), class: 'button logo-button', data: { method: :post } do + link_to account_unfollow_path(account), class: 'button logo-button button--destructive', data: { method: :post } do safe_join([render(file: Rails.root.join('app', 'javascript', 'images', 'logo.svg')), t('accounts.unfollow')]) end else |