diff options
| author | Jeroen <jeroenpraat@users.noreply.github.com> | 2018-03-24 12:50:14 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2018-03-24 12:50:14 +0100 |
| commit | 580835ab698fb116adf26fe4c9c465b2218d124b (patch) | |
| tree | 1e53c11b8cc4ce4824a7ab9e83aea6f8f1dcb229 | |
| parent | 54b273bf993888cd079113dd588cb7a90228b93b (diff) | |
Invites: Add '1 week' as expire option (#6872)
* Invites: Add '1 week' as expire option IMO a max. of 1 day is too short. Not everyone has the time and motivation to use an invite in a 24 hour period. 1 week as a max. is I think a good compromise between convenience and security. * Invites: Add '1 week' as expire option IMO a max. of 1 day is too short. Not everyone has the time and motivation to use an invite in a 24 hour period. 1 week as a max. is I think a good compromise between convenience and security. * Update en.yml
| -rw-r--r-- | app/views/invites/_form.html.haml | 2 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/invites/_form.html.haml b/app/views/invites/_form.html.haml index a01cf5946..3f0871f47 100644 --- a/app/views/invites/_form.html.haml +++ b/app/views/invites/_form.html.haml @@ -3,7 +3,7 @@ .fields-group = f.input :max_uses, wrapper: :with_label, collection: [1, 5, 10, 25, 50, 100], label_method: lambda { |num| I18n.t('invites.max_uses', count: num) }, prompt: I18n.t('invites.max_uses_prompt') - = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day].map(&:to_i), label_method: lambda { |i| I18n.t("invites.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt') + = f.input :expires_in, wrapper: :with_label, collection: [30.minutes, 1.hour, 6.hours, 12.hours, 1.day, 1.week].map(&:to_i), label_method: lambda { |i| I18n.t("invites.expires_in.#{i}") }, prompt: I18n.t('invites.expires_in_prompt') .actions = f.button :button, t('invites.generate'), type: :submit diff --git a/config/locales/en.yml b/config/locales/en.yml index 735a3490f..995cbdaa0 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -474,6 +474,7 @@ en: '21600': 6 hours '3600': 1 hour '43200': 12 hours + '604800': 1 week '86400': 1 day expires_in_prompt: Never generate: Generate |