github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-19 05:52:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2494 from techAPJ/bulk-invite-4

Browse Source 
FEATURE: support txt file to be uploaded for bulk invite
This commit is contained in:
Sam 2014-07-03 17:33:16 +10:00
commit db34b534e6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/invites_controller.rb
View File

@ -71,7 +71,7 @@ class InvitesController < ApplicationController
guardian.ensure_can_bulk_invite_to_forum!(current_user)
filename = params.fetch(:resumableFilename)
return render status: 415, text: I18n.t("bulk_invite.file_should_be_csv") unless filename.to_s.end_with?(".csv")
return render status: 415, text: I18n.t("bulk_invite.file_should_be_csv") unless (filename.to_s.end_with?(".csv") || filename.to_s.end_with?(".txt"))
file = params.fetch(:file)
identifier = params.fetch(:resumableIdentifier)

2
config/locales/server.en.yml
View File

@ -40,7 +40,7 @@ en:
load_from_remote: "There was an error loading that post."
bulk_invite:
file_should_be_csv: "The uploaded file should be of csv format."
file_should_be_csv: "The uploaded file should be of csv or txt format."
backup:
operation_already_running: "An operation is currently running. Can't start a new job right now."