scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-23 05:24:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Switch to keyword parameters in i18n.t [SCI-8810] (#5739)

Browse source
This commit is contained in:
Soufiane 2023-07-07 14:55:51 +02:00 • committed by GitHub
parent 97a16f2e76
commit b44678d09a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,13 +39,13 @@ function textValidator(ev, textInput, textLimitMin, textLimitMax, clearErr, tiny
if (textLimitMin === 1) {
errMsg = I18n.t("general.text.not_blank");
} else {
errMsg = I18n.t("general.text.length_too_short", { min_length: textLimitMin });
errMsg = I18n.t("general.text.length_too_short", min_length: textLimitMin);
}
} else if (nameTooLong) {
if(tinyMCEInput){
errMsg = I18n.t("general.text.length_too_long_general");
} else {
errMsg = I18n.t("general.text.length_too_long", { max_length: textLimitMax });
errMsg = I18n.t("general.text.length_too_long", max_length: textLimitMax);
}
}
@ -143,7 +143,7 @@ function filesSizeValidator(ev, fileInputs, fileTypeEnum) {
if (file.size > fileTypeEnum) {
switch (fileTypeEnum) {
case FileTypeEnum.FILE:
return I18n.t('general.file.size_exceeded', { file_size: GLOBAL_CONSTANTS.FILE_MAX_SIZE_MB }).strToErrorFormat();
return I18n.t('general.file.size_exceeded', file_size: GLOBAL_CONSTANTS.FILE_MAX_SIZE_MB).strToErrorFormat();
case FileTypeEnum.AVATAR:
return "<%= I18n.t 'general.file.size_exceeded', file_size: Constants::AVATAR_MAX_SIZE_MB %>".strToErrorFormat();
}
@ -164,7 +164,7 @@ function filesSizeValidator(ev, fileInputs, fileTypeEnum) {
if (size > fileTypeEnum) {
switch (fileTypeEnum) {
case FileTypeEnum.FILE:
return I18n.t('general.file.total_size', { size: GLOBAL_CONSTANTS.FILE_MAX_SIZE_MB }).strToErrorFormat();
return I18n.t('general.file.total_size', size: GLOBAL_CONSTANTS.FILE_MAX_SIZE_MB).strToErrorFormat();
case FileTypeEnum.AVATAR:
return "<%= I18n.t('users.registrations.edit.avatar_total_size', size: Constants::AVATAR_MAX_SIZE_MB) %>".strToErrorFormat();
}

12
app/controllers/label_printers_controller.rb
View file

@ -36,29 +36,29 @@ class LabelPrintersController < ApplicationController
@label_printer = LabelPrinter.new(label_printer_params)
if @label_printer.save
flash[:success] = t('label_printers.create.success', { printer_name: @label_printer.name })
flash[:success] = t('label_printers.create.success', printer_name: @label_printer.name)
redirect_to edit_label_printer_path(@label_printer)
else
flash[:error] = t('label_printers.create.error', { printer_name: @label_printer.name })
flash[:error] = t('label_printers.create.error', printer_name: @label_printer.name)
render :new
end
end
def update
if @label_printer.update(label_printer_params)
flash[:success] = t('label_printers.update.success', { printer_name: @label_printer.name })
flash[:success] = t('label_printers.update.success', printer_name: @label_printer.name)
redirect_to edit_label_printer_path(@label_printer)
else
flash[:error] = t('label_printers.update.error', { printer_name: @label_printer.name })
flash[:error] = t('label_printers.update.error', printer_name: @label_printer.name)
render :edit
end
end
def destroy
if @label_printer.destroy
flash[:success] = t('label_printers.destroy.success', { printer_name: @label_printer.name })
flash[:success] = t('label_printers.destroy.success', printer_name: @label_printer.name)
else
flash[:error] = t('label_printers.destroy.error', { printer_name: @label_printer.name })
flash[:error] = t('label_printers.destroy.error', printer_name: @label_printer.name)
end
redirect_to addons_path

2
app/views/label_printers/_zebra_settings.html.erb
View file

@ -57,7 +57,7 @@
</li>
</ol>
<li>
<%= t("users.settings.account.label_printer.zebra_instruction.contact_html", {link_blog: Constants::SCINOTE_ZEBRA_BLOG_URL, link_zebra_support: Constants::SCINOTE_ZEBRA_SUPPORT_URL}) %>
<%= t("users.settings.account.label_printer.zebra_instruction.contact_html", link_blog: Constants::SCINOTE_ZEBRA_BLOG_URL, link_zebra_support: Constants::SCINOTE_ZEBRA_SUPPORT_URL) %>
</li>
</ul>
</li>