scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-06 15:05:26 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:Zanz2/scinote-web into size_limit_small_SCI-1810

Browse source
This commit is contained in:
Zanz2 2017-11-16 15:14:01 +01:00
commit e782f13a7d
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/sitewide/form_validators.js.erb
View file

@ -163,7 +163,7 @@ function filesSizeValidator(ev, fileInputs, fileTypeEnum) {
case FileTypeEnum.FILE: case FileTypeEnum.FILE:
return "<%= I18n.t('general.file.total_size', size: Constants::FILE_MAX_SIZE_MB) %>".strToErrorFormat(); return "<%= I18n.t('general.file.total_size', size: Constants::FILE_MAX_SIZE_MB) %>".strToErrorFormat();
case FileTypeEnum.AVATAR: case FileTypeEnum.AVATAR:
return "<%= I18n.t('general.file.total_size', size: Constants::AVATAR_MAX_SIZE_MB) %>".strToErrorFormat(); return "<%= I18n.t('users.registrations.edit.avatar_total_size', size: Constants::AVATAR_MAX_SIZE_MB) %>".strToErrorFormat();
} }
} }
} }

1
app/models/team.rb
View file

@ -94,6 +94,7 @@ class Team < ActiveRecord::Base
end end
row.each.with_index do |value, index| row.each.with_index do |value, index|
next unless value.present?
if index == stype_index if index == stype_index
stype = SampleType.where(team: self) stype = SampleType.where(team: self)
.where('name ILIKE ?', value.strip) .where('name ILIKE ?', value.strip)

5
config/locales/en.yml
View file

@ -1251,6 +1251,7 @@ en:
avatar_title: "Change avatar" avatar_title: "Change avatar"
avatar_edit_label: "Upload new avatar file" avatar_edit_label: "Upload new avatar file"
avatar_submit: "Upload" avatar_submit: "Upload"
avatar_total_size: "Your avatar file cannot be larger than 0.2 MB. (Please try again with a smaller file.)"
name_label: "Full name" name_label: "Full name"
name_title: "Change name" name_title: "Change name"
initials_label: "Initials" initials_label: "Initials"
@ -1792,8 +1793,8 @@ en:
zip_export: zip_export:
modal_label: 'Export repository' modal_label: 'Export repository'
notification_title: 'Your package is ready to be exported!' notification_title: 'Your package is ready to be exported!'
expired_title: 'The required file was expired!' expired_title: 'Looks like your link has expired.'
expired_description: 'The downloadable file expires in 7 days after its creation.' expired_description: 'Please export the data again in order to receive a new link.'
modal_label: 'Export request received' modal_label: 'Export request received'
modal_html: "<p>Your export request is being processed.</p><p>When completed we will <strong>send an email to %{email}</strong> inbox with a link to your exported samples. Note that the link will expire in 7 days.</p>" modal_html: "<p>Your export request is being processed.</p><p>When completed we will <strong>send an email to %{email}</strong> inbox with a link to your exported samples. Note that the link will expire in 7 days.</p>"
repository_html: '<p>You are about to export selected items in repository %{repository}</p> <br> Repository will be exported in a .csv file format. You will receive <strong>email with a link</strong> where you can download it.' repository_html: '<p>You are about to export selected items in repository %{repository}</p> <br> Repository will be exported in a .csv file format. You will receive <strong>email with a link</strong> where you can download it.'