diff options
| author | Shel R <Yiskah.Raphen@gmail.com> | 2017-04-07 22:35:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 22:35:45 -0400 |
| commit | c945f29e96d537a827b95b3efb035ec8084576a1 (patch) | |
| tree | dac7e26c482f0a69e00f031e771e58858e64b054 /app/helpers | |
| parent | c62696bc467133869f6b1d39b923135b0e64900f (diff) | |
| parent | 0d4d42dce6e7b0856469317da9e039ec5dc431b1 (diff) | |
Merge branch 'master' into patch-1
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? |