diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/i18n-tasks.yml | 1 | ||||
| -rw-r--r-- | config/initializers/ostatus.rb | 1 | ||||
| -rw-r--r-- | config/locales/en.yml | 19 | ||||
| -rw-r--r-- | config/routes.rb | 6 |
4 files changed, 25 insertions, 2 deletions
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml index 4dc6985b7..e72063844 100644 --- a/config/i18n-tasks.yml +++ b/config/i18n-tasks.yml @@ -33,6 +33,7 @@ search: ignore_unused: - 'activerecord.attributes.*' - '{devise,will_paginate,doorkeeper}.*' + - '{datetime,time}.*' - 'simple_form.{yes,no}' - 'simple_form.{placeholders,hints,labels}.*' - 'simple_form.{error_notification,required}.:' diff --git a/config/initializers/ostatus.rb b/config/initializers/ostatus.rb index c5723b2e9..faa9940b0 100644 --- a/config/initializers/ostatus.rb +++ b/config/initializers/ostatus.rb @@ -6,7 +6,6 @@ https = ENV['LOCAL_HTTPS'] == 'true' Rails.application.configure do config.x.local_domain = host - config.x.hub_url = ENV.fetch('HUB_URL') { 'https://pubsubhubbub.superfeedr.com' } config.x.use_https = https config.x.use_s3 = ENV['S3_ENABLED'] == 'true' diff --git a/config/locales/en.yml b/config/locales/en.yml index 50a1f0e95..f58ce9a71 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -26,6 +26,20 @@ en: resend_confirmation: Resend confirmation instructions reset_password: Reset password set_new_password: Set new password + datetime: + distance_in_words: + about_x_hours: "%{count}h" + about_x_months: "%{count}mo" + about_x_years: "%{count}y" + almost_x_years: "%{count}y" + half_a_minute: Just now + less_than_x_minutes: "%{count}m" + less_than_x_seconds: Just now + over_x_years: "%{count}y" + x_days: "%{count}d" + x_minutes: "%{count}m" + x_months: "%{count}mo" + x_seconds: "%{count}s" generic: changes_saved_msg: Changes successfully saved! powered_by: powered by %{link} @@ -53,8 +67,13 @@ en: edit_profile: Edit profile preferences: Preferences stream_entries: + click_to_show: Click to show favourited: favourited a post by is_now_following: is now following + sensitive_content: Sensitive content + time: + formats: + default: "%b %d, %Y, %H:%M" users: invalid_email: The e-mail address is invalid will_paginate: diff --git a/config/routes.rb b/config/routes.rb index 2d70bdcea..fd187dc42 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -25,7 +25,11 @@ Rails.application.routes.draw do } resources :accounts, path: 'users', only: [:show], param: :username do - resources :stream_entries, path: 'updates', only: [:show] + resources :stream_entries, path: 'updates', only: [:show] do + member do + get :embed + end + end member do get :followers |