diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 33257be89..21300338f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -99,6 +99,10 @@ class ApplicationController < ActionController::Base I18n.with_locale(locale, &) end + def lang + params[:lang].presence + end + def with_browser_locale(&) return yield if I18n.locale != :'en-US' && I18n.locale != :en diff --git a/app/controllers/start_form_controller.rb b/app/controllers/start_form_controller.rb index 86471d381..4431c3073 100644 --- a/app/controllers/start_form_controller.rb +++ b/app/controllers/start_form_controller.rb @@ -34,7 +34,7 @@ class StartFormController < ApplicationController @submitter = find_or_initialize_submitter(@template, submitter_params) if @submitter.completed_at? - redirect_to start_form_completed_path(@template.slug, submitter_params.compact_blank) + redirect_to start_form_completed_path(@template.slug, submitter_params.compact_blank.merge(lang:)) else if Templates.filter_undefined_submitters(@template.submitters).size > 1 && @submitter.new_record? @error_message = multiple_submitters_error_message @@ -59,7 +59,7 @@ class StartFormController < ApplicationController Submitters::StartForm.assign_start_form_cookie(@submitter, request) - redirect_to submit_form_path(@submitter.slug) + redirect_to submit_form_path(@submitter.slug, lang:) else render :show, status: :unprocessable_content end @@ -150,7 +150,7 @@ class StartFormController < ApplicationController return render :show, status: :unprocessable_content if submitter.errors.present? if Submitters::StartForm.verify_2fa_and_save_submitter(submitter, request, is_new_record: submitter.new_record?) - redirect_to submit_form_path(submitter.slug) + redirect_to submit_form_path(submitter.slug, lang:) else if defined?(Rollbar) && template.preferences['shared_link_2fa'] != true Rollbar.info("2FA link requested: #{submitter.id}") @@ -167,10 +167,10 @@ class StartFormController < ApplicationController render :error, status: :unprocessable_content rescue Submitters::UnableToSendCode, Submitters::InvalidOtp => e - redirect_to start_form_path(template.slug, params: submitter_params.merge(email_verification: true)), + redirect_to start_form_path(template.slug, lang:, params: submitter_params.merge(email_verification: true)), alert: e.message rescue RateLimit::LimitApproached - redirect_to start_form_path(template.slug, params: submitter_params.merge(email_verification: true)), + redirect_to start_form_path(template.slug, lang:, params: submitter_params.merge(email_verification: true)), alert: I18n.t(:too_many_attempts) end end diff --git a/app/controllers/start_form_email_2fa_send_controller.rb b/app/controllers/start_form_email_2fa_send_controller.rb index 0787ab468..389baa59a 100644 --- a/app/controllers/start_form_email_2fa_send_controller.rb +++ b/app/controllers/start_form_email_2fa_send_controller.rb @@ -16,21 +16,21 @@ class StartFormEmail2faSendController < ApplicationController .submitters.new(**submitter_params, account_id: @template.account_id) if @submitter.email.blank? - return redirect_to start_form_path(@template.slug), alert: I18n.t(:provide_your_email_to_start) + return redirect_to start_form_path(@template.slug, lang:), alert: I18n.t(:provide_your_email_to_start) end Submitters.send_shared_link_email_verification_code(@submitter, request:) redir_params = { notice: I18n.t(:code_has_been_resent) } if params[:resend] - redirect_to start_form_path(@template.slug, params: submitter_params.merge(email_verification: true)), + redirect_to start_form_path(@template.slug, lang:, params: submitter_params.merge(email_verification: true)), **redir_params rescue Submitters::BouncedEmail => e @error_message = e.message render 'start_form/error', status: :unprocessable_content rescue Submitters::UnableToSendCode => e - redirect_to start_form_path(@template.slug, params: submitter_params.merge(email_verification: true)), + redirect_to start_form_path(@template.slug, lang:, params: submitter_params.merge(email_verification: true)), alert: e.message end diff --git a/app/controllers/submit_form_controller.rb b/app/controllers/submit_form_controller.rb index 2f3ab0cb2..06eb475ec 100644 --- a/app/controllers/submit_form_controller.rb +++ b/app/controllers/submit_form_controller.rb @@ -20,7 +20,7 @@ class SubmitFormController < ApplicationController return render :email_2fa unless Submitters::AuthorizedForForm.pass_email_2fa?(@submitter, request) if @submitter.completed_at? || submission.completed_at? - return redirect_to submit_form_completed_path(@submitter.slug) + return redirect_to submit_form_completed_path(@submitter.slug, lang:) end @form_configs = Submitters::FormConfigs.call(@submitter, CONFIG_KEYS) @@ -96,7 +96,7 @@ class SubmitFormController < ApplicationController return if Submitters::AuthorizedForForm.call(@submitter, current_user, request) - redirect_to submit_form_path(params[:submit_form_slug]) + redirect_to submit_form_path(params[:submit_form_slug], lang:) end def success; end @@ -114,7 +114,7 @@ class SubmitFormController < ApplicationController def maybe_require_link_2fa return if Submitters::AuthorizedForForm.pass_link_2fa?(@submitter, current_user, request) - redirect_to start_form_path(@submitter.submission.template.slug) + redirect_to start_form_path(@submitter.submission.template.slug, lang:) end def maybe_render_locked_page diff --git a/app/controllers/submit_form_email_2fas_controller.rb b/app/controllers/submit_form_email_2fas_controller.rb index 6f95e7544..6c6ad52eb 100644 --- a/app/controllers/submit_form_email_2fas_controller.rb +++ b/app/controllers/submit_form_email_2fas_controller.rb @@ -20,17 +20,17 @@ class SubmitFormEmail2fasController < ApplicationController { value: @submitter.slug, expires: Submitters::StartForm::COOKIES_TTL.from_now, **Submitters::StartForm::COOKIES_DEFAULTS } - redirect_to submit_form_path(@submitter.slug) + redirect_to submit_form_path(@submitter.slug, lang:) else - redirect_to submit_form_path(@submitter.slug, status: :error), alert: I18n.t(:invalid_code) + redirect_to submit_form_path(@submitter.slug, status: :error, lang:), alert: I18n.t(:invalid_code) end rescue RateLimit::LimitApproached - redirect_to submit_form_path(@submitter.slug, status: :error), alert: I18n.t(:too_many_attempts) + redirect_to submit_form_path(@submitter.slug, status: :error, lang:), alert: I18n.t(:too_many_attempts) end def update if @submitter.submission_events.where(event_type: 'send_2fa_email').exists?(created_at: 15.seconds.ago..) - return redirect_to submit_form_path(@submitter.slug, status: :error), alert: I18n.t(:rate_limit_exceeded) + return redirect_to submit_form_path(@submitter.slug, status: :error, lang:), alert: I18n.t(:rate_limit_exceeded) end RateLimit.call("send-email-code-#{@submitter.id}", limit: 2, ttl: 45.seconds, enabled: true) @@ -38,16 +38,17 @@ class SubmitFormEmail2fasController < ApplicationController if Docuseal.multitenant? && Submitters.email_bounced_recently?(@submitter.email) Rollbar.warning("Bounced OTP email for submitter: #{@submitter.id}") if defined?(Rollbar) - return redirect_to submit_form_path(@submitter.slug, status: :error), alert: I18n.t(:verification_email_bounced) + return redirect_to submit_form_path(@submitter.slug, status: :error, lang:), + alert: I18n.t(:verification_email_bounced) end SendSubmitterVerificationEmailJob.perform_async('submitter_id' => @submitter.id, 'locale' => I18n.locale.to_s) redir_params = params[:resend] ? { alert: I18n.t(:code_has_been_resent) } : {} - redirect_to submit_form_path(@submitter.slug, status: :sent), **redir_params + redirect_to submit_form_path(@submitter.slug, status: :sent, lang:), **redir_params rescue RateLimit::LimitApproached - redirect_to submit_form_path(@submitter.slug, status: :error), alert: I18n.t(:too_many_attempts) + redirect_to submit_form_path(@submitter.slug, status: :error, lang:), alert: I18n.t(:too_many_attempts) end def load_submitter diff --git a/app/views/start_form/email_verification.html.erb b/app/views/start_form/email_verification.html.erb index 383d8c9f6..8bf7db481 100644 --- a/app/views/start_form/email_verification.html.erb +++ b/app/views/start_form/email_verification.html.erb @@ -23,7 +23,7 @@
<%= t('we_sent_a_one_time_verification_code_to_your_email_address_please_enter_the_code_below_to_continue') %>
- <%= form_for '', url: @resubmit_submitter ? resubmit_form_path : start_form_path(@template.slug), method: :put, html: { class: 'space-y-4', id: 'code_form' } do |f| %> + <%= form_for '', url: @resubmit_submitter ? resubmit_form_path : start_form_path(@template.slug, lang: params[:lang].presence), method: :put, html: { class: 'space-y-4', id: 'code_form' } do |f| %>
<%= f.hidden_field 'resubmit', value: params[:resubmit] %> <%= f.hidden_field 'submitter[name]', value: params[:name] || params.dig(:submitter, :name) %> @@ -52,7 +52,7 @@ <% if @resubmit_submitter %> <%= button_to t(:re_send_email), resubmit_form_path, params: { resubmit: @resubmit_submitter.slug }, method: :put, id: 'resend_code', class: 'hidden' %> <% else %> - <%= button_to t(:re_send_email), start_form_email_2fa_send_index_path, params: { slug: @template.slug, resend: true, submitter: { name: params[:name] || params.dig(:submitter, :name), email: params[:email] || params.dig(:submitter, :email), phone: params[:phone] || params.dig(:submitter, :phone) } }.compact, method: :post, id: 'resend_code', class: 'hidden' %> + <%= button_to t(:re_send_email), start_form_email_2fa_send_index_path, params: { slug: @template.slug, resend: true, submitter: { name: params[:name] || params.dig(:submitter, :name), email: params[:email] || params.dig(:submitter, :email), phone: params[:phone] || params.dig(:submitter, :phone) }, lang: params[:lang] }.compact, method: :post, id: 'resend_code', class: 'hidden' %> <% end %>
diff --git a/app/views/start_form/show.html.erb b/app/views/start_form/show.html.erb index dfe336914..e6c431db4 100644 --- a/app/views/start_form/show.html.erb +++ b/app/views/start_form/show.html.erb @@ -28,7 +28,7 @@ <% if !@template.archived_at? && !@template.account.archived_at? %> - <%= form_for @submitter, url: @resubmit_submitter ? resubmit_form_path : start_form_path(@template.slug), data: { turbo_frame: :_top }, method: :put, html: { class: 'space-y-4' } do |f| %> + <%= form_for @submitter, url: @resubmit_submitter ? resubmit_form_path : start_form_path(@template.slug, lang: params[:lang].presence), data: { turbo_frame: :_top }, method: :put, html: { class: 'space-y-4' } do |f| %> <%= hidden_field_tag :resubmit, @resubmit_submitter.slug if @resubmit_submitter %> <% if @error_message %>
diff --git a/app/views/submit_form/email_2fa.html.erb b/app/views/submit_form/email_2fa.html.erb index 878bad01a..70382ad2f 100644 --- a/app/views/submit_form/email_2fa.html.erb +++ b/app/views/submit_form/email_2fa.html.erb @@ -34,6 +34,7 @@ <%= form_for '', url: submit_form_email_2fa_path, method: :post, html: { class: 'space-y-4', id: 'code_form' } do |f| %>
<%= f.hidden_field :submitter_slug, value: @submitter.slug %> + <%= f.hidden_field :lang, value: params[:lang] if params[:lang].present? %> <%= f.text_field :one_time_code, required: true, inputmode: 'numeric', class: 'base-input text-center', placeholder: 'XXXXXX' %>
@@ -55,7 +56,7 @@ <%= f.button button_title(title: t('submit')), class: 'base-button' %> <% end %> - <%= button_to t(:re_send_email), submit_form_email_2fa_path, params: { submitter_slug: @submitter.slug, resend: true }, method: :put, form: { id: 'resend_code_form', class: 'hidden' } %> + <%= button_to t(:re_send_email), submit_form_email_2fa_path, params: { submitter_slug: @submitter.slug, resend: true, lang: params[:lang] }.compact_blank, method: :put, form: { id: 'resend_code_form', class: 'hidden' } %> <% else %> <% if params[:t] %> @@ -63,7 +64,7 @@ <% end %> - <%= button_to button_title(title: t('send_verification_code')), submit_form_email_2fa_path, params: { submitter_slug: @submitter.slug }, method: :put, class: 'base-button w-full' %> + <%= button_to button_title(title: t('send_verification_code')), submit_form_email_2fa_path, params: { submitter_slug: @submitter.slug, lang: params[:lang] }.compact_blank, method: :put, class: 'base-button w-full' %> <% end %> <% else %>