diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:49:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:49:14 -0400 |
| commit | b67b60fec3adecffef544924a7776cce9b0a2633 (patch) | |
| tree | b592548a0a8cc6e9f1cbdf91df04e197503c070f /app/helpers | |
| parent | acf6436a993b514aa2fffffb8a03d3718c5a49a0 (diff) | |
| parent | cc16fa75137586dff8eb1ef4e508aed81bf21718 (diff) | |
Merge branch 'master' into patch-2
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/settings_helper.rb | 1 | ||||
| -rw-r--r-- | app/helpers/stream_entries_helper.rb | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index e01f7d0cc..74dc0e11d 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -11,6 +11,7 @@ module SettingsHelper uk: 'Українська', 'zh-CN': '简体中文', fi: 'Suomi', + eo: 'Esperanto', }.freeze def human_locale(locale) diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index a26e912a3..38e63ed8d 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -34,10 +34,6 @@ module StreamEntriesHelper user_signed_in? && @favourited.key?(status.id) ? 'favourited' : '' end - def proper_status(status) - status.reblog? ? status.reblog : status - end - def rtl?(text) return false if text.empty? |