diff options
| author | ThibG <thib@sitedethib.com> | 2019-02-26 21:40:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-26 21:40:28 +0100 |
| commit | ff2270cd061b2dc3fc86a5b2bd77d0a3408b5716 (patch) | |
| tree | 75adb7dc4d3c37ecf87b43659538e20ec198d804 /app/helpers | |
| parent | d82de360c13894746d3974d11c9505c8937ebdee (diff) | |
| parent | 1e06ca1c0af98cf61b1114b93249fb447e795edb (diff) | |
Merge pull request #930 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/jsonld_helper.rb | 1 | ||||
| -rw-r--r-- | app/helpers/settings_helper.rb | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/app/helpers/jsonld_helper.rb b/app/helpers/jsonld_helper.rb index 532397272..59e4ae685 100644 --- a/app/helpers/jsonld_helper.rb +++ b/app/helpers/jsonld_helper.rb @@ -68,6 +68,7 @@ module JsonLdHelper return body_to_json(response.body_with_limit) if response.code == 200 end # If request failed, retry without doing it on behalf of a user + return if on_behalf_of.nil? build_request(uri).perform do |response| response.code == 200 ? body_to_json(response.body_with_limit) : nil end diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index e868b45c0..241addb83 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -29,7 +29,9 @@ module SettingsHelper it: 'Italiano', ja: '日本語', ka: 'ქართული', + kk: 'Қазақша', ko: '한국어', + lt: 'Lietuvių', lv: 'Latviešu', ml: 'മലയാളം', ms: 'Bahasa Melayu', |