From e4de1d41456807ffde3c0d98ee11548e64cf6ace Mon Sep 17 00:00:00 2001 From: Faizaan Gagan Date: Wed, 31 Jul 2019 10:27:40 +0530 Subject: [PATCH] converted all the server side strings to translation ready strings --- config/locales/server.en.yml | 9 +++++++++ controllers/transfer.rb | 12 +++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 8ce4b4bb..d1c42401 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -10,6 +10,15 @@ en: too_short: "%{label} must be at least %{min} characters" none: "We couldn't find a wizard at that address." no_skip: "Wizard can't be skipped" + export: + error: + select_one: "Please select atleast one wizard" + import: + error: + no_file: "No file selected" + file_large: "File too large" + invalid_json: "File is not a valid json file" + no_valid_wizards: "File doesn't contain any valid wizards" site_settings: wizard_redirect_exclude_paths: "Routes excluded from wizard redirects." diff --git a/controllers/transfer.rb b/controllers/transfer.rb index 999811b2..61da5c75 100644 --- a/controllers/transfer.rb +++ b/controllers/transfer.rb @@ -10,7 +10,7 @@ class CustomWizard::TransferController < ::ApplicationController wizards = params['wizards'] wizard_objects = [] if wizards.nil? - render json: {error: 'Please select atleast one wizard'} + render json: {error: I18n.t('wizard.export.error.select_one')} return end @@ -33,17 +33,19 @@ class CustomWizard::TransferController < ::ApplicationController def import file = File.read(params['file'].tempfile) if file.nil? - render json: {error: "No file selected"} + render json: {error: I18n.t('wizard.import.error.no_file')} return end fileSize = file.size maxFileSize = 512 * 1024 if maxFileSize < fileSize - render json: {error: "File too large"} + render json: {error: I18n.t('wizard.import.error.file_large')} + return end unless is_json file - render json: {error: "File is not a valid json file"} + render json: {error: I18n.t('wizard.import.error.invalid_json')} + return end jsonObject = JSON.parse file @@ -64,7 +66,7 @@ class CustomWizard::TransferController < ::ApplicationController end if countValid == 0 - render json: {error: "File doesn't contain any valid wizards"} + render json: {error: I18n.t('wizard.import.error.no_valid_wizards')} else render json: {success: success_ids, failed: failed_ids} end