diff options
author | Martin Wortschack <mwortschack@gitlab.com> | 2019-04-17 11:56:14 +0200 |
---|---|---|
committer | Martin Wortschack <mwortschack@gitlab.com> | 2019-04-17 11:56:31 +0200 |
commit | d299e0787f793ead7d7e8f95b6108972301ecece (patch) | |
tree | 4ffc2066af2fad0ce0099c11f78da14be563993e /lib/file_size_validator.rb | |
parent | 6d20be4d3e3deb1bf3b19996ceb0168a74eaa259 (diff) | |
download | gitlab-ce-d299e0787f793ead7d7e8f95b6108972301ecece.tar.gz |
Resolve first round of discussionsmw-i18n-lib-misc
- Revert translations for certain error messages
- Update PO file
Diffstat (limited to 'lib/file_size_validator.rb')
-rw-r--r-- | lib/file_size_validator.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/file_size_validator.rb b/lib/file_size_validator.rb index cc7d4a127c7..f13f90393d2 100644 --- a/lib/file_size_validator.rb +++ b/lib/file_size_validator.rb @@ -9,7 +9,7 @@ class FileSizeValidator < ActiveModel::EachValidator def initialize(options) if range = (options.delete(:in) || options.delete(:within)) - raise ArgumentError, _(":in and :within must be a Range") unless range.is_a?(Range) + raise ArgumentError, ":in and :within must be a Range" unless range.is_a?(Range) options[:minimum], options[:maximum] = range.begin, range.end options[:maximum] -= 1 if range.exclude_end? @@ -22,21 +22,21 @@ class FileSizeValidator < ActiveModel::EachValidator keys = CHECKS.keys & options.keys if keys.empty? - raise ArgumentError, _('Range unspecified. Specify the :within, :maximum, :minimum, or :is option.') + raise ArgumentError, 'Range unspecified. Specify the :within, :maximum, :minimum, or :is option.' end keys.each do |key| value = options[key] unless (value.is_a?(Integer) && value >= 0) || value.is_a?(Symbol) - raise ArgumentError, _(":%{key} must be a nonnegative Integer or symbol") % { key: key } + raise ArgumentError, ":%{key} must be a nonnegative Integer or symbol" % { key: key } end end end # rubocop: disable CodeReuse/ActiveRecord def validate_each(record, attribute, value) - raise(ArgumentError, _("A CarrierWave::Uploader::Base object was expected")) unless value.is_a? CarrierWave::Uploader::Base + raise(ArgumentError, "A CarrierWave::Uploader::Base object was expected") unless value.is_a? CarrierWave::Uploader::Base value = (options[:tokenizer] || DEFAULT_TOKENIZER).call(value) if value.is_a?(String) |