diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-03-03 22:18:23 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-03 22:18:23 +0100 |
| commit | 230a012f0090c496fc5cdb011bcc8ed732fd0f5c (patch) | |
| tree | ca589b040b2d5c440e75e53d528f908cafe65d3a /config | |
| parent | 99dc212ae5d7b2527d835744bf903293398ce946 (diff) | |
Add polls (#10111)
* Add polls Fix #1629 * Add tests * Fixes * Change API for creating polls * Use name instead of content for votes * Remove poll validation for remote polls * Add polls to public pages * When updating the poll, update options just in case they were changed * Fix public pages showing both poll and other media
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en.yml | 10 | ||||
| -rw-r--r-- | config/routes.rb | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 7363a7457..b1f6166b4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -734,6 +734,16 @@ en: older: Older prev: Prev truncate: "…" + polls: + errors: + already_voted: You have already voted on this poll + duplicate_options: contain duplicate items + duration_too_long: is too far into the future + duration_too_short: is too soon + expired: The poll has already ended + over_character_limit: cannot be longer than %{MAX} characters each + too_few_options: must have more than one item + too_many_options: can't contain more than %{MAX} items preferences: languages: Languages other: Other diff --git a/config/routes.rb b/config/routes.rb index 9a83d0f88..ac10f9fba 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -362,6 +362,10 @@ Rails.application.routes.draw do resource :accounts, only: [:show, :create, :destroy], controller: 'lists/accounts' end + resources :polls, only: [:create, :show] do + resources :votes, only: :create, controller: 'polls/votes' + end + namespace :push do resource :subscription, only: [:create, :show, :update, :destroy] end |