33232.patch

Go MAEDA, 2020-05-03 06:11

Download (1.85 KB)

View differences:

app/controllers/application_controller.rb
52 52
      cookies.delete(autologin_cookie_name)
53 53
      self.logged_user = nil
54 54
      set_localization
55
      render_error :status => 422, :message => "Invalid form authenticity token."
55
      render_error :status => 422, :message => l(:error_invalid_authenticity_token)
56 56
    end
57 57
  end
58 58

  
......
683 683
  def query_statement_invalid(exception)
684 684
    logger.error "Query::StatementInvalid: #{exception.message}" if logger
685 685
    session.delete(:issue_query)
686
    render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
686
    render_error l(:error_query_statement_invalid)
687 687
  end
688 688

  
689 689
  # Renders a 204 response for successful updates or deletions via the API
config/locales/en.yml
234 234
  error_can_not_delete_auth_source: "This authentication mode is in use and cannot be deleted."
235 235
  error_spent_on_future_date: "Cannot log time on a future date"
236 236
  error_not_allowed_to_log_time_for_other_users: "You are not allowed to log time for other users"
237
  error_invalid_authenticity_token: "Invalid form authenticity token."
238
  error_query_statement_invalid: "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
237 239

  
238 240
  mail_subject_lost_password: "Your %{value} password"
239 241
  mail_body_lost_password: 'To change your password, click on the following link:'